1741 files changed, 26625 insertions, 25827 deletions

diff --git a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE.json b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE.json
index b86e238dd..6b30249d5 100644
--- a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE.json
+++ b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE.json
@@ -1,5 +1,5 @@
 {
-    "NonZeroValue_SUICIDE_d0g0v0_EIP150" : {
+    "NonZeroValue_SELFDESTRUCT_d0g0v0_EIP150" : {
         "blocks" : [
             {
                 "blockHeader" : {
@@ -99,7 +99,7 @@
             }
         }
     },
-    "NonZeroValue_SUICIDE_d0g0v0_EIP158" : {
+    "NonZeroValue_SELFDESTRUCT_d0g0v0_EIP158" : {
         "blocks" : [
             {
                 "blockHeader" : {
@@ -199,7 +199,7 @@
             }
         }
     },
-    "NonZeroValue_SUICIDE_d0g0v0_Frontier" : {
+    "NonZeroValue_SELFDESTRUCT_d0g0v0_Frontier" : {
         "blocks" : [
             {
                 "blockHeader" : {
@@ -299,7 +299,7 @@
             }
         }
     },
-    "NonZeroValue_SUICIDE_d0g0v0_Homestead" : {
+    "NonZeroValue_SELFDESTRUCT_d0g0v0_Homestead" : {
         "blocks" : [
             {
                 "blockHeader" : {
diff --git a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToEmpty.json b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToEmpty.json
index a6ecfc6ea..cf95cd99c 100644
--- a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToEmpty.json
+++ b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToEmpty.json
@@ -1,5 +1,5 @@
 {
-    "NonZeroValue_SUICIDE_ToEmpty_d0g0v0_EIP150" : {
+    "NonZeroValue_SELFDESTRUCT_ToEmpty_d0g0v0_EIP150" : {
         "blocks" : [
             {
                 "blockHeader" : {
@@ -106,7 +106,7 @@
             }
         }
     },
-    "NonZeroValue_SUICIDE_ToEmpty_d0g0v0_EIP158" : {
+    "NonZeroValue_SELFDESTRUCT_ToEmpty_d0g0v0_EIP158" : {
         "blocks" : [
             {
                 "blockHeader" : {
@@ -213,7 +213,7 @@
             }
         }
     },
-    "NonZeroValue_SUICIDE_ToEmpty_d0g0v0_Frontier" : {
+    "NonZeroValue_SELFDESTRUCT_ToEmpty_d0g0v0_Frontier" : {
         "blocks" : [
             {
                 "blockHeader" : {
@@ -320,7 +320,7 @@
             }
         }
     },
-    "NonZeroValue_SUICIDE_ToEmpty_d0g0v0_Homestead" : {
+    "NonZeroValue_SELFDESTRUCT_ToEmpty_d0g0v0_Homestead" : {
         "blocks" : [
             {
                 "blockHeader" : {
diff --git a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalance.json b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalance.json
index e17f22702..1d7ed1d3e 100644
--- a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalance.json
+++ b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalance.json
@@ -1,5 +1,5 @@
 {
-    "NonZeroValue_SUICIDE_ToNonNonZeroBalance_d0g0v0_EIP150" : {
+    "NonZeroValue_SELFDESTRUCT_ToNonNonZeroBalance_d0g0v0_EIP150" : {
         "blocks" : [
             {
                 "blockHeader" : {
@@ -106,7 +106,7 @@
             }
         }
     },
-    "NonZeroValue_SUICIDE_ToNonNonZeroBalance_d0g0v0_EIP158" : {
+    "NonZeroValue_SELFDESTRUCT_ToNonNonZeroBalance_d0g0v0_EIP158" : {
         "blocks" : [
             {
                 "blockHeader" : {
@@ -213,7 +213,7 @@
             }
         }
     },
-    "NonZeroValue_SUICIDE_ToNonNonZeroBalance_d0g0v0_Frontier" : {
+    "NonZeroValue_SELFDESTRUCT_ToNonNonZeroBalance_d0g0v0_Frontier" : {
         "blocks" : [
             {
                 "blockHeader" : {
@@ -320,7 +320,7 @@
             }
         }
     },
-    "NonZeroValue_SUICIDE_ToNonNonZeroBalance_d0g0v0_Homestead" : {
+    "NonZeroValue_SELFDESTRUCT_ToNonNonZeroBalance_d0g0v0_Homestead" : {
         "blocks" : [
             {
                 "blockHeader" : {
diff --git a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToOneStorageKey.json b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToOneStorageKey.json
index 836563560..9fb868ed8 100644
--- a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToOneStorageKey.json
+++ b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToOneStorageKey.json
@@ -1,5 +1,5 @@
 {
-    "NonZeroValue_SUICIDE_ToOneStorageKey_d0g0v0_EIP150" : {
+    "NonZeroValue_SELFDESTRUCT_ToOneStorageKey_d0g0v0_EIP150" : {
         "blocks" : [
             {
                 "blockHeader" : {
@@ -109,7 +109,7 @@
             }
         }
     },
-    "NonZeroValue_SUICIDE_ToOneStorageKey_d0g0v0_EIP158" : {
+    "NonZeroValue_SELFDESTRUCT_ToOneStorageKey_d0g0v0_EIP158" : {
         "blocks" : [
             {
                 "blockHeader" : {
@@ -219,7 +219,7 @@
             }
         }
     },
-    "NonZeroValue_SUICIDE_ToOneStorageKey_d0g0v0_Frontier" : {
+    "NonZeroValue_SELFDESTRUCT_ToOneStorageKey_d0g0v0_Frontier" : {
         "blocks" : [
             {
                 "blockHeader" : {
@@ -329,7 +329,7 @@
             }
         }
     },
-    "NonZeroValue_SUICIDE_ToOneStorageKey_d0g0v0_Homestead" : {
+    "NonZeroValue_SELFDESTRUCT_ToOneStorageKey_d0g0v0_Homestead" : {
         "blocks" : [
             {
                 "blockHeader" : {
diff --git a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_OOGRevert.json b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_OOGRevert.json
index 77f12a08e..4598ee1da 100644
--- a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_OOGRevert.json
+++ b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_OOGRevert.json
@@ -1,5 +1,5 @@
 {
-    "ZeroValue_SUICIDE_OOGRevert_d0g0v0_EIP150" : {
+    "ZeroValue_SELFDESTRUCT_OOGRevert_d0g0v0_EIP150" : {
         "blocks" : [
             {
                 "blockHeader" : {
@@ -113,7 +113,7 @@
             }
         }
     },
-    "ZeroValue_SUICIDE_OOGRevert_d0g0v0_EIP158" : {
+    "ZeroValue_SELFDESTRUCT_OOGRevert_d0g0v0_EIP158" : {
         "blocks" : [
             {
                 "blockHeader" : {
@@ -227,7 +227,7 @@
             }
         }
     },
-    "ZeroValue_SUICIDE_OOGRevert_d0g0v0_Frontier" : {
+    "ZeroValue_SELFDESTRUCT_OOGRevert_d0g0v0_Frontier" : {
         "blocks" : [
             {
                 "blockHeader" : {
@@ -341,7 +341,7 @@
             }
         }
     },
-    "ZeroValue_SUICIDE_OOGRevert_d0g0v0_Homestead" : {
+    "ZeroValue_SELFDESTRUCT_OOGRevert_d0g0v0_Homestead" : {
         "blocks" : [
             {
                 "blockHeader" : {
diff --git a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_ToEmpty_OOGRevert.json b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_ToEmpty_OOGRevert.json
index 688e277dd..22644b5ff 100644
--- a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_ToEmpty_OOGRevert.json
+++ b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_ToEmpty_OOGRevert.json
@@ -1,5 +1,5 @@
 {
-    "ZeroValue_SUICIDE_ToEmpty_OOGRevert_d0g0v0_EIP150" : {
+    "ZeroValue_SELFDESTRUCT_ToEmpty_OOGRevert_d0g0v0_EIP150" : {
         "blocks" : [
             {
                 "blockHeader" : {
@@ -127,7 +127,7 @@
             }
         }
     },
-    "ZeroValue_SUICIDE_ToEmpty_OOGRevert_d0g0v0_EIP158" : {
+    "ZeroValue_SELFDESTRUCT_ToEmpty_OOGRevert_d0g0v0_EIP158" : {
         "blocks" : [
             {
                 "blockHeader" : {
@@ -255,7 +255,7 @@
             }
         }
     },
-    "ZeroValue_SUICIDE_ToEmpty_OOGRevert_d0g0v0_Frontier" : {
+    "ZeroValue_SELFDESTRUCT_ToEmpty_OOGRevert_d0g0v0_Frontier" : {
         "blocks" : [
             {
                 "blockHeader" : {
@@ -383,7 +383,7 @@
             }
         }
     },
-    "ZeroValue_SUICIDE_ToEmpty_OOGRevert_d0g0v0_Homestead" : {
+    "ZeroValue_SELFDESTRUCT_ToEmpty_OOGRevert_d0g0v0_Homestead" : {
         "blocks" : [
             {
                 "blockHeader" : {
diff --git a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevert.json b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevert.json
index 6b1002bac..8cf46b7d1 100644
--- a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevert.json
+++ b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevert.json
@@ -1,5 +1,5 @@
 {
-    "ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevert_d0g0v0_EIP150" : {
+    "ZeroValue_SELFDESTRUCT_ToNonZeroBalance_OOGRevert_d0g0v0_EIP150" : {
         "blocks" : [
             {
                 "blockHeader" : {
@@ -127,7 +127,7 @@
             }
         }
     },
-    "ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevert_d0g0v0_EIP158" : {
+    "ZeroValue_SELFDESTRUCT_ToNonZeroBalance_OOGRevert_d0g0v0_EIP158" : {
         "blocks" : [
             {
                 "blockHeader" : {
@@ -255,7 +255,7 @@
             }
         }
     },
-    "ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevert_d0g0v0_Frontier" : {
+    "ZeroValue_SELFDESTRUCT_ToNonZeroBalance_OOGRevert_d0g0v0_Frontier" : {
         "blocks" : [
             {
                 "blockHeader" : {
@@ -383,7 +383,7 @@
             }
         }
     },
-    "ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevert_d0g0v0_Homestead" : {
+    "ZeroValue_SELFDESTRUCT_ToNonZeroBalance_OOGRevert_d0g0v0_Homestead" : {
         "blocks" : [
             {
                 "blockHeader" : {
diff --git a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert.json b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert.json
index 60ce4ab4d..9add8bc73 100644
--- a/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert.json
+++ b/BlockchainTests/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert.json
@@ -1,5 +1,5 @@
 {
-    "ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert_d0g0v0_EIP150" : {
+    "ZeroValue_SELFDESTRUCT_ToOneStorageKey_OOGRevert_d0g0v0_EIP150" : {
         "blocks" : [
             {
                 "blockHeader" : {
@@ -133,7 +133,7 @@
             }
         }
     },
-    "ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert_d0g0v0_EIP158" : {
+    "ZeroValue_SELFDESTRUCT_ToOneStorageKey_OOGRevert_d0g0v0_EIP158" : {
         "blocks" : [
             {
                 "blockHeader" : {
@@ -267,7 +267,7 @@
             }
         }
     },
-    "ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert_d0g0v0_Frontier" : {
+    "ZeroValue_SELFDESTRUCT_ToOneStorageKey_OOGRevert_d0g0v0_Frontier" : {
         "blocks" : [
             {
                 "blockHeader" : {
@@ -401,7 +401,7 @@
             }
         }
     },
-    "ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert_d0g0v0_Homestead" : {
+    "ZeroValue_SELFDESTRUCT_ToOneStorageKey_OOGRevert_d0g0v0_Homestead" : {
         "blocks" : [
             {
                 "blockHeader" : {
diff --git a/BlockchainTests/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE.json b/BlockchainTests/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE.json
index f0b47e6dd..261463bd7 100644
--- a/BlockchainTests/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE.json
+++ b/BlockchainTests/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE.json
@@ -1,5 +1,5 @@
 {
-    "ZeroValue_SUICIDE_d0g0v0_EIP150" : {
+    "ZeroValue_SELFDESTRUCT_d0g0v0_EIP150" : {
         "blocks" : [
             {
                 "blockHeader" : {
@@ -99,7 +99,7 @@
             }
         }
     },
-    "ZeroValue_SUICIDE_d0g0v0_EIP158" : {
+    "ZeroValue_SELFDESTRUCT_d0g0v0_EIP158" : {
         "blocks" : [
             {
                 "blockHeader" : {
@@ -192,7 +192,7 @@
             }
         }
     },
-    "ZeroValue_SUICIDE_d0g0v0_Frontier" : {
+    "ZeroValue_SELFDESTRUCT_d0g0v0_Frontier" : {
         "blocks" : [
             {
                 "blockHeader" : {
@@ -292,7 +292,7 @@
             }
         }
     },
-    "ZeroValue_SUICIDE_d0g0v0_Homestead" : {
+    "ZeroValue_SELFDESTRUCT_d0g0v0_Homestead" : {
         "blocks" : [
             {
                 "blockHeader" : {
diff --git a/BlockchainTests/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE_ToEmpty.json b/BlockchainTests/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE_ToEmpty.json
index 4e7487450..946b002eb 100644
--- a/BlockchainTests/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE_ToEmpty.json
+++ b/BlockchainTests/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE_ToEmpty.json
@@ -1,5 +1,5 @@
 {
-    "ZeroValue_SUICIDE_ToEmpty_d0g0v0_EIP150" : {
+    "ZeroValue_SELFDESTRUCT_ToEmpty_d0g0v0_EIP150" : {
         "blocks" : [
             {
                 "blockHeader" : {
@@ -106,7 +106,7 @@
             }
         }
     },
-    "ZeroValue_SUICIDE_ToEmpty_d0g0v0_EIP158" : {
+    "ZeroValue_SELFDESTRUCT_ToEmpty_d0g0v0_EIP158" : {
         "blocks" : [
             {
                 "blockHeader" : {
@@ -206,7 +206,7 @@
             }
         }
     },
-    "ZeroValue_SUICIDE_ToEmpty_d0g0v0_Frontier" : {
+    "ZeroValue_SELFDESTRUCT_ToEmpty_d0g0v0_Frontier" : {
         "blocks" : [
             {
                 "blockHeader" : {
@@ -313,7 +313,7 @@
             }
         }
     },
-    "ZeroValue_SUICIDE_ToEmpty_d0g0v0_Homestead" : {
+    "ZeroValue_SELFDESTRUCT_ToEmpty_d0g0v0_Homestead" : {
         "blocks" : [
             {
                 "blockHeader" : {
diff --git a/BlockchainTests/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE_ToNonZeroBalance.json b/BlockchainTests/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE_ToNonZeroBalance.json
index 970cfa74b..e704d6922 100644
--- a/BlockchainTests/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE_ToNonZeroBalance.json
+++ b/BlockchainTests/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE_ToNonZeroBalance.json
@@ -1,5 +1,5 @@
 {
-    "ZeroValue_SUICIDE_ToNonZeroBalance_d0g0v0_EIP150" : {
+    "ZeroValue_SELFDESTRUCT_ToNonZeroBalance_d0g0v0_EIP150" : {
         "blocks" : [
             {
                 "blockHeader" : {
@@ -106,7 +106,7 @@
             }
         }
     },
-    "ZeroValue_SUICIDE_ToNonZeroBalance_d0g0v0_EIP158" : {
+    "ZeroValue_SELFDESTRUCT_ToNonZeroBalance_d0g0v0_EIP158" : {
         "blocks" : [
             {
                 "blockHeader" : {
@@ -213,7 +213,7 @@
             }
         }
     },
-    "ZeroValue_SUICIDE_ToNonZeroBalance_d0g0v0_Frontier" : {
+    "ZeroValue_SELFDESTRUCT_ToNonZeroBalance_d0g0v0_Frontier" : {
         "blocks" : [
             {
                 "blockHeader" : {
@@ -320,7 +320,7 @@
             }
         }
     },
-    "ZeroValue_SUICIDE_ToNonZeroBalance_d0g0v0_Homestead" : {
+    "ZeroValue_SELFDESTRUCT_ToNonZeroBalance_d0g0v0_Homestead" : {
         "blocks" : [
             {
                 "blockHeader" : {
diff --git a/BlockchainTests/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE_ToOneStorageKey.json b/BlockchainTests/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE_ToOneStorageKey.json
index fb6d384a3..a28026211 100644
--- a/BlockchainTests/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE_ToOneStorageKey.json
+++ b/BlockchainTests/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE_ToOneStorageKey.json
@@ -1,5 +1,5 @@
 {
-    "ZeroValue_SUICIDE_ToOneStorageKey_d0g0v0_EIP150" : {
+    "ZeroValue_SELFDESTRUCT_ToOneStorageKey_d0g0v0_EIP150" : {
         "blocks" : [
             {
                 "blockHeader" : {
@@ -109,7 +109,7 @@
             }
         }
     },
-    "ZeroValue_SUICIDE_ToOneStorageKey_d0g0v0_EIP158" : {
+    "ZeroValue_SELFDESTRUCT_ToOneStorageKey_d0g0v0_EIP158" : {
         "blocks" : [
             {
                 "blockHeader" : {
@@ -211,7 +211,7 @@
             }
         }
     },
-    "ZeroValue_SUICIDE_ToOneStorageKey_d0g0v0_Frontier" : {
+    "ZeroValue_SELFDESTRUCT_ToOneStorageKey_d0g0v0_Frontier" : {
         "blocks" : [
             {
                 "blockHeader" : {
@@ -321,7 +321,7 @@
             }
         }
     },
-    "ZeroValue_SUICIDE_ToOneStorageKey_d0g0v0_Homestead" : {
+    "ZeroValue_SELFDESTRUCT_ToOneStorageKey_d0g0v0_Homestead" : {
         "blocks" : [
             {
                 "blockHeader" : {
diff --git a/GeneralStateTests/stAttackTest/ContractCreationSpam.json b/GeneralStateTests/stAttackTest/ContractCreationSpam.json
index c02c3e1ba..b3da307be 100644
--- a/GeneralStateTests/stAttackTest/ContractCreationSpam.json
+++ b/GeneralStateTests/stAttackTest/ContractCreationSpam.json
@@ -1,17 +1,17 @@
 {
     "ContractCreationSpam" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x174876e800",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7e7ff82e1c33ffbeb3dedb679498c9716f83c697f497d75aca467ae936b8ae45",
+                    "hash" : "0x7e7ff82e1c33ffbeb3dedb679498c9716f83c697f497d75aca467ae936b8ae45",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7e7ff82e1c33ffbeb3dedb679498c9716f83c697f497d75aca467ae936b8ae45",
+                    "hash" : "0x7e7ff82e1c33ffbeb3dedb679498c9716f83c697f497d75aca467ae936b8ae45",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e6b8c416b01e463186ae6661211f5e6c3ee69a1975e8f4a4d2d65ed0ff1faf2d",
+                    "hash" : "0xe6b8c416b01e463186ae6661211f5e6c3ee69a1975e8f4a4d2d65ed0ff1faf2d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e6b8c416b01e463186ae6661211f5e6c3ee69a1975e8f4a4d2d65ed0ff1faf2d",
+                    "hash" : "0xe6b8c416b01e463186ae6661211f5e6c3ee69a1975e8f4a4d2d65ed0ff1faf2d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7e7ff82e1c33ffbeb3dedb679498c9716f83c697f497d75aca467ae936b8ae45",
+                    "hash" : "0x7e7ff82e1c33ffbeb3dedb679498c9716f83c697f497d75aca467ae936b8ae45",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "6a0a0fc761c612c340a0e98d33b37a75e5268472" : {
+            "0x6a0a0fc761c612c340a0e98d33b37a75e5268472" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f6004600c60003960046000f3600035ff00000000000000000000000000000000600052602060006000f0600054805b6001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1506001018060005260008060208180876006f1505a616000106200002f57600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "800000"
+                "0x0c3500"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "6a0a0fc761c612C340a0e98d33b37a75e5268472",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x6a0a0fc761c612C340a0e98d33b37a75e5268472",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stBlockHashTest/blockhash0.json b/GeneralStateTests/stBlockHashTest/blockhash0.json
index 009030991..50bf68617 100644
--- a/GeneralStateTests/stBlockHashTest/blockhash0.json
+++ b/GeneralStateTests/stBlockHashTest/blockhash0.json
@@ -1,24 +1,24 @@
 {
     "blockhash0" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x174876e800",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7dde00b2e7aea44866286f955462fedcb613e3b41303ef7e5c269cef5346247f",
+                    "hash" : "0x7dde00b2e7aea44866286f955462fedcb613e3b41303ef7e5c269cef5346247f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
                     "postState" : {
-                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                             "balance" : "0x0de0b6b3a764000a",
                             "code" : "0x600040600055600540600155600440600255",
                             "nonce" : "0x00",
@@ -26,16 +26,16 @@
                                 "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
                             }
                         },
-                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                             "balance" : "0xc786",
-                            "code" : "0x",
+                            "code" : "",
                             "nonce" : "0x00",
                             "storage" : {
                             }
                         },
-                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                             "balance" : "0x0e7ab0",
-                            "code" : "0x",
+                            "code" : "",
                             "nonce" : "0x01",
                             "storage" : {
                             }
@@ -43,14 +43,14 @@
                     }
                 },
                 {
-                    "hash" : "589fd4b64c670b0b1bc0afa275912befbdcba04749cbcc31f14e3746ebb82d06",
+                    "hash" : "0x589fd4b64c670b0b1bc0afa275912befbdcba04749cbcc31f14e3746ebb82d06",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 1
                     },
                     "postState" : {
-                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                             "balance" : "0x0de0b6b3a7640000",
                             "code" : "0x600040600055600540600155600440600255",
                             "nonce" : "0x00",
@@ -58,16 +58,16 @@
                                 "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
                             }
                         },
-                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                             "balance" : "0xc786",
-                            "code" : "0x",
+                            "code" : "",
                             "nonce" : "0x00",
                             "storage" : {
                             }
                         },
-                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                             "balance" : "0x0e7aba",
-                            "code" : "0x",
+                            "code" : "",
                             "nonce" : "0x01",
                             "storage" : {
                             }
@@ -75,14 +75,14 @@
                     }
                 },
                 {
-                    "hash" : "7dde00b2e7aea44866286f955462fedcb613e3b41303ef7e5c269cef5346247f",
+                    "hash" : "0x7dde00b2e7aea44866286f955462fedcb613e3b41303ef7e5c269cef5346247f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
                         "value" : 0
                     },
                     "postState" : {
-                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                             "balance" : "0x0de0b6b3a764000a",
                             "code" : "0x600040600055600540600155600440600255",
                             "nonce" : "0x00",
@@ -90,16 +90,16 @@
                                 "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
                             }
                         },
-                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                             "balance" : "0xc786",
-                            "code" : "0x",
+                            "code" : "",
                             "nonce" : "0x00",
                             "storage" : {
                             }
                         },
-                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                             "balance" : "0x0e7ab0",
-                            "code" : "0x",
+                            "code" : "",
                             "nonce" : "0x01",
                             "storage" : {
                             }
@@ -107,14 +107,14 @@
                     }
                 },
                 {
-                    "hash" : "589fd4b64c670b0b1bc0afa275912befbdcba04749cbcc31f14e3746ebb82d06",
+                    "hash" : "0x589fd4b64c670b0b1bc0afa275912befbdcba04749cbcc31f14e3746ebb82d06",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
                         "value" : 1
                     },
                     "postState" : {
-                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                             "balance" : "0x0de0b6b3a7640000",
                             "code" : "0x600040600055600540600155600440600255",
                             "nonce" : "0x00",
@@ -122,16 +122,16 @@
                                 "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
                             }
                         },
-                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                             "balance" : "0xc786",
-                            "code" : "0x",
+                            "code" : "",
                             "nonce" : "0x00",
                             "storage" : {
                             }
                         },
-                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                             "balance" : "0x0e7aba",
-                            "code" : "0x",
+                            "code" : "",
                             "nonce" : "0x01",
                             "storage" : {
                             }
@@ -139,7 +139,7 @@
                     }
                 },
                 {
-                    "hash" : "c3f0b691dd86236f55e8016ca4761c7bdc2c3a62432d0aff06b602874d5102fa",
+                    "hash" : "0xc3f0b691dd86236f55e8016ca4761c7bdc2c3a62432d0aff06b602874d5102fa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -147,7 +147,7 @@
                     }
                 },
                 {
-                    "hash" : "c3f0b691dd86236f55e8016ca4761c7bdc2c3a62432d0aff06b602874d5102fa",
+                    "hash" : "0xc3f0b691dd86236f55e8016ca4761c7bdc2c3a62432d0aff06b602874d5102fa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -157,14 +157,14 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7dde00b2e7aea44866286f955462fedcb613e3b41303ef7e5c269cef5346247f",
+                    "hash" : "0x7dde00b2e7aea44866286f955462fedcb613e3b41303ef7e5c269cef5346247f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
                     "postState" : {
-                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                             "balance" : "0x0de0b6b3a764000a",
                             "code" : "0x600040600055600540600155600440600255",
                             "nonce" : "0x00",
@@ -172,16 +172,16 @@
                                 "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
                             }
                         },
-                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                             "balance" : "0xc786",
-                            "code" : "0x",
+                            "code" : "",
                             "nonce" : "0x00",
                             "storage" : {
                             }
                         },
-                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                             "balance" : "0x0e7ab0",
-                            "code" : "0x",
+                            "code" : "",
                             "nonce" : "0x01",
                             "storage" : {
                             }
@@ -189,14 +189,14 @@
                     }
                 },
                 {
-                    "hash" : "589fd4b64c670b0b1bc0afa275912befbdcba04749cbcc31f14e3746ebb82d06",
+                    "hash" : "0x589fd4b64c670b0b1bc0afa275912befbdcba04749cbcc31f14e3746ebb82d06",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 1
                     },
                     "postState" : {
-                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                             "balance" : "0x0de0b6b3a7640000",
                             "code" : "0x600040600055600540600155600440600255",
                             "nonce" : "0x00",
@@ -204,16 +204,16 @@
                                 "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
                             }
                         },
-                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                             "balance" : "0xc786",
-                            "code" : "0x",
+                            "code" : "",
                             "nonce" : "0x00",
                             "storage" : {
                             }
                         },
-                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                             "balance" : "0x0e7aba",
-                            "code" : "0x",
+                            "code" : "",
                             "nonce" : "0x01",
                             "storage" : {
                             }
@@ -221,14 +221,14 @@
                     }
                 },
                 {
-                    "hash" : "7dde00b2e7aea44866286f955462fedcb613e3b41303ef7e5c269cef5346247f",
+                    "hash" : "0x7dde00b2e7aea44866286f955462fedcb613e3b41303ef7e5c269cef5346247f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
                         "value" : 0
                     },
                     "postState" : {
-                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                             "balance" : "0x0de0b6b3a764000a",
                             "code" : "0x600040600055600540600155600440600255",
                             "nonce" : "0x00",
@@ -236,16 +236,16 @@
                                 "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
                             }
                         },
-                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                             "balance" : "0xc786",
-                            "code" : "0x",
+                            "code" : "",
                             "nonce" : "0x00",
                             "storage" : {
                             }
                         },
-                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                             "balance" : "0x0e7ab0",
-                            "code" : "0x",
+                            "code" : "",
                             "nonce" : "0x01",
                             "storage" : {
                             }
@@ -253,14 +253,14 @@
                     }
                 },
                 {
-                    "hash" : "589fd4b64c670b0b1bc0afa275912befbdcba04749cbcc31f14e3746ebb82d06",
+                    "hash" : "0x589fd4b64c670b0b1bc0afa275912befbdcba04749cbcc31f14e3746ebb82d06",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
                         "value" : 1
                     },
                     "postState" : {
-                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                             "balance" : "0x0de0b6b3a7640000",
                             "code" : "0x600040600055600540600155600440600255",
                             "nonce" : "0x00",
@@ -268,16 +268,16 @@
                                 "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
                             }
                         },
-                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                             "balance" : "0xc786",
-                            "code" : "0x",
+                            "code" : "",
                             "nonce" : "0x00",
                             "storage" : {
                             }
                         },
-                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                             "balance" : "0x0e7aba",
-                            "code" : "0x",
+                            "code" : "",
                             "nonce" : "0x01",
                             "storage" : {
                             }
@@ -285,7 +285,7 @@
                     }
                 },
                 {
-                    "hash" : "c3f0b691dd86236f55e8016ca4761c7bdc2c3a62432d0aff06b602874d5102fa",
+                    "hash" : "0xc3f0b691dd86236f55e8016ca4761c7bdc2c3a62432d0aff06b602874d5102fa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -293,7 +293,7 @@
                     }
                 },
                 {
-                    "hash" : "c3f0b691dd86236f55e8016ca4761c7bdc2c3a62432d0aff06b602874d5102fa",
+                    "hash" : "0xc3f0b691dd86236f55e8016ca4761c7bdc2c3a62432d0aff06b602874d5102fa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -303,14 +303,14 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "7dde00b2e7aea44866286f955462fedcb613e3b41303ef7e5c269cef5346247f",
+                    "hash" : "0x7dde00b2e7aea44866286f955462fedcb613e3b41303ef7e5c269cef5346247f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
                     "postState" : {
-                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                             "balance" : "0x0de0b6b3a764000a",
                             "code" : "0x600040600055600540600155600440600255",
                             "nonce" : "0x00",
@@ -318,16 +318,16 @@
                                 "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
                             }
                         },
-                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                             "balance" : "0xc786",
-                            "code" : "0x",
+                            "code" : "",
                             "nonce" : "0x00",
                             "storage" : {
                             }
                         },
-                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                             "balance" : "0x0e7ab0",
-                            "code" : "0x",
+                            "code" : "",
                             "nonce" : "0x01",
                             "storage" : {
                             }
@@ -335,14 +335,14 @@
                     }
                 },
                 {
-                    "hash" : "589fd4b64c670b0b1bc0afa275912befbdcba04749cbcc31f14e3746ebb82d06",
+                    "hash" : "0x589fd4b64c670b0b1bc0afa275912befbdcba04749cbcc31f14e3746ebb82d06",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 1
                     },
                     "postState" : {
-                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                             "balance" : "0x0de0b6b3a7640000",
                             "code" : "0x600040600055600540600155600440600255",
                             "nonce" : "0x00",
@@ -350,16 +350,16 @@
                                 "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
                             }
                         },
-                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                             "balance" : "0xc786",
-                            "code" : "0x",
+                            "code" : "",
                             "nonce" : "0x00",
                             "storage" : {
                             }
                         },
-                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                             "balance" : "0x0e7aba",
-                            "code" : "0x",
+                            "code" : "",
                             "nonce" : "0x01",
                             "storage" : {
                             }
@@ -367,14 +367,14 @@
                     }
                 },
                 {
-                    "hash" : "7dde00b2e7aea44866286f955462fedcb613e3b41303ef7e5c269cef5346247f",
+                    "hash" : "0x7dde00b2e7aea44866286f955462fedcb613e3b41303ef7e5c269cef5346247f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
                         "value" : 0
                     },
                     "postState" : {
-                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                             "balance" : "0x0de0b6b3a764000a",
                             "code" : "0x600040600055600540600155600440600255",
                             "nonce" : "0x00",
@@ -382,16 +382,16 @@
                                 "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
                             }
                         },
-                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                             "balance" : "0xc786",
-                            "code" : "0x",
+                            "code" : "",
                             "nonce" : "0x00",
                             "storage" : {
                             }
                         },
-                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                             "balance" : "0x0e7ab0",
-                            "code" : "0x",
+                            "code" : "",
                             "nonce" : "0x01",
                             "storage" : {
                             }
@@ -399,14 +399,14 @@
                     }
                 },
                 {
-                    "hash" : "589fd4b64c670b0b1bc0afa275912befbdcba04749cbcc31f14e3746ebb82d06",
+                    "hash" : "0x589fd4b64c670b0b1bc0afa275912befbdcba04749cbcc31f14e3746ebb82d06",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
                         "value" : 1
                     },
                     "postState" : {
-                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                             "balance" : "0x0de0b6b3a7640000",
                             "code" : "0x600040600055600540600155600440600255",
                             "nonce" : "0x00",
@@ -414,16 +414,16 @@
                                 "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
                             }
                         },
-                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                             "balance" : "0xc786",
-                            "code" : "0x",
+                            "code" : "",
                             "nonce" : "0x00",
                             "storage" : {
                             }
                         },
-                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                             "balance" : "0x0e7aba",
-                            "code" : "0x",
+                            "code" : "",
                             "nonce" : "0x01",
                             "storage" : {
                             }
@@ -431,7 +431,7 @@
                     }
                 },
                 {
-                    "hash" : "c3f0b691dd86236f55e8016ca4761c7bdc2c3a62432d0aff06b602874d5102fa",
+                    "hash" : "0xc3f0b691dd86236f55e8016ca4761c7bdc2c3a62432d0aff06b602874d5102fa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -439,7 +439,7 @@
                     }
                 },
                 {
-                    "hash" : "c3f0b691dd86236f55e8016ca4761c7bdc2c3a62432d0aff06b602874d5102fa",
+                    "hash" : "0xc3f0b691dd86236f55e8016ca4761c7bdc2c3a62432d0aff06b602874d5102fa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -449,14 +449,14 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "7dde00b2e7aea44866286f955462fedcb613e3b41303ef7e5c269cef5346247f",
+                    "hash" : "0x7dde00b2e7aea44866286f955462fedcb613e3b41303ef7e5c269cef5346247f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
                     "postState" : {
-                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                             "balance" : "0x0de0b6b3a764000a",
                             "code" : "0x600040600055600540600155600440600255",
                             "nonce" : "0x00",
@@ -464,16 +464,16 @@
                                 "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
                             }
                         },
-                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                             "balance" : "0xc786",
-                            "code" : "0x",
+                            "code" : "",
                             "nonce" : "0x00",
                             "storage" : {
                             }
                         },
-                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                             "balance" : "0x0e7ab0",
-                            "code" : "0x",
+                            "code" : "",
                             "nonce" : "0x01",
                             "storage" : {
                             }
@@ -481,14 +481,14 @@
                     }
                 },
                 {
-                    "hash" : "589fd4b64c670b0b1bc0afa275912befbdcba04749cbcc31f14e3746ebb82d06",
+                    "hash" : "0x589fd4b64c670b0b1bc0afa275912befbdcba04749cbcc31f14e3746ebb82d06",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 1
                     },
                     "postState" : {
-                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                             "balance" : "0x0de0b6b3a7640000",
                             "code" : "0x600040600055600540600155600440600255",
                             "nonce" : "0x00",
@@ -496,16 +496,16 @@
                                 "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
                             }
                         },
-                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                             "balance" : "0xc786",
-                            "code" : "0x",
+                            "code" : "",
                             "nonce" : "0x00",
                             "storage" : {
                             }
                         },
-                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                             "balance" : "0x0e7aba",
-                            "code" : "0x",
+                            "code" : "",
                             "nonce" : "0x01",
                             "storage" : {
                             }
@@ -513,14 +513,14 @@
                     }
                 },
                 {
-                    "hash" : "7dde00b2e7aea44866286f955462fedcb613e3b41303ef7e5c269cef5346247f",
+                    "hash" : "0x7dde00b2e7aea44866286f955462fedcb613e3b41303ef7e5c269cef5346247f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
                         "value" : 0
                     },
                     "postState" : {
-                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                             "balance" : "0x0de0b6b3a764000a",
                             "code" : "0x600040600055600540600155600440600255",
                             "nonce" : "0x00",
@@ -528,16 +528,16 @@
                                 "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
                             }
                         },
-                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                             "balance" : "0xc786",
-                            "code" : "0x",
+                            "code" : "",
                             "nonce" : "0x00",
                             "storage" : {
                             }
                         },
-                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                             "balance" : "0x0e7ab0",
-                            "code" : "0x",
+                            "code" : "",
                             "nonce" : "0x01",
                             "storage" : {
                             }
@@ -545,14 +545,14 @@
                     }
                 },
                 {
-                    "hash" : "589fd4b64c670b0b1bc0afa275912befbdcba04749cbcc31f14e3746ebb82d06",
+                    "hash" : "0x589fd4b64c670b0b1bc0afa275912befbdcba04749cbcc31f14e3746ebb82d06",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
                         "value" : 1
                     },
                     "postState" : {
-                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                             "balance" : "0x0de0b6b3a7640000",
                             "code" : "0x600040600055600540600155600440600255",
                             "nonce" : "0x00",
@@ -560,16 +560,16 @@
                                 "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
                             }
                         },
-                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                             "balance" : "0xc786",
-                            "code" : "0x",
+                            "code" : "",
                             "nonce" : "0x00",
                             "storage" : {
                             }
                         },
-                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                             "balance" : "0x0e7aba",
-                            "code" : "0x",
+                            "code" : "",
                             "nonce" : "0x01",
                             "storage" : {
                             }
@@ -577,7 +577,7 @@
                     }
                 },
                 {
-                    "hash" : "c3f0b691dd86236f55e8016ca4761c7bdc2c3a62432d0aff06b602874d5102fa",
+                    "hash" : "0xc3f0b691dd86236f55e8016ca4761c7bdc2c3a62432d0aff06b602874d5102fa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -585,7 +585,153 @@
                     }
                 },
                 {
-                    "hash" : "c3f0b691dd86236f55e8016ca4761c7bdc2c3a62432d0aff06b602874d5102fa",
+                    "hash" : "0xc3f0b691dd86236f55e8016ca4761c7bdc2c3a62432d0aff06b602874d5102fa",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 1
+                    }
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x7dde00b2e7aea44866286f955462fedcb613e3b41303ef7e5c269cef5346247f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "postState" : {
+                        "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                            "balance" : "0x0de0b6b3a764000a",
+                            "code" : "0x600040600055600540600155600440600255",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
+                            }
+                        },
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0xc786",
+                            "code" : "",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x0e7ab0",
+                            "code" : "",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        }
+                    }
+                },
+                {
+                    "hash" : "0x589fd4b64c670b0b1bc0afa275912befbdcba04749cbcc31f14e3746ebb82d06",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 1
+                    },
+                    "postState" : {
+                        "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                            "balance" : "0x0de0b6b3a7640000",
+                            "code" : "0x600040600055600540600155600440600255",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
+                            }
+                        },
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0xc786",
+                            "code" : "",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x0e7aba",
+                            "code" : "",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        }
+                    }
+                },
+                {
+                    "hash" : "0x7dde00b2e7aea44866286f955462fedcb613e3b41303ef7e5c269cef5346247f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "postState" : {
+                        "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                            "balance" : "0x0de0b6b3a764000a",
+                            "code" : "0x600040600055600540600155600440600255",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
+                            }
+                        },
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0xc786",
+                            "code" : "",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x0e7ab0",
+                            "code" : "",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        }
+                    }
+                },
+                {
+                    "hash" : "0x589fd4b64c670b0b1bc0afa275912befbdcba04749cbcc31f14e3746ebb82d06",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 1
+                    },
+                    "postState" : {
+                        "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                            "balance" : "0x0de0b6b3a7640000",
+                            "code" : "0x600040600055600540600155600440600255",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
+                            }
+                        },
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0xc786",
+                            "code" : "",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x0e7aba",
+                            "code" : "",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        }
+                    }
+                },
+                {
+                    "hash" : "0xc3f0b691dd86236f55e8016ca4761c7bdc2c3a62432d0aff06b602874d5102fa",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 0
+                    }
+                },
+                {
+                    "hash" : "0xc3f0b691dd86236f55e8016ca4761c7bdc2c3a62432d0aff06b602874d5102fa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -595,16 +741,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x600040600055600540600155600440600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -615,17 +761,17 @@
                 ""
             ],
             "gasLimit" : [
-                "285000",
-                "100000",
-                "6000"
+                "0x045948",
+                "0x0186a0",
+                "0x1770"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "10",
-                "0"
+                "0x0a",
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stBlockHashTest/blockhashDOS-sec71.json b/GeneralStateTests/stBlockHashTest/blockhashDOS-sec71.json
index 1abcc0a24..c5dd81be3 100644
--- a/GeneralStateTests/stBlockHashTest/blockhashDOS-sec71.json
+++ b/GeneralStateTests/stBlockHashTest/blockhashDOS-sec71.json
@@ -1,17 +1,17 @@
 {
     "blockhashDOS-sec71" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x05f5e100",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "deaeedc934ff97651b5b893c572275be72fd13816372259a11adc8f96dcbec51",
+                    "hash" : "0xdeaeedc934ff97651b5b893c572275be72fd13816372259a11adc8f96dcbec51",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "deaeedc934ff97651b5b893c572275be72fd13816372259a11adc8f96dcbec51",
+                    "hash" : "0xdeaeedc934ff97651b5b893c572275be72fd13816372259a11adc8f96dcbec51",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "deaeedc934ff97651b5b893c572275be72fd13816372259a11adc8f96dcbec51",
+                    "hash" : "0xdeaeedc934ff97651b5b893c572275be72fd13816372259a11adc8f96dcbec51",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,17 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "deaeedc934ff97651b5b893c572275be72fd13816372259a11adc8f96dcbec51",
+                    "hash" : "0xdeaeedc934ff97651b5b893c572275be72fd13816372259a11adc8f96dcbec51",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0xdeaeedc934ff97651b5b893c572275be72fd13816372259a11adc8f96dcbec51",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x61010043035b804050600556",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x3b9aca00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -71,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "750000"
+                "0x0b71b0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stBlockHashTest/blockhashInRange.json b/GeneralStateTests/stBlockHashTest/blockhashInRange.json
index 233e460b3..4e135e5b5 100644
--- a/GeneralStateTests/stBlockHashTest/blockhashInRange.json
+++ b/GeneralStateTests/stBlockHashTest/blockhashInRange.json
@@ -1,24 +1,24 @@
 {
     "blockhashInRange" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x05f5e100",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "fb1c9b7caeafea4ac77fe6fe63a93d9e815ad46f077ddb97ad5af252c797848b",
+                    "hash" : "0xfb1c9b7caeafea4ac77fe6fe63a93d9e815ad46f077ddb97ad5af252c797848b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
                     "postState" : {
-                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                             "balance" : "0x0de0b6b3a764000a",
                             "code" : "0x60004060005560024060015561010040600255",
                             "nonce" : "0x00",
@@ -26,16 +26,16 @@
                                 "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
                             }
                         },
-                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                             "balance" : "0xc786",
-                            "code" : "0x",
+                            "code" : "",
                             "nonce" : "0x00",
                             "storage" : {
                             }
                         },
-                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                             "balance" : "0x0e7ab0",
-                            "code" : "0x",
+                            "code" : "",
                             "nonce" : "0x01",
                             "storage" : {
                             }
@@ -45,14 +45,14 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "fb1c9b7caeafea4ac77fe6fe63a93d9e815ad46f077ddb97ad5af252c797848b",
+                    "hash" : "0xfb1c9b7caeafea4ac77fe6fe63a93d9e815ad46f077ddb97ad5af252c797848b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
                     "postState" : {
-                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                             "balance" : "0x0de0b6b3a764000a",
                             "code" : "0x60004060005560024060015561010040600255",
                             "nonce" : "0x00",
@@ -60,16 +60,16 @@
                                 "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
                             }
                         },
-                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                             "balance" : "0xc786",
-                            "code" : "0x",
+                            "code" : "",
                             "nonce" : "0x00",
                             "storage" : {
                             }
                         },
-                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                             "balance" : "0x0e7ab0",
-                            "code" : "0x",
+                            "code" : "",
                             "nonce" : "0x01",
                             "storage" : {
                             }
@@ -79,14 +79,14 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "fb1c9b7caeafea4ac77fe6fe63a93d9e815ad46f077ddb97ad5af252c797848b",
+                    "hash" : "0xfb1c9b7caeafea4ac77fe6fe63a93d9e815ad46f077ddb97ad5af252c797848b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
                     "postState" : {
-                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                             "balance" : "0x0de0b6b3a764000a",
                             "code" : "0x60004060005560024060015561010040600255",
                             "nonce" : "0x00",
@@ -94,16 +94,16 @@
                                 "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
                             }
                         },
-                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                             "balance" : "0xc786",
-                            "code" : "0x",
+                            "code" : "",
                             "nonce" : "0x00",
                             "storage" : {
                             }
                         },
-                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                             "balance" : "0x0e7ab0",
-                            "code" : "0x",
+                            "code" : "",
                             "nonce" : "0x01",
                             "storage" : {
                             }
@@ -113,14 +113,14 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "fb1c9b7caeafea4ac77fe6fe63a93d9e815ad46f077ddb97ad5af252c797848b",
+                    "hash" : "0xfb1c9b7caeafea4ac77fe6fe63a93d9e815ad46f077ddb97ad5af252c797848b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
                     "postState" : {
-                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                             "balance" : "0x0de0b6b3a764000a",
                             "code" : "0x60004060005560024060015561010040600255",
                             "nonce" : "0x00",
@@ -128,16 +128,50 @@
                                 "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
                             }
                         },
-                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                             "balance" : "0xc786",
-                            "code" : "0x",
+                            "code" : "",
                             "nonce" : "0x00",
                             "storage" : {
                             }
                         },
-                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                             "balance" : "0x0e7ab0",
-                            "code" : "0x",
+                            "code" : "",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        }
+                    }
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0xfb1c9b7caeafea4ac77fe6fe63a93d9e815ad46f077ddb97ad5af252c797848b",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "postState" : {
+                        "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                            "balance" : "0x0de0b6b3a764000a",
+                            "code" : "0x60004060005560024060015561010040600255",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
+                            }
+                        },
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0xc786",
+                            "code" : "",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x0e7ab0",
+                            "code" : "",
                             "nonce" : "0x01",
                             "storage" : {
                             }
@@ -147,16 +181,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60004060005560024060015561010040600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -167,14 +201,14 @@
                 ""
             ],
             "gasLimit" : [
-                "285000"
+                "0x045948"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stBlockHashTest/blockhashJIT.json b/GeneralStateTests/stBlockHashTest/blockhashJIT.json
index f37c24c9a..90083ac1c 100644
--- a/GeneralStateTests/stBlockHashTest/blockhashJIT.json
+++ b/GeneralStateTests/stBlockHashTest/blockhashJIT.json
@@ -1,24 +1,24 @@
 {
     "blockhashJIT" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x174876e800",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d32623abb53ca341e9100e60eef122c5ce7063b90893baafd5101803960d51e0",
+                    "hash" : "0xd32623abb53ca341e9100e60eef122c5ce7063b90893baafd5101803960d51e0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
                     "postState" : {
-                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                             "balance" : "0x0de0b6b3a764000a",
                             "code" : "0x6000406000556801000000000000000140600155",
                             "nonce" : "0x00",
@@ -26,16 +26,16 @@
                                 "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
                             }
                         },
-                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                             "balance" : "0xb3e4",
-                            "code" : "0x",
+                            "code" : "",
                             "nonce" : "0x00",
                             "storage" : {
                             }
                         },
-                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                             "balance" : "0x0e8e52",
-                            "code" : "0x",
+                            "code" : "",
                             "nonce" : "0x01",
                             "storage" : {
                             }
@@ -45,14 +45,14 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d32623abb53ca341e9100e60eef122c5ce7063b90893baafd5101803960d51e0",
+                    "hash" : "0xd32623abb53ca341e9100e60eef122c5ce7063b90893baafd5101803960d51e0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
                     "postState" : {
-                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                             "balance" : "0x0de0b6b3a764000a",
                             "code" : "0x6000406000556801000000000000000140600155",
                             "nonce" : "0x00",
@@ -60,16 +60,16 @@
                                 "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
                             }
                         },
-                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                             "balance" : "0xb3e4",
-                            "code" : "0x",
+                            "code" : "",
                             "nonce" : "0x00",
                             "storage" : {
                             }
                         },
-                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                             "balance" : "0x0e8e52",
-                            "code" : "0x",
+                            "code" : "",
                             "nonce" : "0x01",
                             "storage" : {
                             }
@@ -79,14 +79,14 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "d32623abb53ca341e9100e60eef122c5ce7063b90893baafd5101803960d51e0",
+                    "hash" : "0xd32623abb53ca341e9100e60eef122c5ce7063b90893baafd5101803960d51e0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
                     "postState" : {
-                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                             "balance" : "0x0de0b6b3a764000a",
                             "code" : "0x6000406000556801000000000000000140600155",
                             "nonce" : "0x00",
@@ -94,16 +94,16 @@
                                 "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
                             }
                         },
-                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                             "balance" : "0xb3e4",
-                            "code" : "0x",
+                            "code" : "",
                             "nonce" : "0x00",
                             "storage" : {
                             }
                         },
-                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                             "balance" : "0x0e8e52",
-                            "code" : "0x",
+                            "code" : "",
                             "nonce" : "0x01",
                             "storage" : {
                             }
@@ -113,14 +113,14 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "d32623abb53ca341e9100e60eef122c5ce7063b90893baafd5101803960d51e0",
+                    "hash" : "0xd32623abb53ca341e9100e60eef122c5ce7063b90893baafd5101803960d51e0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
                     "postState" : {
-                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                             "balance" : "0x0de0b6b3a764000a",
                             "code" : "0x6000406000556801000000000000000140600155",
                             "nonce" : "0x00",
@@ -128,16 +128,50 @@
                                 "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
                             }
                         },
-                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                             "balance" : "0xb3e4",
-                            "code" : "0x",
+                            "code" : "",
                             "nonce" : "0x00",
                             "storage" : {
                             }
                         },
-                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                             "balance" : "0x0e8e52",
-                            "code" : "0x",
+                            "code" : "",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        }
+                    }
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0xd32623abb53ca341e9100e60eef122c5ce7063b90893baafd5101803960d51e0",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "postState" : {
+                        "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                            "balance" : "0x0de0b6b3a764000a",
+                            "code" : "0x6000406000556801000000000000000140600155",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
+                            }
+                        },
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0xb3e4",
+                            "code" : "",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x0e8e52",
+                            "code" : "",
                             "nonce" : "0x01",
                             "storage" : {
                             }
@@ -147,16 +181,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6000406000556801000000000000000140600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -167,14 +201,14 @@
                 ""
             ],
             "gasLimit" : [
-                "285000"
+                "0x045948"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stBlockHashTest/blockhashOutOfRange.json b/GeneralStateTests/stBlockHashTest/blockhashOutOfRange.json
index 61738890f..3e4870c8c 100644
--- a/GeneralStateTests/stBlockHashTest/blockhashOutOfRange.json
+++ b/GeneralStateTests/stBlockHashTest/blockhashOutOfRange.json
@@ -1,24 +1,24 @@
 {
     "blockhashOutOfRange" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x05f5e100",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "4e785c13d8eb1e675e75608830b914bd16754c6d432abcdbee2362563d00dfd1",
+                    "hash" : "0x4e785c13d8eb1e675e75608830b914bd16754c6d432abcdbee2362563d00dfd1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
                     "postState" : {
-                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                             "balance" : "0x0de0b6b3a764000a",
                             "code" : "0x600040600055610101406001557fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff40600255",
                             "nonce" : "0x00",
@@ -26,16 +26,16 @@
                                 "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
                             }
                         },
-                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                             "balance" : "0xc786",
-                            "code" : "0x",
+                            "code" : "",
                             "nonce" : "0x00",
                             "storage" : {
                             }
                         },
-                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                             "balance" : "0x39f780",
-                            "code" : "0x",
+                            "code" : "",
                             "nonce" : "0x01",
                             "storage" : {
                             }
@@ -45,14 +45,14 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "4e785c13d8eb1e675e75608830b914bd16754c6d432abcdbee2362563d00dfd1",
+                    "hash" : "0x4e785c13d8eb1e675e75608830b914bd16754c6d432abcdbee2362563d00dfd1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
                     "postState" : {
-                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                             "balance" : "0x0de0b6b3a764000a",
                             "code" : "0x600040600055610101406001557fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff40600255",
                             "nonce" : "0x00",
@@ -60,16 +60,16 @@
                                 "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
                             }
                         },
-                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                             "balance" : "0xc786",
-                            "code" : "0x",
+                            "code" : "",
                             "nonce" : "0x00",
                             "storage" : {
                             }
                         },
-                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                             "balance" : "0x39f780",
-                            "code" : "0x",
+                            "code" : "",
                             "nonce" : "0x01",
                             "storage" : {
                             }
@@ -79,14 +79,14 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4e785c13d8eb1e675e75608830b914bd16754c6d432abcdbee2362563d00dfd1",
+                    "hash" : "0x4e785c13d8eb1e675e75608830b914bd16754c6d432abcdbee2362563d00dfd1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
                     "postState" : {
-                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                             "balance" : "0x0de0b6b3a764000a",
                             "code" : "0x600040600055610101406001557fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff40600255",
                             "nonce" : "0x00",
@@ -94,16 +94,16 @@
                                 "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
                             }
                         },
-                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                             "balance" : "0xc786",
-                            "code" : "0x",
+                            "code" : "",
                             "nonce" : "0x00",
                             "storage" : {
                             }
                         },
-                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                             "balance" : "0x39f780",
-                            "code" : "0x",
+                            "code" : "",
                             "nonce" : "0x01",
                             "storage" : {
                             }
@@ -113,14 +113,14 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4e785c13d8eb1e675e75608830b914bd16754c6d432abcdbee2362563d00dfd1",
+                    "hash" : "0x4e785c13d8eb1e675e75608830b914bd16754c6d432abcdbee2362563d00dfd1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
                     "postState" : {
-                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                             "balance" : "0x0de0b6b3a764000a",
                             "code" : "0x600040600055610101406001557fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff40600255",
                             "nonce" : "0x00",
@@ -128,16 +128,50 @@
                                 "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
                             }
                         },
-                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                             "balance" : "0xc786",
-                            "code" : "0x",
+                            "code" : "",
                             "nonce" : "0x00",
                             "storage" : {
                             }
                         },
-                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                             "balance" : "0x39f780",
-                            "code" : "0x",
+                            "code" : "",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        }
+                    }
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x4e785c13d8eb1e675e75608830b914bd16754c6d432abcdbee2362563d00dfd1",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "postState" : {
+                        "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                            "balance" : "0x0de0b6b3a764000a",
+                            "code" : "0x600040600055610101406001557fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff40600255",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
+                            }
+                        },
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0xc786",
+                            "code" : "",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x39f780",
+                            "code" : "",
                             "nonce" : "0x01",
                             "storage" : {
                             }
@@ -147,16 +181,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x600040600055610101406001557fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff40600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x3abf10",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -167,14 +201,14 @@
                 ""
             ],
             "gasLimit" : [
-                "2850000"
+                "0x2b7cd0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/call_OOG_additionalGasCosts1.json b/GeneralStateTests/stCallCodes/call_OOG_additionalGasCosts1.json
index 30a727fed..52c0e3d98 100644
--- a/GeneralStateTests/stCallCodes/call_OOG_additionalGasCosts1.json
+++ b/GeneralStateTests/stCallCodes/call_OOG_additionalGasCosts1.json
@@ -1,17 +1,17 @@
 {
     "call_OOG_additionalGasCosts1" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0xb2d05e00",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "8062bf5562f807ca2bd8f94dc31bc3b77775d5fef1e6b9ed74549acf3742cbbe",
+                    "hash" : "0x8062bf5562f807ca2bd8f94dc31bc3b77775d5fef1e6b9ed74549acf3742cbbe",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "8e5bd1989eadfd5129c7f0ae2ba9be8c347a8d109a000c333443a582eafcc58d",
+                    "hash" : "0x8e5bd1989eadfd5129c7f0ae2ba9be8c347a8d109a000c333443a582eafcc58d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "8062bf5562f807ca2bd8f94dc31bc3b77775d5fef1e6b9ed74549acf3742cbbe",
+                    "hash" : "0x8062bf5562f807ca2bd8f94dc31bc3b77775d5fef1e6b9ed74549acf3742cbbe",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "8062bf5562f807ca2bd8f94dc31bc3b77775d5fef1e6b9ed74549acf3742cbbe",
+                    "hash" : "0x8062bf5562f807ca2bd8f94dc31bc3b77775d5fef1e6b9ed74549acf3742cbbe",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "8e5bd1989eadfd5129c7f0ae2ba9be8c347a8d109a000c333443a582eafcc58d",
+                    "hash" : "0x8e5bd1989eadfd5129c7f0ae2ba9be8c347a8d109a000c333443a582eafcc58d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001611770f1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "30000"
+                "0x7530"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/call_OOG_additionalGasCosts2.json b/GeneralStateTests/stCallCodes/call_OOG_additionalGasCosts2.json
index 1381a6591..2daeeabaa 100644
--- a/GeneralStateTests/stCallCodes/call_OOG_additionalGasCosts2.json
+++ b/GeneralStateTests/stCallCodes/call_OOG_additionalGasCosts2.json
@@ -1,17 +1,17 @@
 {
     "call_OOG_additionalGasCosts2" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0xb2d05e00",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "955466c86ec6ae7bead1f090c49283297a57ccaee9cbced7e7f03f21539503e6",
+                    "hash" : "0x955466c86ec6ae7bead1f090c49283297a57ccaee9cbced7e7f03f21539503e6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "955466c86ec6ae7bead1f090c49283297a57ccaee9cbced7e7f03f21539503e6",
+                    "hash" : "0x955466c86ec6ae7bead1f090c49283297a57ccaee9cbced7e7f03f21539503e6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "955466c86ec6ae7bead1f090c49283297a57ccaee9cbced7e7f03f21539503e6",
+                    "hash" : "0x955466c86ec6ae7bead1f090c49283297a57ccaee9cbced7e7f03f21539503e6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "955466c86ec6ae7bead1f090c49283297a57ccaee9cbced7e7f03f21539503e6",
+                    "hash" : "0x955466c86ec6ae7bead1f090c49283297a57ccaee9cbced7e7f03f21539503e6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "955466c86ec6ae7bead1f090c49283297a57ccaee9cbced7e7f03f21539503e6",
+                    "hash" : "0x955466c86ec6ae7bead1f090c49283297a57ccaee9cbced7e7f03f21539503e6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006001731000000000000000000000000000000000000001611770f1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "30000"
+                "0x7530"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcall_00.json b/GeneralStateTests/stCallCodes/callcall_00.json
index 76993a515..f90aa8b2c 100644
--- a/GeneralStateTests/stCallCodes/callcall_00.json
+++ b/GeneralStateTests/stCallCodes/callcall_00.json
@@ -1,17 +1,17 @@
 {
     "callcall_00" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7ebd8fdaaeb5e96fd2ad3b11c675e3b16e5902ae4fe100710f39925e59ccd914",
+                    "hash" : "0x7ebd8fdaaeb5e96fd2ad3b11c675e3b16e5902ae4fe100710f39925e59ccd914",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7ebd8fdaaeb5e96fd2ad3b11c675e3b16e5902ae4fe100710f39925e59ccd914",
+                    "hash" : "0x7ebd8fdaaeb5e96fd2ad3b11c675e3b16e5902ae4fe100710f39925e59ccd914",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "8f8ed2aed2973e159fa5486f47c6ebf15c5058f8e2350286b84b569bc6ce2d25",
+                    "hash" : "0x8f8ed2aed2973e159fa5486f47c6ebf15c5058f8e2350286b84b569bc6ce2d25",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "8f8ed2aed2973e159fa5486f47c6ebf15c5058f8e2350286b84b569bc6ce2d25",
+                    "hash" : "0x8f8ed2aed2973e159fa5486f47c6ebf15c5058f8e2350286b84b569bc6ce2d25",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7ebd8fdaaeb5e96fd2ad3b11c675e3b16e5902ae4fe100710f39925e59ccd914",
+                    "hash" : "0x7ebd8fdaaeb5e96fd2ad3b11c675e3b16e5902ae4fe100710f39925e59ccd914",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160025533600455346007553060e6553260e8553660ec553860ee553a60f055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcall_00_OOGE.json b/GeneralStateTests/stCallCodes/callcall_00_OOGE.json
index 8799f8bf0..d26961110 100644
--- a/GeneralStateTests/stCallCodes/callcall_00_OOGE.json
+++ b/GeneralStateTests/stCallCodes/callcall_00_OOGE.json
@@ -1,17 +1,17 @@
 {
     "callcall_00_OOGE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9ec338ed8924f9d1ec3c31a3869815c4d36353c789941aaf432128a12102bfd5",
+                    "hash" : "0x9ec338ed8924f9d1ec3c31a3869815c4d36353c789941aaf432128a12102bfd5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9ec338ed8924f9d1ec3c31a3869815c4d36353c789941aaf432128a12102bfd5",
+                    "hash" : "0x9ec338ed8924f9d1ec3c31a3869815c4d36353c789941aaf432128a12102bfd5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a66f080864c72c593d874a42aa8c17eff838bf1e45ecb0bbe2bb041a3c235f94",
+                    "hash" : "0xa66f080864c72c593d874a42aa8c17eff838bf1e45ecb0bbe2bb041a3c235f94",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a66f080864c72c593d874a42aa8c17eff838bf1e45ecb0bbe2bb041a3c235f94",
+                    "hash" : "0xa66f080864c72c593d874a42aa8c17eff838bf1e45ecb0bbe2bb041a3c235f94",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9ec338ed8924f9d1ec3c31a3869815c4d36353c789941aaf432128a12102bfd5",
+                    "hash" : "0x9ec338ed8924f9d1ec3c31a3869815c4d36353c789941aaf432128a12102bfd5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016002556001600252",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcall_00_OOGE_valueTransfer.json b/GeneralStateTests/stCallCodes/callcall_00_OOGE_valueTransfer.json
index bd4ffe0a4..fb0c65c8a 100644
--- a/GeneralStateTests/stCallCodes/callcall_00_OOGE_valueTransfer.json
+++ b/GeneralStateTests/stCallCodes/callcall_00_OOGE_valueTransfer.json
@@ -1,17 +1,17 @@
 {
     "callcall_00_OOGE_valueTransfer" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a0cd16519becf11ddd65f0aa43e0e4dafdef18d87de8fe4ac3e396758e8fb0a5",
+                    "hash" : "0xa0cd16519becf11ddd65f0aa43e0e4dafdef18d87de8fe4ac3e396758e8fb0a5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "18f49ad2f2527eabe4cf24910a048341c7875650f34679a96db8fd6147af702b",
+                    "hash" : "0x18f49ad2f2527eabe4cf24910a048341c7875650f34679a96db8fd6147af702b",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -29,7 +29,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a0cd16519becf11ddd65f0aa43e0e4dafdef18d87de8fe4ac3e396758e8fb0a5",
+                    "hash" : "0xa0cd16519becf11ddd65f0aa43e0e4dafdef18d87de8fe4ac3e396758e8fb0a5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -37,7 +37,7 @@
                     }
                 },
                 {
-                    "hash" : "18f49ad2f2527eabe4cf24910a048341c7875650f34679a96db8fd6147af702b",
+                    "hash" : "0x18f49ad2f2527eabe4cf24910a048341c7875650f34679a96db8fd6147af702b",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -47,7 +47,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3972c50ed3df88eb64729a02c3cfcb06ae7f0b2dbf16870213633e6d160936f9",
+                    "hash" : "0x3972c50ed3df88eb64729a02c3cfcb06ae7f0b2dbf16870213633e6d160936f9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -55,7 +55,7 @@
                     }
                 },
                 {
-                    "hash" : "3972c50ed3df88eb64729a02c3cfcb06ae7f0b2dbf16870213633e6d160936f9",
+                    "hash" : "0x3972c50ed3df88eb64729a02c3cfcb06ae7f0b2dbf16870213633e6d160936f9",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -65,7 +65,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3972c50ed3df88eb64729a02c3cfcb06ae7f0b2dbf16870213633e6d160936f9",
+                    "hash" : "0x3972c50ed3df88eb64729a02c3cfcb06ae7f0b2dbf16870213633e6d160936f9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -73,7 +73,7 @@
                     }
                 },
                 {
-                    "hash" : "3972c50ed3df88eb64729a02c3cfcb06ae7f0b2dbf16870213633e6d160936f9",
+                    "hash" : "0x3972c50ed3df88eb64729a02c3cfcb06ae7f0b2dbf16870213633e6d160936f9",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -83,7 +83,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a0cd16519becf11ddd65f0aa43e0e4dafdef18d87de8fe4ac3e396758e8fb0a5",
+                    "hash" : "0xa0cd16519becf11ddd65f0aa43e0e4dafdef18d87de8fe4ac3e396758e8fb0a5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -91,7 +91,7 @@
                     }
                 },
                 {
-                    "hash" : "18f49ad2f2527eabe4cf24910a048341c7875650f34679a96db8fd6147af702b",
+                    "hash" : "0x18f49ad2f2527eabe4cf24910a048341c7875650f34679a96db8fd6147af702b",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -101,30 +101,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60003560005260406000604060006014731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000600a731000000000000000000000000000000000000002600035f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016002556001600252",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -136,14 +136,14 @@
                 "0x0000000000000000000000000000000000000000000000000000000000001388"
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcall_00_SuicideEnd.json b/GeneralStateTests/stCallCodes/callcall_00_SuicideEnd.json
index 01207d160..beab33662 100644
--- a/GeneralStateTests/stCallCodes/callcall_00_SuicideEnd.json
+++ b/GeneralStateTests/stCallCodes/callcall_00_SuicideEnd.json
@@ -1,17 +1,17 @@
 {
     "callcall_00_SuicideEnd" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "24f1a71eb1db0e939e466f484a7bdc5e99020478c8792957b7283ae160ba5114",
+                    "hash" : "0x24f1a71eb1db0e939e466f484a7bdc5e99020478c8792957b7283ae160ba5114",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "24f1a71eb1db0e939e466f484a7bdc5e99020478c8792957b7283ae160ba5114",
+                    "hash" : "0x24f1a71eb1db0e939e466f484a7bdc5e99020478c8792957b7283ae160ba5114",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6edf980c4ea12c7909b073b2fd8902d00bb24a0b9df2142eb415aa31e4c7edda",
+                    "hash" : "0x6edf980c4ea12c7909b073b2fd8902d00bb24a0b9df2142eb415aa31e4c7edda",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6edf980c4ea12c7909b073b2fd8902d00bb24a0b9df2142eb415aa31e4c7edda",
+                    "hash" : "0x6edf980c4ea12c7909b073b2fd8902d00bb24a0b9df2142eb415aa31e4c7edda",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "24f1a71eb1db0e939e466f484a7bdc5e99020478c8792957b7283ae160ba5114",
+                    "hash" : "0x24f1a71eb1db0e939e466f484a7bdc5e99020478c8792957b7283ae160ba5114",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000261c350f1600155731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcallcall_000.json b/GeneralStateTests/stCallCodes/callcallcall_000.json
index ef411f366..4c8870ec4 100644
--- a/GeneralStateTests/stCallCodes/callcallcall_000.json
+++ b/GeneralStateTests/stCallCodes/callcallcall_000.json
@@ -1,17 +1,17 @@
 {
     "callcallcall_000" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "032e35d298fcec655b23a551cacd49a7fb4549bb4d962b3e8d011e9a49b584d6",
+                    "hash" : "0x032e35d298fcec655b23a551cacd49a7fb4549bb4d962b3e8d011e9a49b584d6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "032e35d298fcec655b23a551cacd49a7fb4549bb4d962b3e8d011e9a49b584d6",
+                    "hash" : "0x032e35d298fcec655b23a551cacd49a7fb4549bb4d962b3e8d011e9a49b584d6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "1ed24a8068d61509a3b7b1c30d1311735bba0587f6f6877efd5e74aa2364d382",
+                    "hash" : "0x1ed24a8068d61509a3b7b1c30d1311735bba0587f6f6877efd5e74aa2364d382",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "1ed24a8068d61509a3b7b1c30d1311735bba0587f6f6877efd5e74aa2364d382",
+                    "hash" : "0x1ed24a8068d61509a3b7b1c30d1311735bba0587f6f6877efd5e74aa2364d382",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "032e35d298fcec655b23a551cacd49a7fb4549bb4d962b3e8d011e9a49b584d6",
+                    "hash" : "0x032e35d298fcec655b23a551cacd49a7fb4549bb4d962b3e8d011e9a49b584d6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcallcall_000_OOGE.json b/GeneralStateTests/stCallCodes/callcallcall_000_OOGE.json
index 4b495ad22..b61466f93 100644
--- a/GeneralStateTests/stCallCodes/callcallcall_000_OOGE.json
+++ b/GeneralStateTests/stCallCodes/callcallcall_000_OOGE.json
@@ -1,17 +1,17 @@
 {
     "callcallcall_000_OOGE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "05e4fd564371885b0d4ece7dc2d92a18f71da4915d212db0c18d87ba94ce3fb1",
+                    "hash" : "0x05e4fd564371885b0d4ece7dc2d92a18f71da4915d212db0c18d87ba94ce3fb1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "05e4fd564371885b0d4ece7dc2d92a18f71da4915d212db0c18d87ba94ce3fb1",
+                    "hash" : "0x05e4fd564371885b0d4ece7dc2d92a18f71da4915d212db0c18d87ba94ce3fb1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "7d58669ba6ac24ea5bb8aae0dd7a7143b069e37b06e31fad81976a51f35a47f4",
+                    "hash" : "0x7d58669ba6ac24ea5bb8aae0dd7a7143b069e37b06e31fad81976a51f35a47f4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "7d58669ba6ac24ea5bb8aae0dd7a7143b069e37b06e31fad81976a51f35a47f4",
+                    "hash" : "0x7d58669ba6ac24ea5bb8aae0dd7a7143b069e37b06e31fad81976a51f35a47f4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "05e4fd564371885b0d4ece7dc2d92a18f71da4915d212db0c18d87ba94ce3fb1",
+                    "hash" : "0x05e4fd564371885b0d4ece7dc2d92a18f71da4915d212db0c18d87ba94ce3fb1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcallcall_000_OOGMAfter.json b/GeneralStateTests/stCallCodes/callcallcall_000_OOGMAfter.json
index f230931bd..3481d7d75 100644
--- a/GeneralStateTests/stCallCodes/callcallcall_000_OOGMAfter.json
+++ b/GeneralStateTests/stCallCodes/callcallcall_000_OOGMAfter.json
@@ -1,17 +1,17 @@
 {
     "callcallcall_000_OOGMAfter" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "eaa75d5c02ffb6835ea792d976c4944bc11f4e27a85227c8cf73ee14c451ff46",
+                    "hash" : "0xeaa75d5c02ffb6835ea792d976c4944bc11f4e27a85227c8cf73ee14c451ff46",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "eaa75d5c02ffb6835ea792d976c4944bc11f4e27a85227c8cf73ee14c451ff46",
+                    "hash" : "0xeaa75d5c02ffb6835ea792d976c4944bc11f4e27a85227c8cf73ee14c451ff46",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a767a97d79ec39107df9149cc68b1199fcdc3fd89a41193dd5c280eeb56ddc42",
+                    "hash" : "0xa767a97d79ec39107df9149cc68b1199fcdc3fd89a41193dd5c280eeb56ddc42",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a767a97d79ec39107df9149cc68b1199fcdc3fd89a41193dd5c280eeb56ddc42",
+                    "hash" : "0xa767a97d79ec39107df9149cc68b1199fcdc3fd89a41193dd5c280eeb56ddc42",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "eaa75d5c02ffb6835ea792d976c4944bc11f4e27a85227c8cf73ee14c451ff46",
+                    "hash" : "0xeaa75d5c02ffb6835ea792d976c4944bc11f4e27a85227c8cf73ee14c451ff46",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcallcall_000_OOGMBefore.json b/GeneralStateTests/stCallCodes/callcallcall_000_OOGMBefore.json
index 06c2bffdc..2ad4538ab 100644
--- a/GeneralStateTests/stCallCodes/callcallcall_000_OOGMBefore.json
+++ b/GeneralStateTests/stCallCodes/callcallcall_000_OOGMBefore.json
@@ -1,17 +1,17 @@
 {
     "callcallcall_000_OOGMBefore" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d2bc86dc047a69d169c9a13f9330765ff4509230af9d321fe367c09c30d095e1",
+                    "hash" : "0xd2bc86dc047a69d169c9a13f9330765ff4509230af9d321fe367c09c30d095e1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d2bc86dc047a69d169c9a13f9330765ff4509230af9d321fe367c09c30d095e1",
+                    "hash" : "0xd2bc86dc047a69d169c9a13f9330765ff4509230af9d321fe367c09c30d095e1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f46f37e7238438a444d89b8156b5cb11c331f0dafe29aa0c9d1396894b6ddf89",
+                    "hash" : "0xf46f37e7238438a444d89b8156b5cb11c331f0dafe29aa0c9d1396894b6ddf89",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f46f37e7238438a444d89b8156b5cb11c331f0dafe29aa0c9d1396894b6ddf89",
+                    "hash" : "0xf46f37e7238438a444d89b8156b5cb11c331f0dafe29aa0c9d1396894b6ddf89",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d2bc86dc047a69d169c9a13f9330765ff4509230af9d321fe367c09c30d095e1",
+                    "hash" : "0xd2bc86dc047a69d169c9a13f9330765ff4509230af9d321fe367c09c30d095e1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcallcall_000_SuicideEnd.json b/GeneralStateTests/stCallCodes/callcallcall_000_SuicideEnd.json
index a143f4f49..26638969d 100644
--- a/GeneralStateTests/stCallCodes/callcallcall_000_SuicideEnd.json
+++ b/GeneralStateTests/stCallCodes/callcallcall_000_SuicideEnd.json
@@ -1,17 +1,17 @@
 {
     "callcallcall_000_SuicideEnd" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "5c6d6ece9302edcdcc03a8fcbc0b16c8a09caf7764d920ff59477f10d55747c8",
+                    "hash" : "0x5c6d6ece9302edcdcc03a8fcbc0b16c8a09caf7764d920ff59477f10d55747c8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "5c6d6ece9302edcdcc03a8fcbc0b16c8a09caf7764d920ff59477f10d55747c8",
+                    "hash" : "0x5c6d6ece9302edcdcc03a8fcbc0b16c8a09caf7764d920ff59477f10d55747c8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b2cc70b5c91805a7ba65d849ab2f2977354a5ed97458fa5481daaa78dd01783f",
+                    "hash" : "0xb2cc70b5c91805a7ba65d849ab2f2977354a5ed97458fa5481daaa78dd01783f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b2cc70b5c91805a7ba65d849ab2f2977354a5ed97458fa5481daaa78dd01783f",
+                    "hash" : "0xb2cc70b5c91805a7ba65d849ab2f2977354a5ed97458fa5481daaa78dd01783f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "5c6d6ece9302edcdcc03a8fcbc0b16c8a09caf7764d920ff59477f10d55747c8",
+                    "hash" : "0x5c6d6ece9302edcdcc03a8fcbc0b16c8a09caf7764d920ff59477f10d55747c8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f1600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcallcall_000_SuicideMiddle.json b/GeneralStateTests/stCallCodes/callcallcall_000_SuicideMiddle.json
index e389ed74c..7fc31d259 100644
--- a/GeneralStateTests/stCallCodes/callcallcall_000_SuicideMiddle.json
+++ b/GeneralStateTests/stCallCodes/callcallcall_000_SuicideMiddle.json
@@ -1,17 +1,17 @@
 {
     "callcallcall_000_SuicideMiddle" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d9620bfd8663f199f897de8e5ea7554639c40fb564940dfc8f0b2aa7a2a8a0e8",
+                    "hash" : "0xd9620bfd8663f199f897de8e5ea7554639c40fb564940dfc8f0b2aa7a2a8a0e8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d9620bfd8663f199f897de8e5ea7554639c40fb564940dfc8f0b2aa7a2a8a0e8",
+                    "hash" : "0xd9620bfd8663f199f897de8e5ea7554639c40fb564940dfc8f0b2aa7a2a8a0e8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "23f8f86852e3e4a2e279acb10d051dda77dcf6af0c37ce21c97d73ece5af9951",
+                    "hash" : "0x23f8f86852e3e4a2e279acb10d051dda77dcf6af0c37ce21c97d73ece5af9951",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "23f8f86852e3e4a2e279acb10d051dda77dcf6af0c37ce21c97d73ece5af9951",
+                    "hash" : "0x23f8f86852e3e4a2e279acb10d051dda77dcf6af0c37ce21c97d73ece5af9951",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d9620bfd8663f199f897de8e5ea7554639c40fb564940dfc8f0b2aa7a2a8a0e8",
+                    "hash" : "0xd9620bfd8663f199f897de8e5ea7554639c40fb564940dfc8f0b2aa7a2a8a0e8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f1600255",
+                "code" : "0x731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcallcall_ABCB_RECURSIVE.json b/GeneralStateTests/stCallCodes/callcallcall_ABCB_RECURSIVE.json
index e0f112a5d..e6f0e73d4 100644
--- a/GeneralStateTests/stCallCodes/callcallcall_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallCodes/callcallcall_ABCB_RECURSIVE.json
@@ -1,17 +1,17 @@
 {
     "callcallcall_ABCB_RECURSIVE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0xb2d05e00",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b416fc6cf45e453dd9cd560d6a4e38b17562443c1e17528a3f6d81e071489ef5",
+                    "hash" : "0xb416fc6cf45e453dd9cd560d6a4e38b17562443c1e17528a3f6d81e071489ef5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b416fc6cf45e453dd9cd560d6a4e38b17562443c1e17528a3f6d81e071489ef5",
+                    "hash" : "0xb416fc6cf45e453dd9cd560d6a4e38b17562443c1e17528a3f6d81e071489ef5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f9904c46ff09c63f9864b18ef1acc3fa7ddda90e80b87f197500e40be0f61e54",
+                    "hash" : "0xf9904c46ff09c63f9864b18ef1acc3fa7ddda90e80b87f197500e40be0f61e54",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f9904c46ff09c63f9864b18ef1acc3fa7ddda90e80b87f197500e40be0f61e54",
+                    "hash" : "0xf9904c46ff09c63f9864b18ef1acc3fa7ddda90e80b87f197500e40be0f61e54",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b416fc6cf45e453dd9cd560d6a4e38b17562443c1e17528a3f6d81e071489ef5",
+                    "hash" : "0xb416fc6cf45e453dd9cd560d6a4e38b17562443c1e17528a3f6d81e071489ef5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "0x01c9c380"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcallcallcode_001.json b/GeneralStateTests/stCallCodes/callcallcallcode_001.json
index b9adeb057..4df84f226 100644
--- a/GeneralStateTests/stCallCodes/callcallcallcode_001.json
+++ b/GeneralStateTests/stCallCodes/callcallcallcode_001.json
@@ -1,17 +1,17 @@
 {
     "callcallcallcode_001" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "12596d09e34d8fe77b7639ff7a08660d4886299db9bf62db8c16e6823cadf84c",
+                    "hash" : "0x12596d09e34d8fe77b7639ff7a08660d4886299db9bf62db8c16e6823cadf84c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "12596d09e34d8fe77b7639ff7a08660d4886299db9bf62db8c16e6823cadf84c",
+                    "hash" : "0x12596d09e34d8fe77b7639ff7a08660d4886299db9bf62db8c16e6823cadf84c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2b22357b48c2d396726a13e3eed3e61a6ee67351051154572f734c4090796124",
+                    "hash" : "0x2b22357b48c2d396726a13e3eed3e61a6ee67351051154572f734c4090796124",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "2b22357b48c2d396726a13e3eed3e61a6ee67351051154572f734c4090796124",
+                    "hash" : "0x2b22357b48c2d396726a13e3eed3e61a6ee67351051154572f734c4090796124",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "12596d09e34d8fe77b7639ff7a08660d4886299db9bf62db8c16e6823cadf84c",
+                    "hash" : "0x12596d09e34d8fe77b7639ff7a08660d4886299db9bf62db8c16e6823cadf84c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGE.json b/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGE.json
index 64eef58db..e64b31b05 100644
--- a/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGE.json
+++ b/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGE.json
@@ -1,17 +1,17 @@
 {
     "callcallcallcode_001_OOGE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7b92ad9527c67d4c4c4d297d7602cb02a8a95e6810730cd5164c4ab3d2c84956",
+                    "hash" : "0x7b92ad9527c67d4c4c4d297d7602cb02a8a95e6810730cd5164c4ab3d2c84956",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7b92ad9527c67d4c4c4d297d7602cb02a8a95e6810730cd5164c4ab3d2c84956",
+                    "hash" : "0x7b92ad9527c67d4c4c4d297d7602cb02a8a95e6810730cd5164c4ab3d2c84956",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "606981436db0f6678cdf2891f26f52bd2659a6649d3c709acda4bf161b59c7c2",
+                    "hash" : "0x606981436db0f6678cdf2891f26f52bd2659a6649d3c709acda4bf161b59c7c2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "606981436db0f6678cdf2891f26f52bd2659a6649d3c709acda4bf161b59c7c2",
+                    "hash" : "0x606981436db0f6678cdf2891f26f52bd2659a6649d3c709acda4bf161b59c7c2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7b92ad9527c67d4c4c4d297d7602cb02a8a95e6810730cd5164c4ab3d2c84956",
+                    "hash" : "0x7b92ad9527c67d4c4c4d297d7602cb02a8a95e6810730cd5164c4ab3d2c84956",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGMAfter.json b/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGMAfter.json
index 5bf93382b..8b52d2531 100644
--- a/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGMAfter.json
+++ b/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGMAfter.json
@@ -1,17 +1,17 @@
 {
     "callcallcallcode_001_OOGMAfter" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "85024ce7f661d120051f7221c36fa705e32eb6e5f0a1df3de2452b6dd3f0f488",
+                    "hash" : "0x85024ce7f661d120051f7221c36fa705e32eb6e5f0a1df3de2452b6dd3f0f488",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "85024ce7f661d120051f7221c36fa705e32eb6e5f0a1df3de2452b6dd3f0f488",
+                    "hash" : "0x85024ce7f661d120051f7221c36fa705e32eb6e5f0a1df3de2452b6dd3f0f488",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "ed050e8941d0530b3fab2fe1307f8b8ebed135ad216d2aa8f52c2d83f22399b0",
+                    "hash" : "0xed050e8941d0530b3fab2fe1307f8b8ebed135ad216d2aa8f52c2d83f22399b0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ed050e8941d0530b3fab2fe1307f8b8ebed135ad216d2aa8f52c2d83f22399b0",
+                    "hash" : "0xed050e8941d0530b3fab2fe1307f8b8ebed135ad216d2aa8f52c2d83f22399b0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "85024ce7f661d120051f7221c36fa705e32eb6e5f0a1df3de2452b6dd3f0f488",
+                    "hash" : "0x85024ce7f661d120051f7221c36fa705e32eb6e5f0a1df3de2452b6dd3f0f488",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGMBefore.json b/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGMBefore.json
index 3d9f6c832..321e9bd2e 100644
--- a/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGMBefore.json
+++ b/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGMBefore.json
@@ -1,17 +1,17 @@
 {
     "callcallcallcode_001_OOGMBefore" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9b100dde5e66323eb06b6719b88472b366cbae95de5eeb62ed28f8254f3fc723",
+                    "hash" : "0x9b100dde5e66323eb06b6719b88472b366cbae95de5eeb62ed28f8254f3fc723",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9b100dde5e66323eb06b6719b88472b366cbae95de5eeb62ed28f8254f3fc723",
+                    "hash" : "0x9b100dde5e66323eb06b6719b88472b366cbae95de5eeb62ed28f8254f3fc723",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6e70eb4863af52fd076d45371513ff49043c76b06c11ef2bba4d4ab8edf33aba",
+                    "hash" : "0x6e70eb4863af52fd076d45371513ff49043c76b06c11ef2bba4d4ab8edf33aba",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6e70eb4863af52fd076d45371513ff49043c76b06c11ef2bba4d4ab8edf33aba",
+                    "hash" : "0x6e70eb4863af52fd076d45371513ff49043c76b06c11ef2bba4d4ab8edf33aba",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9b100dde5e66323eb06b6719b88472b366cbae95de5eeb62ed28f8254f3fc723",
+                    "hash" : "0x9b100dde5e66323eb06b6719b88472b366cbae95de5eeb62ed28f8254f3fc723",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcallcallcode_001_SuicideEnd.json b/GeneralStateTests/stCallCodes/callcallcallcode_001_SuicideEnd.json
index dcee88bf1..b5d0a5e11 100644
--- a/GeneralStateTests/stCallCodes/callcallcallcode_001_SuicideEnd.json
+++ b/GeneralStateTests/stCallCodes/callcallcallcode_001_SuicideEnd.json
@@ -1,17 +1,17 @@
 {
     "callcallcallcode_001_SuicideEnd" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "690ad82b4158dcc88162392a81d90a0dbbbd746780f4b49ef42967625d197c46",
+                    "hash" : "0x690ad82b4158dcc88162392a81d90a0dbbbd746780f4b49ef42967625d197c46",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "690ad82b4158dcc88162392a81d90a0dbbbd746780f4b49ef42967625d197c46",
+                    "hash" : "0x690ad82b4158dcc88162392a81d90a0dbbbd746780f4b49ef42967625d197c46",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5ee6eeb669c1d7a7e71592eb8cb5a34c0375a8996d698e02f565fbf18da69705",
+                    "hash" : "0x5ee6eeb669c1d7a7e71592eb8cb5a34c0375a8996d698e02f565fbf18da69705",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5ee6eeb669c1d7a7e71592eb8cb5a34c0375a8996d698e02f565fbf18da69705",
+                    "hash" : "0x5ee6eeb669c1d7a7e71592eb8cb5a34c0375a8996d698e02f565fbf18da69705",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "690ad82b4158dcc88162392a81d90a0dbbbd746780f4b49ef42967625d197c46",
+                    "hash" : "0x690ad82b4158dcc88162392a81d90a0dbbbd746780f4b49ef42967625d197c46",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcallcallcode_001_SuicideMiddle.json b/GeneralStateTests/stCallCodes/callcallcallcode_001_SuicideMiddle.json
index 4d05e4b53..91d6256f9 100644
--- a/GeneralStateTests/stCallCodes/callcallcallcode_001_SuicideMiddle.json
+++ b/GeneralStateTests/stCallCodes/callcallcallcode_001_SuicideMiddle.json
@@ -1,17 +1,17 @@
 {
     "callcallcallcode_001_SuicideMiddle" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d9620bfd8663f199f897de8e5ea7554639c40fb564940dfc8f0b2aa7a2a8a0e8",
+                    "hash" : "0xd9620bfd8663f199f897de8e5ea7554639c40fb564940dfc8f0b2aa7a2a8a0e8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d9620bfd8663f199f897de8e5ea7554639c40fb564940dfc8f0b2aa7a2a8a0e8",
+                    "hash" : "0xd9620bfd8663f199f897de8e5ea7554639c40fb564940dfc8f0b2aa7a2a8a0e8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "23f8f86852e3e4a2e279acb10d051dda77dcf6af0c37ce21c97d73ece5af9951",
+                    "hash" : "0x23f8f86852e3e4a2e279acb10d051dda77dcf6af0c37ce21c97d73ece5af9951",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "23f8f86852e3e4a2e279acb10d051dda77dcf6af0c37ce21c97d73ece5af9951",
+                    "hash" : "0x23f8f86852e3e4a2e279acb10d051dda77dcf6af0c37ce21c97d73ece5af9951",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d9620bfd8663f199f897de8e5ea7554639c40fb564940dfc8f0b2aa7a2a8a0e8",
+                    "hash" : "0xd9620bfd8663f199f897de8e5ea7554639c40fb564940dfc8f0b2aa7a2a8a0e8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f2600255",
+                "code" : "0x731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcallcallcode_ABCB_RECURSIVE.json b/GeneralStateTests/stCallCodes/callcallcallcode_ABCB_RECURSIVE.json
index e27166119..afd1ae220 100644
--- a/GeneralStateTests/stCallCodes/callcallcallcode_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallCodes/callcallcallcode_ABCB_RECURSIVE.json
@@ -1,17 +1,17 @@
 {
     "callcallcallcode_ABCB_RECURSIVE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0xb2d05e00",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d60f0feab4578b9374bf7263fe10d917b70201b56524b1b0f5543abd16635e7d",
+                    "hash" : "0xd60f0feab4578b9374bf7263fe10d917b70201b56524b1b0f5543abd16635e7d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d60f0feab4578b9374bf7263fe10d917b70201b56524b1b0f5543abd16635e7d",
+                    "hash" : "0xd60f0feab4578b9374bf7263fe10d917b70201b56524b1b0f5543abd16635e7d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5cfc164fa79f7a1ed6e4c96e479a96efdb50a7c14eb59af4016b1f0de169504e",
+                    "hash" : "0x5cfc164fa79f7a1ed6e4c96e479a96efdb50a7c14eb59af4016b1f0de169504e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5cfc164fa79f7a1ed6e4c96e479a96efdb50a7c14eb59af4016b1f0de169504e",
+                    "hash" : "0x5cfc164fa79f7a1ed6e4c96e479a96efdb50a7c14eb59af4016b1f0de169504e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d60f0feab4578b9374bf7263fe10d917b70201b56524b1b0f5543abd16635e7d",
+                    "hash" : "0xd60f0feab4578b9374bf7263fe10d917b70201b56524b1b0f5543abd16635e7d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "0x01c9c380"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcallcode_01.json b/GeneralStateTests/stCallCodes/callcallcode_01.json
index bc25e0b66..4bad9bf9d 100644
--- a/GeneralStateTests/stCallCodes/callcallcode_01.json
+++ b/GeneralStateTests/stCallCodes/callcallcode_01.json
@@ -1,17 +1,17 @@
 {
     "callcallcode_01" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9d5a38358bff52dd9b7c82e53e45d22a2eb7917db9de0c05fe0b1b5e2dd24b7a",
+                    "hash" : "0x9d5a38358bff52dd9b7c82e53e45d22a2eb7917db9de0c05fe0b1b5e2dd24b7a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9d5a38358bff52dd9b7c82e53e45d22a2eb7917db9de0c05fe0b1b5e2dd24b7a",
+                    "hash" : "0x9d5a38358bff52dd9b7c82e53e45d22a2eb7917db9de0c05fe0b1b5e2dd24b7a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "54475c6c67f504eace680150ef531ece0daf0181a5b469f8c369a5c74c1ce53c",
+                    "hash" : "0x54475c6c67f504eace680150ef531ece0daf0181a5b469f8c369a5c74c1ce53c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "54475c6c67f504eace680150ef531ece0daf0181a5b469f8c369a5c74c1ce53c",
+                    "hash" : "0x54475c6c67f504eace680150ef531ece0daf0181a5b469f8c369a5c74c1ce53c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9d5a38358bff52dd9b7c82e53e45d22a2eb7917db9de0c05fe0b1b5e2dd24b7a",
+                    "hash" : "0x9d5a38358bff52dd9b7c82e53e45d22a2eb7917db9de0c05fe0b1b5e2dd24b7a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160025533600455346007553060e6553260e8553660ec553860ee553a60f055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcallcode_01_OOGE.json b/GeneralStateTests/stCallCodes/callcallcode_01_OOGE.json
index e33738a54..0b33347b5 100644
--- a/GeneralStateTests/stCallCodes/callcallcode_01_OOGE.json
+++ b/GeneralStateTests/stCallCodes/callcallcode_01_OOGE.json
@@ -1,17 +1,17 @@
 {
     "callcallcode_01_OOGE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a4e40e003f4451cb909d92c1bedae7067a5625364638d346c6c7707814010ad6",
+                    "hash" : "0xa4e40e003f4451cb909d92c1bedae7067a5625364638d346c6c7707814010ad6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a4e40e003f4451cb909d92c1bedae7067a5625364638d346c6c7707814010ad6",
+                    "hash" : "0xa4e40e003f4451cb909d92c1bedae7067a5625364638d346c6c7707814010ad6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e4209a1b867017e6b14927afeeed7d1129d53ecf7d18a29c7ee4b0ffa2a313a1",
+                    "hash" : "0xe4209a1b867017e6b14927afeeed7d1129d53ecf7d18a29c7ee4b0ffa2a313a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e4209a1b867017e6b14927afeeed7d1129d53ecf7d18a29c7ee4b0ffa2a313a1",
+                    "hash" : "0xe4209a1b867017e6b14927afeeed7d1129d53ecf7d18a29c7ee4b0ffa2a313a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a4e40e003f4451cb909d92c1bedae7067a5625364638d346c6c7707814010ad6",
+                    "hash" : "0xa4e40e003f4451cb909d92c1bedae7067a5625364638d346c6c7707814010ad6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016002556001600252",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcallcode_01_SuicideEnd.json b/GeneralStateTests/stCallCodes/callcallcode_01_SuicideEnd.json
index deefa7cdd..0440db8b8 100644
--- a/GeneralStateTests/stCallCodes/callcallcode_01_SuicideEnd.json
+++ b/GeneralStateTests/stCallCodes/callcallcode_01_SuicideEnd.json
@@ -1,17 +1,17 @@
 {
     "callcallcode_01_SuicideEnd" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d56431bc1677db24c8d1e96c6ad3a2b4bcdafac7f3d40f29a07a60ac05620eed",
+                    "hash" : "0xd56431bc1677db24c8d1e96c6ad3a2b4bcdafac7f3d40f29a07a60ac05620eed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d56431bc1677db24c8d1e96c6ad3a2b4bcdafac7f3d40f29a07a60ac05620eed",
+                    "hash" : "0xd56431bc1677db24c8d1e96c6ad3a2b4bcdafac7f3d40f29a07a60ac05620eed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3618f0634e258733a71ad69de3d642b67e8eb7d30ed210514e7fd231c80e7370",
+                    "hash" : "0x3618f0634e258733a71ad69de3d642b67e8eb7d30ed210514e7fd231c80e7370",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3618f0634e258733a71ad69de3d642b67e8eb7d30ed210514e7fd231c80e7370",
+                    "hash" : "0x3618f0634e258733a71ad69de3d642b67e8eb7d30ed210514e7fd231c80e7370",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d56431bc1677db24c8d1e96c6ad3a2b4bcdafac7f3d40f29a07a60ac05620eed",
+                    "hash" : "0xd56431bc1677db24c8d1e96c6ad3a2b4bcdafac7f3d40f29a07a60ac05620eed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000261c350f2600155731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcallcodecall_010.json b/GeneralStateTests/stCallCodes/callcallcodecall_010.json
index bfea12954..4ae9430a4 100644
--- a/GeneralStateTests/stCallCodes/callcallcodecall_010.json
+++ b/GeneralStateTests/stCallCodes/callcallcodecall_010.json
@@ -1,17 +1,17 @@
 {
     "callcallcodecall_010" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "bc171762a13eae43b6919a40cc2384845b4006298db3cc4d12891369e6402cd3",
+                    "hash" : "0xbc171762a13eae43b6919a40cc2384845b4006298db3cc4d12891369e6402cd3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "bc171762a13eae43b6919a40cc2384845b4006298db3cc4d12891369e6402cd3",
+                    "hash" : "0xbc171762a13eae43b6919a40cc2384845b4006298db3cc4d12891369e6402cd3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a71dce458a63645998a19a4c2f2c3bf68fb56b070835a91ae29d8ff94eb83d4d",
+                    "hash" : "0xa71dce458a63645998a19a4c2f2c3bf68fb56b070835a91ae29d8ff94eb83d4d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a71dce458a63645998a19a4c2f2c3bf68fb56b070835a91ae29d8ff94eb83d4d",
+                    "hash" : "0xa71dce458a63645998a19a4c2f2c3bf68fb56b070835a91ae29d8ff94eb83d4d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "bc171762a13eae43b6919a40cc2384845b4006298db3cc4d12891369e6402cd3",
+                    "hash" : "0xbc171762a13eae43b6919a40cc2384845b4006298db3cc4d12891369e6402cd3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGE.json b/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGE.json
index bce2ee897..5755aa440 100644
--- a/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGE.json
+++ b/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGE.json
@@ -1,17 +1,17 @@
 {
     "callcallcodecall_010_OOGE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "0cbe5cffcd08f0ecf924fca2c8c4e80f0b33aa85bf5c177716739a780e74a5b7",
+                    "hash" : "0x0cbe5cffcd08f0ecf924fca2c8c4e80f0b33aa85bf5c177716739a780e74a5b7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "0cbe5cffcd08f0ecf924fca2c8c4e80f0b33aa85bf5c177716739a780e74a5b7",
+                    "hash" : "0x0cbe5cffcd08f0ecf924fca2c8c4e80f0b33aa85bf5c177716739a780e74a5b7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4df6a657dc1699015b3105c69f85f344c8f02a0a67c7ea525d04382f4193a24e",
+                    "hash" : "0x4df6a657dc1699015b3105c69f85f344c8f02a0a67c7ea525d04382f4193a24e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4df6a657dc1699015b3105c69f85f344c8f02a0a67c7ea525d04382f4193a24e",
+                    "hash" : "0x4df6a657dc1699015b3105c69f85f344c8f02a0a67c7ea525d04382f4193a24e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0cbe5cffcd08f0ecf924fca2c8c4e80f0b33aa85bf5c177716739a780e74a5b7",
+                    "hash" : "0x0cbe5cffcd08f0ecf924fca2c8c4e80f0b33aa85bf5c177716739a780e74a5b7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGMAfter.json b/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGMAfter.json
index 44485b868..dead3eeb8 100644
--- a/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGMAfter.json
+++ b/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGMAfter.json
@@ -1,17 +1,17 @@
 {
     "callcallcodecall_010_OOGMAfter" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "0e2b3eba8b61eda5f874976573a954510a2097f039564011eb11bb356a52eee2",
+                    "hash" : "0x0e2b3eba8b61eda5f874976573a954510a2097f039564011eb11bb356a52eee2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "0e2b3eba8b61eda5f874976573a954510a2097f039564011eb11bb356a52eee2",
+                    "hash" : "0x0e2b3eba8b61eda5f874976573a954510a2097f039564011eb11bb356a52eee2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "c41a25808023d223b1dc3f3914c233a901168605f5f02a9f15c5fadce6044462",
+                    "hash" : "0xc41a25808023d223b1dc3f3914c233a901168605f5f02a9f15c5fadce6044462",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c41a25808023d223b1dc3f3914c233a901168605f5f02a9f15c5fadce6044462",
+                    "hash" : "0xc41a25808023d223b1dc3f3914c233a901168605f5f02a9f15c5fadce6044462",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0e2b3eba8b61eda5f874976573a954510a2097f039564011eb11bb356a52eee2",
+                    "hash" : "0x0e2b3eba8b61eda5f874976573a954510a2097f039564011eb11bb356a52eee2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGMBefore.json b/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGMBefore.json
index 3a4f9c809..0936f32c8 100644
--- a/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGMBefore.json
+++ b/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGMBefore.json
@@ -1,17 +1,17 @@
 {
     "callcallcodecall_010_OOGMBefore" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "50bb5017d9c0c0e18f3be754d132f796e7aaff23065caf2f0a803fb9cf5cff5f",
+                    "hash" : "0x50bb5017d9c0c0e18f3be754d132f796e7aaff23065caf2f0a803fb9cf5cff5f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "50bb5017d9c0c0e18f3be754d132f796e7aaff23065caf2f0a803fb9cf5cff5f",
+                    "hash" : "0x50bb5017d9c0c0e18f3be754d132f796e7aaff23065caf2f0a803fb9cf5cff5f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "88eb1770368d56d4c62fdef02d85cbe710724cef84e492c5360fe635ff3eedda",
+                    "hash" : "0x88eb1770368d56d4c62fdef02d85cbe710724cef84e492c5360fe635ff3eedda",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "88eb1770368d56d4c62fdef02d85cbe710724cef84e492c5360fe635ff3eedda",
+                    "hash" : "0x88eb1770368d56d4c62fdef02d85cbe710724cef84e492c5360fe635ff3eedda",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "50bb5017d9c0c0e18f3be754d132f796e7aaff23065caf2f0a803fb9cf5cff5f",
+                    "hash" : "0x50bb5017d9c0c0e18f3be754d132f796e7aaff23065caf2f0a803fb9cf5cff5f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcallcodecall_010_SuicideEnd.json b/GeneralStateTests/stCallCodes/callcallcodecall_010_SuicideEnd.json
index f312a3ced..8099f661f 100644
--- a/GeneralStateTests/stCallCodes/callcallcodecall_010_SuicideEnd.json
+++ b/GeneralStateTests/stCallCodes/callcallcodecall_010_SuicideEnd.json
@@ -1,17 +1,17 @@
 {
     "callcallcodecall_010_SuicideEnd" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b6ff93632d94e6a2fab89af79029d71c1e70ae92d912602ddbab344c26730068",
+                    "hash" : "0xb6ff93632d94e6a2fab89af79029d71c1e70ae92d912602ddbab344c26730068",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b6ff93632d94e6a2fab89af79029d71c1e70ae92d912602ddbab344c26730068",
+                    "hash" : "0xb6ff93632d94e6a2fab89af79029d71c1e70ae92d912602ddbab344c26730068",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "308b378d2e435c0692646066af5f00b554ff5b3a2c9ebfee622d34231ded98fc",
+                    "hash" : "0x308b378d2e435c0692646066af5f00b554ff5b3a2c9ebfee622d34231ded98fc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "308b378d2e435c0692646066af5f00b554ff5b3a2c9ebfee622d34231ded98fc",
+                    "hash" : "0x308b378d2e435c0692646066af5f00b554ff5b3a2c9ebfee622d34231ded98fc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b6ff93632d94e6a2fab89af79029d71c1e70ae92d912602ddbab344c26730068",
+                    "hash" : "0xb6ff93632d94e6a2fab89af79029d71c1e70ae92d912602ddbab344c26730068",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f1600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcallcodecall_010_SuicideMiddle.json b/GeneralStateTests/stCallCodes/callcallcodecall_010_SuicideMiddle.json
index 169f4b835..47d3c7af0 100644
--- a/GeneralStateTests/stCallCodes/callcallcodecall_010_SuicideMiddle.json
+++ b/GeneralStateTests/stCallCodes/callcallcodecall_010_SuicideMiddle.json
@@ -1,17 +1,17 @@
 {
     "callcallcodecall_010_SuicideMiddle" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1ccb89a304d0dfb505e5625f06087e8caa014e0e0e42e9ef3638a0676aa7763a",
+                    "hash" : "0xf18106d23711d6e82e3fe3424bc934bd0747155d0688b798defdee289e2dffb9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "1ccb89a304d0dfb505e5625f06087e8caa014e0e0e42e9ef3638a0676aa7763a",
+                    "hash" : "0xf18106d23711d6e82e3fe3424bc934bd0747155d0688b798defdee289e2dffb9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3a27bc9c6ffc87178ee9169ce24b0e291ae54c4e53de670eec5c145008543f0d",
+                    "hash" : "0x5032b0ab27e1f0ac4e7951396f82db3a8dc8300d4ad4186a83349b0d1b70e532",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3a27bc9c6ffc87178ee9169ce24b0e291ae54c4e53de670eec5c145008543f0d",
+                    "hash" : "0x5032b0ab27e1f0ac4e7951396f82db3a8dc8300d4ad4186a83349b0d1b70e532",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "1ccb89a304d0dfb505e5625f06087e8caa014e0e0e42e9ef3638a0676aa7763a",
+                    "hash" : "0xf18106d23711d6e82e3fe3424bc934bd0747155d0688b798defdee289e2dffb9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f1600255",
+                "code" : "0x731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcallcodecall_ABCB_RECURSIVE.json b/GeneralStateTests/stCallCodes/callcallcodecall_ABCB_RECURSIVE.json
index d00c83edc..eb0c0dedb 100644
--- a/GeneralStateTests/stCallCodes/callcallcodecall_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallCodes/callcallcodecall_ABCB_RECURSIVE.json
@@ -1,17 +1,17 @@
 {
     "callcallcodecall_ABCB_RECURSIVE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0xb2d05e00",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c6cd69de23a75c8198e6e33bdef0f93c2a1a70a140548a93c20593f2dda3d941",
+                    "hash" : "0xc6cd69de23a75c8198e6e33bdef0f93c2a1a70a140548a93c20593f2dda3d941",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c6cd69de23a75c8198e6e33bdef0f93c2a1a70a140548a93c20593f2dda3d941",
+                    "hash" : "0xc6cd69de23a75c8198e6e33bdef0f93c2a1a70a140548a93c20593f2dda3d941",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "28b46965732d9fed6925f56bd10ae0df42205d903c9c0b51f8c6b6295f6ead44",
+                    "hash" : "0x28b46965732d9fed6925f56bd10ae0df42205d903c9c0b51f8c6b6295f6ead44",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "28b46965732d9fed6925f56bd10ae0df42205d903c9c0b51f8c6b6295f6ead44",
+                    "hash" : "0x28b46965732d9fed6925f56bd10ae0df42205d903c9c0b51f8c6b6295f6ead44",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c6cd69de23a75c8198e6e33bdef0f93c2a1a70a140548a93c20593f2dda3d941",
+                    "hash" : "0xc6cd69de23a75c8198e6e33bdef0f93c2a1a70a140548a93c20593f2dda3d941",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "0x01c9c380"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcallcodecallcode_011.json b/GeneralStateTests/stCallCodes/callcallcodecallcode_011.json
index 693d68607..847f30e92 100644
--- a/GeneralStateTests/stCallCodes/callcallcodecallcode_011.json
+++ b/GeneralStateTests/stCallCodes/callcallcodecallcode_011.json
@@ -1,17 +1,17 @@
 {
     "callcallcodecallcode_011" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9b73e3601b02719ca2a8bf639f350fb9906c1238085b402be677faba97bddf9b",
+                    "hash" : "0x9b73e3601b02719ca2a8bf639f350fb9906c1238085b402be677faba97bddf9b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9b73e3601b02719ca2a8bf639f350fb9906c1238085b402be677faba97bddf9b",
+                    "hash" : "0x9b73e3601b02719ca2a8bf639f350fb9906c1238085b402be677faba97bddf9b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4257fafde1d6f617828d567841b0331101f8240fa2a7f4518318c7ee5439e487",
+                    "hash" : "0x4257fafde1d6f617828d567841b0331101f8240fa2a7f4518318c7ee5439e487",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4257fafde1d6f617828d567841b0331101f8240fa2a7f4518318c7ee5439e487",
+                    "hash" : "0x4257fafde1d6f617828d567841b0331101f8240fa2a7f4518318c7ee5439e487",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9b73e3601b02719ca2a8bf639f350fb9906c1238085b402be677faba97bddf9b",
+                    "hash" : "0x9b73e3601b02719ca2a8bf639f350fb9906c1238085b402be677faba97bddf9b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGE.json b/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGE.json
index 787cbb64b..35c4dce4e 100644
--- a/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGE.json
+++ b/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGE.json
@@ -1,17 +1,17 @@
 {
     "callcallcodecallcode_011_OOGE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "666fd38cdf67c3b574d3319aa731d8bf10f212fdfb7d39bc8591815f182014df",
+                    "hash" : "0x666fd38cdf67c3b574d3319aa731d8bf10f212fdfb7d39bc8591815f182014df",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "666fd38cdf67c3b574d3319aa731d8bf10f212fdfb7d39bc8591815f182014df",
+                    "hash" : "0x666fd38cdf67c3b574d3319aa731d8bf10f212fdfb7d39bc8591815f182014df",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "80287ae33d156b8057b1c5242a8de40c31d2c1a2e79a2939594359ece6055df5",
+                    "hash" : "0x80287ae33d156b8057b1c5242a8de40c31d2c1a2e79a2939594359ece6055df5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "80287ae33d156b8057b1c5242a8de40c31d2c1a2e79a2939594359ece6055df5",
+                    "hash" : "0x80287ae33d156b8057b1c5242a8de40c31d2c1a2e79a2939594359ece6055df5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "666fd38cdf67c3b574d3319aa731d8bf10f212fdfb7d39bc8591815f182014df",
+                    "hash" : "0x666fd38cdf67c3b574d3319aa731d8bf10f212fdfb7d39bc8591815f182014df",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGMAfter.json b/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGMAfter.json
index d0d5a5ed8..d22dafcbd 100644
--- a/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGMAfter.json
+++ b/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGMAfter.json
@@ -1,17 +1,17 @@
 {
     "callcallcodecallcode_011_OOGMAfter" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b1ae24b7ad575830405dcb5f29c2aeaa71ad90828970a9a729542de6a3d35daa",
+                    "hash" : "0xb1ae24b7ad575830405dcb5f29c2aeaa71ad90828970a9a729542de6a3d35daa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b1ae24b7ad575830405dcb5f29c2aeaa71ad90828970a9a729542de6a3d35daa",
+                    "hash" : "0xb1ae24b7ad575830405dcb5f29c2aeaa71ad90828970a9a729542de6a3d35daa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "cd6b0d134a9ebf655f0e1f76cb2d6c8c66a36c478867d3abbb00d7655dbf0911",
+                    "hash" : "0xcd6b0d134a9ebf655f0e1f76cb2d6c8c66a36c478867d3abbb00d7655dbf0911",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "cd6b0d134a9ebf655f0e1f76cb2d6c8c66a36c478867d3abbb00d7655dbf0911",
+                    "hash" : "0xcd6b0d134a9ebf655f0e1f76cb2d6c8c66a36c478867d3abbb00d7655dbf0911",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b1ae24b7ad575830405dcb5f29c2aeaa71ad90828970a9a729542de6a3d35daa",
+                    "hash" : "0xb1ae24b7ad575830405dcb5f29c2aeaa71ad90828970a9a729542de6a3d35daa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGMBefore.json b/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGMBefore.json
index 4dc7541e4..de2e19576 100644
--- a/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGMBefore.json
+++ b/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGMBefore.json
@@ -1,17 +1,17 @@
 {
     "callcallcodecallcode_011_OOGMBefore" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "29d489641ecc56959584b5595751df02b859cb7477cd1f9d83c3d556e4f66b77",
+                    "hash" : "0x29d489641ecc56959584b5595751df02b859cb7477cd1f9d83c3d556e4f66b77",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "29d489641ecc56959584b5595751df02b859cb7477cd1f9d83c3d556e4f66b77",
+                    "hash" : "0x29d489641ecc56959584b5595751df02b859cb7477cd1f9d83c3d556e4f66b77",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9584516d9633bace4678666471e26662982dcd9c842c62e00c9c9ff2ada13b15",
+                    "hash" : "0x9584516d9633bace4678666471e26662982dcd9c842c62e00c9c9ff2ada13b15",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9584516d9633bace4678666471e26662982dcd9c842c62e00c9c9ff2ada13b15",
+                    "hash" : "0x9584516d9633bace4678666471e26662982dcd9c842c62e00c9c9ff2ada13b15",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "29d489641ecc56959584b5595751df02b859cb7477cd1f9d83c3d556e4f66b77",
+                    "hash" : "0x29d489641ecc56959584b5595751df02b859cb7477cd1f9d83c3d556e4f66b77",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcallcodecallcode_011_SuicideEnd.json b/GeneralStateTests/stCallCodes/callcallcodecallcode_011_SuicideEnd.json
index 595b333bf..01c3f391a 100644
--- a/GeneralStateTests/stCallCodes/callcallcodecallcode_011_SuicideEnd.json
+++ b/GeneralStateTests/stCallCodes/callcallcodecallcode_011_SuicideEnd.json
@@ -1,17 +1,17 @@
 {
     "callcallcodecallcode_011_SuicideEnd" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6b12f1a241fa65db9f44b42cd16ab4b5db2a5da287c7b436880014010adbad62",
+                    "hash" : "0x6b12f1a241fa65db9f44b42cd16ab4b5db2a5da287c7b436880014010adbad62",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6b12f1a241fa65db9f44b42cd16ab4b5db2a5da287c7b436880014010adbad62",
+                    "hash" : "0x6b12f1a241fa65db9f44b42cd16ab4b5db2a5da287c7b436880014010adbad62",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f43c5e45844f6bbb7b0a55cef021b13121fecab88793bdf5dea426825d17f9e5",
+                    "hash" : "0xf43c5e45844f6bbb7b0a55cef021b13121fecab88793bdf5dea426825d17f9e5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f43c5e45844f6bbb7b0a55cef021b13121fecab88793bdf5dea426825d17f9e5",
+                    "hash" : "0xf43c5e45844f6bbb7b0a55cef021b13121fecab88793bdf5dea426825d17f9e5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6b12f1a241fa65db9f44b42cd16ab4b5db2a5da287c7b436880014010adbad62",
+                    "hash" : "0x6b12f1a241fa65db9f44b42cd16ab4b5db2a5da287c7b436880014010adbad62",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcallcodecallcode_011_SuicideMiddle.json b/GeneralStateTests/stCallCodes/callcallcodecallcode_011_SuicideMiddle.json
index 01afa03a6..05cbc7d4b 100644
--- a/GeneralStateTests/stCallCodes/callcallcodecallcode_011_SuicideMiddle.json
+++ b/GeneralStateTests/stCallCodes/callcallcodecallcode_011_SuicideMiddle.json
@@ -1,17 +1,17 @@
 {
     "callcallcodecallcode_011_SuicideMiddle" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b3dbdd0f34c19c5fd27df8c4d190ee474ad5ee6a5ef033cad1f59384da9a836b",
+                    "hash" : "0xf18106d23711d6e82e3fe3424bc934bd0747155d0688b798defdee289e2dffb9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b3dbdd0f34c19c5fd27df8c4d190ee474ad5ee6a5ef033cad1f59384da9a836b",
+                    "hash" : "0xf18106d23711d6e82e3fe3424bc934bd0747155d0688b798defdee289e2dffb9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5c2affc615e1f96d419f1765f106f5794982ad8c394895709e6192f04a3887f5",
+                    "hash" : "0x5032b0ab27e1f0ac4e7951396f82db3a8dc8300d4ad4186a83349b0d1b70e532",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5c2affc615e1f96d419f1765f106f5794982ad8c394895709e6192f04a3887f5",
+                    "hash" : "0x5032b0ab27e1f0ac4e7951396f82db3a8dc8300d4ad4186a83349b0d1b70e532",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b3dbdd0f34c19c5fd27df8c4d190ee474ad5ee6a5ef033cad1f59384da9a836b",
+                    "hash" : "0xf18106d23711d6e82e3fe3424bc934bd0747155d0688b798defdee289e2dffb9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f2600255",
+                "code" : "0x731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcallcodecallcode_ABCB_RECURSIVE.json b/GeneralStateTests/stCallCodes/callcallcodecallcode_ABCB_RECURSIVE.json
index f41c705ac..123267d9f 100644
--- a/GeneralStateTests/stCallCodes/callcallcodecallcode_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallCodes/callcallcodecallcode_ABCB_RECURSIVE.json
@@ -1,17 +1,17 @@
 {
     "callcallcodecallcode_ABCB_RECURSIVE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0xb2d05e00",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d2155a852eaa4f76a5a4fe4bb7fe268d82a52a357962dd6a2617cd4a3af0f8fa",
+                    "hash" : "0xd2155a852eaa4f76a5a4fe4bb7fe268d82a52a357962dd6a2617cd4a3af0f8fa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d2155a852eaa4f76a5a4fe4bb7fe268d82a52a357962dd6a2617cd4a3af0f8fa",
+                    "hash" : "0xd2155a852eaa4f76a5a4fe4bb7fe268d82a52a357962dd6a2617cd4a3af0f8fa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e3ad647f45f66170708956d7148b3e3b7a092def6a2399d27be7fbfbdea4230f",
+                    "hash" : "0xe3ad647f45f66170708956d7148b3e3b7a092def6a2399d27be7fbfbdea4230f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e3ad647f45f66170708956d7148b3e3b7a092def6a2399d27be7fbfbdea4230f",
+                    "hash" : "0xe3ad647f45f66170708956d7148b3e3b7a092def6a2399d27be7fbfbdea4230f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d2155a852eaa4f76a5a4fe4bb7fe268d82a52a357962dd6a2617cd4a3af0f8fa",
+                    "hash" : "0xd2155a852eaa4f76a5a4fe4bb7fe268d82a52a357962dd6a2617cd4a3af0f8fa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "0x01c9c380"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcodeDynamicCode.json b/GeneralStateTests/stCallCodes/callcodeDynamicCode.json
index bcf048b24..6b752dbcf 100644
--- a/GeneralStateTests/stCallCodes/callcodeDynamicCode.json
+++ b/GeneralStateTests/stCallCodes/callcodeDynamicCode.json
@@ -1,17 +1,17 @@
 {
     "callcodeDynamicCode" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "70c391c82965c0b9b701f5175b9f417a873e923e8742b5e9bff4413541ccde63",
+                    "hash" : "0x70c391c82965c0b9b701f5175b9f417a873e923e8742b5e9bff4413541ccde63",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "41e3f2ade5c27789716737d703559dd8a53f868baf7a876c408fcdb48d0df9b7",
+                    "hash" : "0x41e3f2ade5c27789716737d703559dd8a53f868baf7a876c408fcdb48d0df9b7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "17388b6d68e240d2ac5841e36517ca05e9c61adc44787471fc40e5683f8279c3",
+                    "hash" : "0x17388b6d68e240d2ac5841e36517ca05e9c61adc44787471fc40e5683f8279c3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "17388b6d68e240d2ac5841e36517ca05e9c61adc44787471fc40e5683f8279c3",
+                    "hash" : "0x17388b6d68e240d2ac5841e36517ca05e9c61adc44787471fc40e5683f8279c3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "41e3f2ade5c27789716737d703559dd8a53f868baf7a876c408fcdb48d0df9b7",
+                    "hash" : "0x41e3f2ade5c27789716737d703559dd8a53f868baf7a876c408fcdb48d0df9b7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x2710",
                 "code" : "0x7f716860016000553360145560005260096017f36000526012600e6001f0600a556000527f6040600060406000600073ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6626020527f0186a0f2600b5500000000000000000000000000000000000000000000000000604052606060006001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x03e8",
                 "code" : "0x6460016000556000526005601b6001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "453081"
+                "0x06e9d9"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                ""
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcodeDynamicCode2SelfCall.json b/GeneralStateTests/stCallCodes/callcodeDynamicCode2SelfCall.json
index c1200f0f8..eb61db203 100644
--- a/GeneralStateTests/stCallCodes/callcodeDynamicCode2SelfCall.json
+++ b/GeneralStateTests/stCallCodes/callcodeDynamicCode2SelfCall.json
@@ -1,17 +1,17 @@
 {
     "callcodeDynamicCode2SelfCall" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "80cee8031b01b19740fac1888ec0628fd5b24b70f0eebfb44dfcbda5f4d5aea4",
+                    "hash" : "0x80cee8031b01b19740fac1888ec0628fd5b24b70f0eebfb44dfcbda5f4d5aea4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "df2b5e393c8e61ef04550e38a3c53b87016b34d93a995b6b1709c0a19d1addad",
+                    "hash" : "0xdf2b5e393c8e61ef04550e38a3c53b87016b34d93a995b6b1709c0a19d1addad",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "53b3500d29c4ac1cc8db0f5403c0c35c256e9bff7ada5a8a35c99f805dc0e72f",
+                    "hash" : "0x53b3500d29c4ac1cc8db0f5403c0c35c256e9bff7ada5a8a35c99f805dc0e72f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "53b3500d29c4ac1cc8db0f5403c0c35c256e9bff7ada5a8a35c99f805dc0e72f",
+                    "hash" : "0x53b3500d29c4ac1cc8db0f5403c0c35c256e9bff7ada5a8a35c99f805dc0e72f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "df2b5e393c8e61ef04550e38a3c53b87016b34d93a995b6b1709c0a19d1addad",
+                    "hash" : "0xdf2b5e393c8e61ef04550e38a3c53b87016b34d93a995b6b1709c0a19d1addad",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x2710",
                 "code" : "0x7f604060006040600060007313136008b64ff592819b2fa6d43f2835c452020e626000527f0186a0f2600b5533600c55000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "453081"
+                "0x06e9d9"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                ""
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcodeEmptycontract.json b/GeneralStateTests/stCallCodes/callcodeEmptycontract.json
index d37bd7940..a8d565039 100644
--- a/GeneralStateTests/stCallCodes/callcodeEmptycontract.json
+++ b/GeneralStateTests/stCallCodes/callcodeEmptycontract.json
@@ -1,17 +1,17 @@
 {
     "callcodeEmptycontract" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "62726d292794da1b6eb2ecf6c30ce7fc64e7efee90636bc501362a71239a9bf2",
+                    "hash" : "0x62726d292794da1b6eb2ecf6c30ce7fc64e7efee90636bc501362a71239a9bf2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "62726d292794da1b6eb2ecf6c30ce7fc64e7efee90636bc501362a71239a9bf2",
+                    "hash" : "0x62726d292794da1b6eb2ecf6c30ce7fc64e7efee90636bc501362a71239a9bf2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "95716e7d0b244da6a57bacc2a981d4777c44a208820153c67224112315fbc985",
+                    "hash" : "0x95716e7d0b244da6a57bacc2a981d4777c44a208820153c67224112315fbc985",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "95716e7d0b244da6a57bacc2a981d4777c44a208820153c67224112315fbc985",
+                    "hash" : "0x95716e7d0b244da6a57bacc2a981d4777c44a208820153c67224112315fbc985",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "62726d292794da1b6eb2ecf6c30ce7fc64e7efee90636bc501362a71239a9bf2",
+                    "hash" : "0x62726d292794da1b6eb2ecf6c30ce7fc64e7efee90636bc501362a71239a9bf2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x03e8",
                 "code" : "0x60406000604060006103e873945304eb96065b2a98b57a48a06ae28d285a71b561c350f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "105044"
+                "0x019a54"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                ""
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcodeInInitcodeToEmptyContract.json b/GeneralStateTests/stCallCodes/callcodeInInitcodeToEmptyContract.json
index cdaf1c9a5..62442001b 100644
--- a/GeneralStateTests/stCallCodes/callcodeInInitcodeToEmptyContract.json
+++ b/GeneralStateTests/stCallCodes/callcodeInInitcodeToEmptyContract.json
@@ -1,17 +1,17 @@
 {
     "callcodeInInitcodeToEmptyContract" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f210d64ccb8593d338544f76f6f758a1bcb01c82acf4177e18648a086a32a008",
+                    "hash" : "0xf210d64ccb8593d338544f76f6f758a1bcb01c82acf4177e18648a086a32a008",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "be3b36e7cf22ba2ac86dcac37b66b60ef96e0d28616df36251cb7de9aa2500aa",
+                    "hash" : "0xbe3b36e7cf22ba2ac86dcac37b66b60ef96e0d28616df36251cb7de9aa2500aa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "157885c99eb23c5285e43296833a84e14e978aaa0f4a550b3bd6dde8a0ee734f",
+                    "hash" : "0x157885c99eb23c5285e43296833a84e14e978aaa0f4a550b3bd6dde8a0ee734f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "157885c99eb23c5285e43296833a84e14e978aaa0f4a550b3bd6dde8a0ee734f",
+                    "hash" : "0x157885c99eb23c5285e43296833a84e14e978aaa0f4a550b3bd6dde8a0ee734f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "be3b36e7cf22ba2ac86dcac37b66b60ef96e0d28616df36251cb7de9aa2500aa",
+                    "hash" : "0xbe3b36e7cf22ba2ac86dcac37b66b60ef96e0d28616df36251cb7de9aa2500aa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x2710",
                 "code" : "0x7f6040600060406000600073945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "453081"
+                "0x06e9d9"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                ""
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcodeInInitcodeToExisContractWithVTransferNEMoney.json b/GeneralStateTests/stCallCodes/callcodeInInitcodeToExisContractWithVTransferNEMoney.json
index 9dca7e38f..7062fb786 100644
--- a/GeneralStateTests/stCallCodes/callcodeInInitcodeToExisContractWithVTransferNEMoney.json
+++ b/GeneralStateTests/stCallCodes/callcodeInInitcodeToExisContractWithVTransferNEMoney.json
@@ -1,17 +1,17 @@
 {
     "callcodeInInitcodeToExisContractWithVTransferNEMoney" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "be6656bd52c7659c81827a5c684c5b08426e3027dbc6575d22aa16b974e04ec5",
+                    "hash" : "0xbe6656bd52c7659c81827a5c684c5b08426e3027dbc6575d22aa16b974e04ec5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "5d8fbaea35718275758ade9e78b2d8c64469cff78bd85a8a11a8c4691208b534",
+                    "hash" : "0x5d8fbaea35718275758ade9e78b2d8c64469cff78bd85a8a11a8c4691208b534",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a94d8401ace9ce65aa88b52d16096f872a7b3b21b1a3302324ec51de1bb314f7",
+                    "hash" : "0xa94d8401ace9ce65aa88b52d16096f872a7b3b21b1a3302324ec51de1bb314f7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a94d8401ace9ce65aa88b52d16096f872a7b3b21b1a3302324ec51de1bb314f7",
+                    "hash" : "0xa94d8401ace9ce65aa88b52d16096f872a7b3b21b1a3302324ec51de1bb314f7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "5d8fbaea35718275758ade9e78b2d8c64469cff78bd85a8a11a8c4691208b534",
+                    "hash" : "0x5d8fbaea35718275758ade9e78b2d8c64469cff78bd85a8a11a8c4691208b534",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x2710",
                 "code" : "0x7f6040600060406000600573945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x00",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "453081"
+                "0x06e9d9"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                ""
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContract.json b/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContract.json
index d65421f32..6c7a8bf44 100644
--- a/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContract.json
+++ b/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContract.json
@@ -1,17 +1,17 @@
 {
     "callcodeInInitcodeToExistingContract" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "84551be7bbc2416c4482dae32daacb4447c5aaedd36da87713f4fe49781f61e0",
+                    "hash" : "0x84551be7bbc2416c4482dae32daacb4447c5aaedd36da87713f4fe49781f61e0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "0e9e704dc511c55b64b545eb97670caee07ad2c2b01d6c85b07748893ccf097f",
+                    "hash" : "0x0e9e704dc511c55b64b545eb97670caee07ad2c2b01d6c85b07748893ccf097f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "7e27ab28a19de7010592bfeb0b95bdc06e207a0ce56388dcf1fc92ade2abeb3c",
+                    "hash" : "0x7e27ab28a19de7010592bfeb0b95bdc06e207a0ce56388dcf1fc92ade2abeb3c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "7e27ab28a19de7010592bfeb0b95bdc06e207a0ce56388dcf1fc92ade2abeb3c",
+                    "hash" : "0x7e27ab28a19de7010592bfeb0b95bdc06e207a0ce56388dcf1fc92ade2abeb3c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0e9e704dc511c55b64b545eb97670caee07ad2c2b01d6c85b07748893ccf097f",
+                    "hash" : "0x0e9e704dc511c55b64b545eb97670caee07ad2c2b01d6c85b07748893ccf097f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x2710",
                 "code" : "0x7f6040600060406000600073945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x03e8",
                 "code" : "0x6460016000556000526005601b6001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x00",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "453081"
+                "0x06e9d9"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                ""
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContractWithValueTransfer.json b/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContractWithValueTransfer.json
index 309b2cea6..e35cf4f4e 100644
--- a/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContractWithValueTransfer.json
+++ b/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContractWithValueTransfer.json
@@ -1,17 +1,17 @@
 {
     "callcodeInInitcodeToExistingContractWithValueTransfer" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f12e898bcf64ff2fbc15cdd1455b9eed5b57d45b2e9daf5b5ce4446c5f02fc0e",
+                    "hash" : "0xf12e898bcf64ff2fbc15cdd1455b9eed5b57d45b2e9daf5b5ce4446c5f02fc0e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f98edc3fae7714d4f245414565d74b69a221627c7fdf7783a4cfc2f83951d5fa",
+                    "hash" : "0xf98edc3fae7714d4f245414565d74b69a221627c7fdf7783a4cfc2f83951d5fa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "51937cc2ddfdd89ecd073f53256f00a7e0497e5a9494d2dac6a63dd6b5bb0548",
+                    "hash" : "0x51937cc2ddfdd89ecd073f53256f00a7e0497e5a9494d2dac6a63dd6b5bb0548",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "51937cc2ddfdd89ecd073f53256f00a7e0497e5a9494d2dac6a63dd6b5bb0548",
+                    "hash" : "0x51937cc2ddfdd89ecd073f53256f00a7e0497e5a9494d2dac6a63dd6b5bb0548",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f98edc3fae7714d4f245414565d74b69a221627c7fdf7783a4cfc2f83951d5fa",
+                    "hash" : "0xf98edc3fae7714d4f245414565d74b69a221627c7fdf7783a4cfc2f83951d5fa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x2710",
                 "code" : "0x7f6040600060406000600573945304eb96065b2a98b57a48a06ae28d285a71b5626000527f0186a0f260005500000000000000000000000000000000000000000000000000602052604060006005f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x00",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "453081"
+                "0x06e9d9"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                ""
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcode_checkPC.json b/GeneralStateTests/stCallCodes/callcode_checkPC.json
index 355ef6aad..fc346b4f2 100644
--- a/GeneralStateTests/stCallCodes/callcode_checkPC.json
+++ b/GeneralStateTests/stCallCodes/callcode_checkPC.json
@@ -1,17 +1,17 @@
 {
     "callcode_checkPC" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0xb2d05e00",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "62b3e139fab71b36127dc4f80cf91618e22bb5b05b36a43f0ae1e46e1e3bd9d9",
+                    "hash" : "0x62b3e139fab71b36127dc4f80cf91618e22bb5b05b36a43f0ae1e46e1e3bd9d9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "62b3e139fab71b36127dc4f80cf91618e22bb5b05b36a43f0ae1e46e1e3bd9d9",
+                    "hash" : "0x62b3e139fab71b36127dc4f80cf91618e22bb5b05b36a43f0ae1e46e1e3bd9d9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4d8ba7f5982eec7fb7309a002e047fdf47d5e54f6e75077d3b7ad2c4601c1212",
+                    "hash" : "0x4d8ba7f5982eec7fb7309a002e047fdf47d5e54f6e75077d3b7ad2c4601c1212",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4d8ba7f5982eec7fb7309a002e047fdf47d5e54f6e75077d3b7ad2c4601c1212",
+                    "hash" : "0x4d8ba7f5982eec7fb7309a002e047fdf47d5e54f6e75077d3b7ad2c4601c1212",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "62b3e139fab71b36127dc4f80cf91618e22bb5b05b36a43f0ae1e46e1e3bd9d9",
+                    "hash" : "0x62b3e139fab71b36127dc4f80cf91618e22bb5b05b36a43f0ae1e46e1e3bd9d9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620f4240f15058600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "0x01c9c380"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcodecall_10.json b/GeneralStateTests/stCallCodes/callcodecall_10.json
index 6656801ea..938c5f93f 100644
--- a/GeneralStateTests/stCallCodes/callcodecall_10.json
+++ b/GeneralStateTests/stCallCodes/callcodecall_10.json
@@ -1,17 +1,17 @@
 {
     "callcodecall_10" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "472ac3f8bd2f7a6936a664679c98b1a2cab94a9f23cf7e452ad0bd16972762f8",
+                    "hash" : "0x472ac3f8bd2f7a6936a664679c98b1a2cab94a9f23cf7e452ad0bd16972762f8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "472ac3f8bd2f7a6936a664679c98b1a2cab94a9f23cf7e452ad0bd16972762f8",
+                    "hash" : "0x472ac3f8bd2f7a6936a664679c98b1a2cab94a9f23cf7e452ad0bd16972762f8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "266f3efb4679756e79477cfa28d932bc5118d5e95ec131b92ceef8c5e2a54dd5",
+                    "hash" : "0x266f3efb4679756e79477cfa28d932bc5118d5e95ec131b92ceef8c5e2a54dd5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "266f3efb4679756e79477cfa28d932bc5118d5e95ec131b92ceef8c5e2a54dd5",
+                    "hash" : "0x266f3efb4679756e79477cfa28d932bc5118d5e95ec131b92ceef8c5e2a54dd5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "472ac3f8bd2f7a6936a664679c98b1a2cab94a9f23cf7e452ad0bd16972762f8",
+                    "hash" : "0x472ac3f8bd2f7a6936a664679c98b1a2cab94a9f23cf7e452ad0bd16972762f8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160025533600455346007553060e6553260e8553660ec553860ee553a60f055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcodecall_10_OOGE.json b/GeneralStateTests/stCallCodes/callcodecall_10_OOGE.json
index e70fb634b..6742b0f3b 100644
--- a/GeneralStateTests/stCallCodes/callcodecall_10_OOGE.json
+++ b/GeneralStateTests/stCallCodes/callcodecall_10_OOGE.json
@@ -1,17 +1,17 @@
 {
     "callcodecall_10_OOGE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "721509038dd5a70d8aa67141fcb4cd7ac8efe66ea4f79fc439d4580421fbd22e",
+                    "hash" : "0x721509038dd5a70d8aa67141fcb4cd7ac8efe66ea4f79fc439d4580421fbd22e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "721509038dd5a70d8aa67141fcb4cd7ac8efe66ea4f79fc439d4580421fbd22e",
+                    "hash" : "0x721509038dd5a70d8aa67141fcb4cd7ac8efe66ea4f79fc439d4580421fbd22e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a8759b2e9bc8080233d0170205eae59883131a8d420bc15d4aa04af39d3ad190",
+                    "hash" : "0xa8759b2e9bc8080233d0170205eae59883131a8d420bc15d4aa04af39d3ad190",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a8759b2e9bc8080233d0170205eae59883131a8d420bc15d4aa04af39d3ad190",
+                    "hash" : "0xa8759b2e9bc8080233d0170205eae59883131a8d420bc15d4aa04af39d3ad190",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "721509038dd5a70d8aa67141fcb4cd7ac8efe66ea4f79fc439d4580421fbd22e",
+                    "hash" : "0x721509038dd5a70d8aa67141fcb4cd7ac8efe66ea4f79fc439d4580421fbd22e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016002556001600252",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcodecall_10_SuicideEnd.json b/GeneralStateTests/stCallCodes/callcodecall_10_SuicideEnd.json
index 278c3c8d7..aa4a9c9d2 100644
--- a/GeneralStateTests/stCallCodes/callcodecall_10_SuicideEnd.json
+++ b/GeneralStateTests/stCallCodes/callcodecall_10_SuicideEnd.json
@@ -1,17 +1,17 @@
 {
     "callcodecall_10_SuicideEnd" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a69012cee412f90a45cc60f2da894c1d96f70c6393fb80fbbb2d0dc382f41413",
+                    "hash" : "0xa69012cee412f90a45cc60f2da894c1d96f70c6393fb80fbbb2d0dc382f41413",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a69012cee412f90a45cc60f2da894c1d96f70c6393fb80fbbb2d0dc382f41413",
+                    "hash" : "0xa69012cee412f90a45cc60f2da894c1d96f70c6393fb80fbbb2d0dc382f41413",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6232a655eb075819b41b8c54e2c83c8730b5f42ff7f3820a58c13cf9ce1aa981",
+                    "hash" : "0x6232a655eb075819b41b8c54e2c83c8730b5f42ff7f3820a58c13cf9ce1aa981",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6232a655eb075819b41b8c54e2c83c8730b5f42ff7f3820a58c13cf9ce1aa981",
+                    "hash" : "0x6232a655eb075819b41b8c54e2c83c8730b5f42ff7f3820a58c13cf9ce1aa981",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a69012cee412f90a45cc60f2da894c1d96f70c6393fb80fbbb2d0dc382f41413",
+                    "hash" : "0xa69012cee412f90a45cc60f2da894c1d96f70c6393fb80fbbb2d0dc382f41413",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000261c350f1600155731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcodecallcall_100.json b/GeneralStateTests/stCallCodes/callcodecallcall_100.json
index 66dbb89ca..5a6cce8ea 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcall_100.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcall_100.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcall_100" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6101c3095dc2c0ec49cd5f06b3e9210a4c1e3a26c6fb5449ccad86e6102a247f",
+                    "hash" : "0x6101c3095dc2c0ec49cd5f06b3e9210a4c1e3a26c6fb5449ccad86e6102a247f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6101c3095dc2c0ec49cd5f06b3e9210a4c1e3a26c6fb5449ccad86e6102a247f",
+                    "hash" : "0x6101c3095dc2c0ec49cd5f06b3e9210a4c1e3a26c6fb5449ccad86e6102a247f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e9985e3c4b096bca71be68fe77a32bcb50eb2e96aaa63108daebefe1145c214f",
+                    "hash" : "0xe9985e3c4b096bca71be68fe77a32bcb50eb2e96aaa63108daebefe1145c214f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e9985e3c4b096bca71be68fe77a32bcb50eb2e96aaa63108daebefe1145c214f",
+                    "hash" : "0xe9985e3c4b096bca71be68fe77a32bcb50eb2e96aaa63108daebefe1145c214f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6101c3095dc2c0ec49cd5f06b3e9210a4c1e3a26c6fb5449ccad86e6102a247f",
+                    "hash" : "0x6101c3095dc2c0ec49cd5f06b3e9210a4c1e3a26c6fb5449ccad86e6102a247f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGE.json b/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGE.json
index 3978c3316..91c36992e 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGE.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGE.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcall_100_OOGE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "62dfd5d90ea8066ca0b7f75bfa2d14e169bea39f763ea774df9ba23ded9c3022",
+                    "hash" : "0x62dfd5d90ea8066ca0b7f75bfa2d14e169bea39f763ea774df9ba23ded9c3022",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "62dfd5d90ea8066ca0b7f75bfa2d14e169bea39f763ea774df9ba23ded9c3022",
+                    "hash" : "0x62dfd5d90ea8066ca0b7f75bfa2d14e169bea39f763ea774df9ba23ded9c3022",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a97379ff11a8f6bd9d3ae4f08d89c39768ce1c9ddd45df89e2c292a7d07d7c7d",
+                    "hash" : "0xa97379ff11a8f6bd9d3ae4f08d89c39768ce1c9ddd45df89e2c292a7d07d7c7d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a97379ff11a8f6bd9d3ae4f08d89c39768ce1c9ddd45df89e2c292a7d07d7c7d",
+                    "hash" : "0xa97379ff11a8f6bd9d3ae4f08d89c39768ce1c9ddd45df89e2c292a7d07d7c7d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "62dfd5d90ea8066ca0b7f75bfa2d14e169bea39f763ea774df9ba23ded9c3022",
+                    "hash" : "0x62dfd5d90ea8066ca0b7f75bfa2d14e169bea39f763ea774df9ba23ded9c3022",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGMAfter.json b/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGMAfter.json
index 052026163..b4d5e1a33 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGMAfter.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGMAfter.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcall_100_OOGMAfter" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1ccdddfee7c5341f862e77e4b217b4ab98be631d8dd5c81a328b57efcb2f00ef",
+                    "hash" : "0x1ccdddfee7c5341f862e77e4b217b4ab98be631d8dd5c81a328b57efcb2f00ef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "1ccdddfee7c5341f862e77e4b217b4ab98be631d8dd5c81a328b57efcb2f00ef",
+                    "hash" : "0x1ccdddfee7c5341f862e77e4b217b4ab98be631d8dd5c81a328b57efcb2f00ef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "278c6d69454c759028bab28462a540d7f0d8affdf3be9ab83ad873942f4d7169",
+                    "hash" : "0x278c6d69454c759028bab28462a540d7f0d8affdf3be9ab83ad873942f4d7169",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "278c6d69454c759028bab28462a540d7f0d8affdf3be9ab83ad873942f4d7169",
+                    "hash" : "0x278c6d69454c759028bab28462a540d7f0d8affdf3be9ab83ad873942f4d7169",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "1ccdddfee7c5341f862e77e4b217b4ab98be631d8dd5c81a328b57efcb2f00ef",
+                    "hash" : "0x1ccdddfee7c5341f862e77e4b217b4ab98be631d8dd5c81a328b57efcb2f00ef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGMBefore.json b/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGMBefore.json
index c9d814db5..29086fddb 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGMBefore.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGMBefore.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcall_100_OOGMBefore" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "2126825d2ed836fe96dbebc0ea713b3dc090876d6e2fac93b6d6ec1b2616d72f",
+                    "hash" : "0x2126825d2ed836fe96dbebc0ea713b3dc090876d6e2fac93b6d6ec1b2616d72f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "2126825d2ed836fe96dbebc0ea713b3dc090876d6e2fac93b6d6ec1b2616d72f",
+                    "hash" : "0x2126825d2ed836fe96dbebc0ea713b3dc090876d6e2fac93b6d6ec1b2616d72f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "8902ce31717fb761ac67ebbe8ac240ca6f886a65b2ccbf57e00d9afe10b4d6c8",
+                    "hash" : "0x8902ce31717fb761ac67ebbe8ac240ca6f886a65b2ccbf57e00d9afe10b4d6c8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "8902ce31717fb761ac67ebbe8ac240ca6f886a65b2ccbf57e00d9afe10b4d6c8",
+                    "hash" : "0x8902ce31717fb761ac67ebbe8ac240ca6f886a65b2ccbf57e00d9afe10b4d6c8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "2126825d2ed836fe96dbebc0ea713b3dc090876d6e2fac93b6d6ec1b2616d72f",
+                    "hash" : "0x2126825d2ed836fe96dbebc0ea713b3dc090876d6e2fac93b6d6ec1b2616d72f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcodecallcall_100_SuicideEnd.json b/GeneralStateTests/stCallCodes/callcodecallcall_100_SuicideEnd.json
index 768252851..f4b35763a 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcall_100_SuicideEnd.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcall_100_SuicideEnd.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcall_100_SuicideEnd" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6abce7355f6ea2faf8acaf28fa705fcc52e89c63e70397cb2c584fd07fd77d1d",
+                    "hash" : "0x6abce7355f6ea2faf8acaf28fa705fcc52e89c63e70397cb2c584fd07fd77d1d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6abce7355f6ea2faf8acaf28fa705fcc52e89c63e70397cb2c584fd07fd77d1d",
+                    "hash" : "0x6abce7355f6ea2faf8acaf28fa705fcc52e89c63e70397cb2c584fd07fd77d1d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "8de9ffdf6b2b0f4048d30b61853c0ef89c4499a1d6a1846251d8d6d7cbddbd88",
+                    "hash" : "0x8de9ffdf6b2b0f4048d30b61853c0ef89c4499a1d6a1846251d8d6d7cbddbd88",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "8de9ffdf6b2b0f4048d30b61853c0ef89c4499a1d6a1846251d8d6d7cbddbd88",
+                    "hash" : "0x8de9ffdf6b2b0f4048d30b61853c0ef89c4499a1d6a1846251d8d6d7cbddbd88",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6abce7355f6ea2faf8acaf28fa705fcc52e89c63e70397cb2c584fd07fd77d1d",
+                    "hash" : "0x6abce7355f6ea2faf8acaf28fa705fcc52e89c63e70397cb2c584fd07fd77d1d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f1600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcodecallcall_100_SuicideMiddle.json b/GeneralStateTests/stCallCodes/callcodecallcall_100_SuicideMiddle.json
index 82434988d..bb92338d4 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcall_100_SuicideMiddle.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcall_100_SuicideMiddle.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcall_100_SuicideMiddle" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "ef77926dc35c2fa6e1f9a078376455282270217a8abc8e2dd43de2ad51e7074a",
+                    "hash" : "0xef77926dc35c2fa6e1f9a078376455282270217a8abc8e2dd43de2ad51e7074a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "ef77926dc35c2fa6e1f9a078376455282270217a8abc8e2dd43de2ad51e7074a",
+                    "hash" : "0xef77926dc35c2fa6e1f9a078376455282270217a8abc8e2dd43de2ad51e7074a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "294042dda3ede82ea72313a788267340fcf9aea60f81ca9ee880a2bc7b814d01",
+                    "hash" : "0x294042dda3ede82ea72313a788267340fcf9aea60f81ca9ee880a2bc7b814d01",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "294042dda3ede82ea72313a788267340fcf9aea60f81ca9ee880a2bc7b814d01",
+                    "hash" : "0x294042dda3ede82ea72313a788267340fcf9aea60f81ca9ee880a2bc7b814d01",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "ef77926dc35c2fa6e1f9a078376455282270217a8abc8e2dd43de2ad51e7074a",
+                    "hash" : "0xef77926dc35c2fa6e1f9a078376455282270217a8abc8e2dd43de2ad51e7074a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f1600255",
+                "code" : "0x731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcodecallcall_ABCB_RECURSIVE.json b/GeneralStateTests/stCallCodes/callcodecallcall_ABCB_RECURSIVE.json
index a1a5e85ea..ec7f4d9db 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcall_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcall_ABCB_RECURSIVE.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcall_ABCB_RECURSIVE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0xb2d05e00",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b45f7068d6c1f6400676563a22df1791b2bab70929f90b0d297e13f58db69932",
+                    "hash" : "0xb45f7068d6c1f6400676563a22df1791b2bab70929f90b0d297e13f58db69932",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b45f7068d6c1f6400676563a22df1791b2bab70929f90b0d297e13f58db69932",
+                    "hash" : "0xb45f7068d6c1f6400676563a22df1791b2bab70929f90b0d297e13f58db69932",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a8670ec8bd38fd68db357ce1257b4ba7e9892058ace8f14b056bec60429c24cc",
+                    "hash" : "0xa8670ec8bd38fd68db357ce1257b4ba7e9892058ace8f14b056bec60429c24cc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a8670ec8bd38fd68db357ce1257b4ba7e9892058ace8f14b056bec60429c24cc",
+                    "hash" : "0xa8670ec8bd38fd68db357ce1257b4ba7e9892058ace8f14b056bec60429c24cc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b45f7068d6c1f6400676563a22df1791b2bab70929f90b0d297e13f58db69932",
+                    "hash" : "0xb45f7068d6c1f6400676563a22df1791b2bab70929f90b0d297e13f58db69932",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "0x01c9c380"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcodecallcallcode_101.json b/GeneralStateTests/stCallCodes/callcodecallcallcode_101.json
index e1780b8e3..69ce3355e 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcallcode_101.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcallcode_101.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcallcode_101" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "fcddf3901a324d38ceeb1cc330787d96710395e88fac155951f0232f38299c12",
+                    "hash" : "0xfcddf3901a324d38ceeb1cc330787d96710395e88fac155951f0232f38299c12",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "fcddf3901a324d38ceeb1cc330787d96710395e88fac155951f0232f38299c12",
+                    "hash" : "0xfcddf3901a324d38ceeb1cc330787d96710395e88fac155951f0232f38299c12",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "47f86a353d296fe9530a92d8d937ba8051749ad0093cc65b9909c5bd260ddbef",
+                    "hash" : "0x47f86a353d296fe9530a92d8d937ba8051749ad0093cc65b9909c5bd260ddbef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "47f86a353d296fe9530a92d8d937ba8051749ad0093cc65b9909c5bd260ddbef",
+                    "hash" : "0x47f86a353d296fe9530a92d8d937ba8051749ad0093cc65b9909c5bd260ddbef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "fcddf3901a324d38ceeb1cc330787d96710395e88fac155951f0232f38299c12",
+                    "hash" : "0xfcddf3901a324d38ceeb1cc330787d96710395e88fac155951f0232f38299c12",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGE.json b/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGE.json
index dd8f484ff..5b8355021 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGE.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGE.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcallcode_101_OOGE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "22c6dcc5111557389dd022c1ca9e5ad86eaec11e97fa00ab10fee2100758a0d9",
+                    "hash" : "0x22c6dcc5111557389dd022c1ca9e5ad86eaec11e97fa00ab10fee2100758a0d9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "22c6dcc5111557389dd022c1ca9e5ad86eaec11e97fa00ab10fee2100758a0d9",
+                    "hash" : "0x22c6dcc5111557389dd022c1ca9e5ad86eaec11e97fa00ab10fee2100758a0d9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "76e969488ba038d1f803ac5bdc231914f22868a7791c19759cef1f98eb616036",
+                    "hash" : "0x76e969488ba038d1f803ac5bdc231914f22868a7791c19759cef1f98eb616036",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "76e969488ba038d1f803ac5bdc231914f22868a7791c19759cef1f98eb616036",
+                    "hash" : "0x76e969488ba038d1f803ac5bdc231914f22868a7791c19759cef1f98eb616036",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "22c6dcc5111557389dd022c1ca9e5ad86eaec11e97fa00ab10fee2100758a0d9",
+                    "hash" : "0x22c6dcc5111557389dd022c1ca9e5ad86eaec11e97fa00ab10fee2100758a0d9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGMAfter.json b/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGMAfter.json
index dc3a79821..d9e533dc2 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGMAfter.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGMAfter.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcallcode_101_OOGMAfter" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9cea071166a4152be65f70641dad45a5281bb3166af3b879a1f81c1f30cd03dd",
+                    "hash" : "0x9cea071166a4152be65f70641dad45a5281bb3166af3b879a1f81c1f30cd03dd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9cea071166a4152be65f70641dad45a5281bb3166af3b879a1f81c1f30cd03dd",
+                    "hash" : "0x9cea071166a4152be65f70641dad45a5281bb3166af3b879a1f81c1f30cd03dd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9dadc649bd108ae1326e1f7d8a113435e18e38fa2e345ebbe8e3b6c57d17c0b6",
+                    "hash" : "0x9dadc649bd108ae1326e1f7d8a113435e18e38fa2e345ebbe8e3b6c57d17c0b6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9dadc649bd108ae1326e1f7d8a113435e18e38fa2e345ebbe8e3b6c57d17c0b6",
+                    "hash" : "0x9dadc649bd108ae1326e1f7d8a113435e18e38fa2e345ebbe8e3b6c57d17c0b6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9cea071166a4152be65f70641dad45a5281bb3166af3b879a1f81c1f30cd03dd",
+                    "hash" : "0x9cea071166a4152be65f70641dad45a5281bb3166af3b879a1f81c1f30cd03dd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGMBefore.json b/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGMBefore.json
index 9fbf35fc0..0b2d36f50 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGMBefore.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGMBefore.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcallcode_101_OOGMBefore" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f116e4cbc705d6224d62d6ca9098a1964d1df0d6da36e193e011416bb8d94f14",
+                    "hash" : "0xf116e4cbc705d6224d62d6ca9098a1964d1df0d6da36e193e011416bb8d94f14",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f116e4cbc705d6224d62d6ca9098a1964d1df0d6da36e193e011416bb8d94f14",
+                    "hash" : "0xf116e4cbc705d6224d62d6ca9098a1964d1df0d6da36e193e011416bb8d94f14",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "0b2d2acfc533d00543a6357fc5c7719c9ed811cb06c83f14d89479b64f338e3e",
+                    "hash" : "0x0b2d2acfc533d00543a6357fc5c7719c9ed811cb06c83f14d89479b64f338e3e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "0b2d2acfc533d00543a6357fc5c7719c9ed811cb06c83f14d89479b64f338e3e",
+                    "hash" : "0x0b2d2acfc533d00543a6357fc5c7719c9ed811cb06c83f14d89479b64f338e3e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f116e4cbc705d6224d62d6ca9098a1964d1df0d6da36e193e011416bb8d94f14",
+                    "hash" : "0xf116e4cbc705d6224d62d6ca9098a1964d1df0d6da36e193e011416bb8d94f14",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcodecallcallcode_101_SuicideEnd.json b/GeneralStateTests/stCallCodes/callcodecallcallcode_101_SuicideEnd.json
index 71146cdfa..7ad63ad96 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcallcode_101_SuicideEnd.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcallcode_101_SuicideEnd.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcallcode_101_SuicideEnd" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "561c60019939881e459c7fd927acb5744cc931c73e9b9b7e235c87fd18d98ba7",
+                    "hash" : "0x561c60019939881e459c7fd927acb5744cc931c73e9b9b7e235c87fd18d98ba7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "561c60019939881e459c7fd927acb5744cc931c73e9b9b7e235c87fd18d98ba7",
+                    "hash" : "0x561c60019939881e459c7fd927acb5744cc931c73e9b9b7e235c87fd18d98ba7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "36322aecd24ccc418a4542b24ef71f7a067927b59f62e71835e62f984f8a28e9",
+                    "hash" : "0x36322aecd24ccc418a4542b24ef71f7a067927b59f62e71835e62f984f8a28e9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "36322aecd24ccc418a4542b24ef71f7a067927b59f62e71835e62f984f8a28e9",
+                    "hash" : "0x36322aecd24ccc418a4542b24ef71f7a067927b59f62e71835e62f984f8a28e9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "561c60019939881e459c7fd927acb5744cc931c73e9b9b7e235c87fd18d98ba7",
+                    "hash" : "0x561c60019939881e459c7fd927acb5744cc931c73e9b9b7e235c87fd18d98ba7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcodecallcallcode_101_SuicideMiddle.json b/GeneralStateTests/stCallCodes/callcodecallcallcode_101_SuicideMiddle.json
index 939d9a686..f0a7a0e35 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcallcode_101_SuicideMiddle.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcallcode_101_SuicideMiddle.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcallcode_101_SuicideMiddle" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "ef77926dc35c2fa6e1f9a078376455282270217a8abc8e2dd43de2ad51e7074a",
+                    "hash" : "0xef77926dc35c2fa6e1f9a078376455282270217a8abc8e2dd43de2ad51e7074a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "ef77926dc35c2fa6e1f9a078376455282270217a8abc8e2dd43de2ad51e7074a",
+                    "hash" : "0xef77926dc35c2fa6e1f9a078376455282270217a8abc8e2dd43de2ad51e7074a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "294042dda3ede82ea72313a788267340fcf9aea60f81ca9ee880a2bc7b814d01",
+                    "hash" : "0x294042dda3ede82ea72313a788267340fcf9aea60f81ca9ee880a2bc7b814d01",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "294042dda3ede82ea72313a788267340fcf9aea60f81ca9ee880a2bc7b814d01",
+                    "hash" : "0x294042dda3ede82ea72313a788267340fcf9aea60f81ca9ee880a2bc7b814d01",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "ef77926dc35c2fa6e1f9a078376455282270217a8abc8e2dd43de2ad51e7074a",
+                    "hash" : "0xef77926dc35c2fa6e1f9a078376455282270217a8abc8e2dd43de2ad51e7074a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f2600255",
+                "code" : "0x731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcodecallcallcode_ABCB_RECURSIVE.json b/GeneralStateTests/stCallCodes/callcodecallcallcode_ABCB_RECURSIVE.json
index 250805725..2f9c28aae 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcallcode_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcallcode_ABCB_RECURSIVE.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcallcode_ABCB_RECURSIVE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0xb2d05e00",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "759ae0f12630eef1e0e1a1ca73ae87de55a9714833518c06b8642a272cc5c2e5",
+                    "hash" : "0x759ae0f12630eef1e0e1a1ca73ae87de55a9714833518c06b8642a272cc5c2e5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "759ae0f12630eef1e0e1a1ca73ae87de55a9714833518c06b8642a272cc5c2e5",
+                    "hash" : "0x759ae0f12630eef1e0e1a1ca73ae87de55a9714833518c06b8642a272cc5c2e5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "843fc7bc4ac97ee198931f09665467525e5846bf6674622420f0e0173b89bba4",
+                    "hash" : "0x843fc7bc4ac97ee198931f09665467525e5846bf6674622420f0e0173b89bba4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "843fc7bc4ac97ee198931f09665467525e5846bf6674622420f0e0173b89bba4",
+                    "hash" : "0x843fc7bc4ac97ee198931f09665467525e5846bf6674622420f0e0173b89bba4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "759ae0f12630eef1e0e1a1ca73ae87de55a9714833518c06b8642a272cc5c2e5",
+                    "hash" : "0x759ae0f12630eef1e0e1a1ca73ae87de55a9714833518c06b8642a272cc5c2e5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "0x01c9c380"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcodecallcode_11.json b/GeneralStateTests/stCallCodes/callcodecallcode_11.json
index d320a2c8d..b3d06568e 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcode_11.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcode_11.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcode_11" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e4d27dbac78ab10c73b9dc9244e93e7b5b98b09822337eb3a26152bd342d09de",
+                    "hash" : "0xe4d27dbac78ab10c73b9dc9244e93e7b5b98b09822337eb3a26152bd342d09de",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e4d27dbac78ab10c73b9dc9244e93e7b5b98b09822337eb3a26152bd342d09de",
+                    "hash" : "0xe4d27dbac78ab10c73b9dc9244e93e7b5b98b09822337eb3a26152bd342d09de",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "1e91f9f6bd10a082c5f0479183a3d41204222a29742643fc84dfa9a2de54aba0",
+                    "hash" : "0x1e91f9f6bd10a082c5f0479183a3d41204222a29742643fc84dfa9a2de54aba0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "1e91f9f6bd10a082c5f0479183a3d41204222a29742643fc84dfa9a2de54aba0",
+                    "hash" : "0x1e91f9f6bd10a082c5f0479183a3d41204222a29742643fc84dfa9a2de54aba0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e4d27dbac78ab10c73b9dc9244e93e7b5b98b09822337eb3a26152bd342d09de",
+                    "hash" : "0xe4d27dbac78ab10c73b9dc9244e93e7b5b98b09822337eb3a26152bd342d09de",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160025533600455346007553060e6553260e8553660ec553860ee553a60f055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcodecallcode_11_OOGE.json b/GeneralStateTests/stCallCodes/callcodecallcode_11_OOGE.json
index 989f9b1dd..efd0f4e6d 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcode_11_OOGE.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcode_11_OOGE.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcode_11_OOGE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "dd98eee45410d0bca7437ef275cfa194e6a0a7505797781461e3c8bf1298d919",
+                    "hash" : "0xdd98eee45410d0bca7437ef275cfa194e6a0a7505797781461e3c8bf1298d919",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "dd98eee45410d0bca7437ef275cfa194e6a0a7505797781461e3c8bf1298d919",
+                    "hash" : "0xdd98eee45410d0bca7437ef275cfa194e6a0a7505797781461e3c8bf1298d919",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "db627612dc00ed5e1bebb241a2b7afd3673ced5f63aa54f857dd0019e678be46",
+                    "hash" : "0xdb627612dc00ed5e1bebb241a2b7afd3673ced5f63aa54f857dd0019e678be46",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "db627612dc00ed5e1bebb241a2b7afd3673ced5f63aa54f857dd0019e678be46",
+                    "hash" : "0xdb627612dc00ed5e1bebb241a2b7afd3673ced5f63aa54f857dd0019e678be46",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "dd98eee45410d0bca7437ef275cfa194e6a0a7505797781461e3c8bf1298d919",
+                    "hash" : "0xdd98eee45410d0bca7437ef275cfa194e6a0a7505797781461e3c8bf1298d919",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016002556001600252",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcodecallcode_11_SuicideEnd.json b/GeneralStateTests/stCallCodes/callcodecallcode_11_SuicideEnd.json
index 4632ca6e8..676ab916f 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcode_11_SuicideEnd.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcode_11_SuicideEnd.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcode_11_SuicideEnd" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "2405ebb0ff8e784419ab77d26cb0da6398bb3c6dfc7e810152a56432ff1ba246",
+                    "hash" : "0x2405ebb0ff8e784419ab77d26cb0da6398bb3c6dfc7e810152a56432ff1ba246",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "2405ebb0ff8e784419ab77d26cb0da6398bb3c6dfc7e810152a56432ff1ba246",
+                    "hash" : "0x2405ebb0ff8e784419ab77d26cb0da6398bb3c6dfc7e810152a56432ff1ba246",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "77a4a1939bcb8b911d5b69a23096e346391cca0cefd06ef641b170fe26b76a15",
+                    "hash" : "0x77a4a1939bcb8b911d5b69a23096e346391cca0cefd06ef641b170fe26b76a15",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "77a4a1939bcb8b911d5b69a23096e346391cca0cefd06ef641b170fe26b76a15",
+                    "hash" : "0x77a4a1939bcb8b911d5b69a23096e346391cca0cefd06ef641b170fe26b76a15",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "2405ebb0ff8e784419ab77d26cb0da6398bb3c6dfc7e810152a56432ff1ba246",
+                    "hash" : "0x2405ebb0ff8e784419ab77d26cb0da6398bb3c6dfc7e810152a56432ff1ba246",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000261c350f2600155731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecall_110.json b/GeneralStateTests/stCallCodes/callcodecallcodecall_110.json
index 283041b8b..aa54d94d0 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcodecall_110.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcodecall_110.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecall_110" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "4c09d7c4e380b4d9608607bf3761894db8b08deca148748f2c1b1fe9118c904e",
+                    "hash" : "0x4c09d7c4e380b4d9608607bf3761894db8b08deca148748f2c1b1fe9118c904e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "4c09d7c4e380b4d9608607bf3761894db8b08deca148748f2c1b1fe9118c904e",
+                    "hash" : "0x4c09d7c4e380b4d9608607bf3761894db8b08deca148748f2c1b1fe9118c904e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "8c09b408926871f45ed297bfcd62b07c7533028974f674f4339db37bd9bb377d",
+                    "hash" : "0x8c09b408926871f45ed297bfcd62b07c7533028974f674f4339db37bd9bb377d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "8c09b408926871f45ed297bfcd62b07c7533028974f674f4339db37bd9bb377d",
+                    "hash" : "0x8c09b408926871f45ed297bfcd62b07c7533028974f674f4339db37bd9bb377d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "4c09d7c4e380b4d9608607bf3761894db8b08deca148748f2c1b1fe9118c904e",
+                    "hash" : "0x4c09d7c4e380b4d9608607bf3761894db8b08deca148748f2c1b1fe9118c904e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGE.json b/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGE.json
index 30e087d15..37f67f7e5 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGE.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGE.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecall_110_OOGE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "ea8c792c901a221fb7a84a561ce7ca9e91790ba5a7811949b9ee02442d02d3db",
+                    "hash" : "0xea8c792c901a221fb7a84a561ce7ca9e91790ba5a7811949b9ee02442d02d3db",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "ea8c792c901a221fb7a84a561ce7ca9e91790ba5a7811949b9ee02442d02d3db",
+                    "hash" : "0xea8c792c901a221fb7a84a561ce7ca9e91790ba5a7811949b9ee02442d02d3db",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b52e03c0be692b82645ba31689fa02476182151b640932e8f1f1542e2effc2df",
+                    "hash" : "0xb52e03c0be692b82645ba31689fa02476182151b640932e8f1f1542e2effc2df",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b52e03c0be692b82645ba31689fa02476182151b640932e8f1f1542e2effc2df",
+                    "hash" : "0xb52e03c0be692b82645ba31689fa02476182151b640932e8f1f1542e2effc2df",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "ea8c792c901a221fb7a84a561ce7ca9e91790ba5a7811949b9ee02442d02d3db",
+                    "hash" : "0xea8c792c901a221fb7a84a561ce7ca9e91790ba5a7811949b9ee02442d02d3db",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGMAfter.json b/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGMAfter.json
index caf649812..a483964f9 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGMAfter.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGMAfter.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecall_110_OOGMAfter" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "36fee991ca568d9360f7aea3e69b13c04ed83efa13dd71b91b7bb3b9d41e345b",
+                    "hash" : "0x36fee991ca568d9360f7aea3e69b13c04ed83efa13dd71b91b7bb3b9d41e345b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "36fee991ca568d9360f7aea3e69b13c04ed83efa13dd71b91b7bb3b9d41e345b",
+                    "hash" : "0x36fee991ca568d9360f7aea3e69b13c04ed83efa13dd71b91b7bb3b9d41e345b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "961d5c285a8e9cfd352cd1a30ff61cc7afe45d8474265fc2b63c6c9c67296b90",
+                    "hash" : "0x961d5c285a8e9cfd352cd1a30ff61cc7afe45d8474265fc2b63c6c9c67296b90",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "961d5c285a8e9cfd352cd1a30ff61cc7afe45d8474265fc2b63c6c9c67296b90",
+                    "hash" : "0x961d5c285a8e9cfd352cd1a30ff61cc7afe45d8474265fc2b63c6c9c67296b90",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "36fee991ca568d9360f7aea3e69b13c04ed83efa13dd71b91b7bb3b9d41e345b",
+                    "hash" : "0x36fee991ca568d9360f7aea3e69b13c04ed83efa13dd71b91b7bb3b9d41e345b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGMBefore.json b/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGMBefore.json
index 6a241e167..c8a6e7c81 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGMBefore.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGMBefore.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecall_110_OOGMBefore" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c29b4e1dbb2e6aadb5534ac43bca93822b3fae633e395f5f448f6c4cccc2ec61",
+                    "hash" : "0xc29b4e1dbb2e6aadb5534ac43bca93822b3fae633e395f5f448f6c4cccc2ec61",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c29b4e1dbb2e6aadb5534ac43bca93822b3fae633e395f5f448f6c4cccc2ec61",
+                    "hash" : "0xc29b4e1dbb2e6aadb5534ac43bca93822b3fae633e395f5f448f6c4cccc2ec61",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "0e376cf2634acda351764523c146b31455f32a40abe4ec2218b24b48c730f573",
+                    "hash" : "0x0e376cf2634acda351764523c146b31455f32a40abe4ec2218b24b48c730f573",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "0e376cf2634acda351764523c146b31455f32a40abe4ec2218b24b48c730f573",
+                    "hash" : "0x0e376cf2634acda351764523c146b31455f32a40abe4ec2218b24b48c730f573",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c29b4e1dbb2e6aadb5534ac43bca93822b3fae633e395f5f448f6c4cccc2ec61",
+                    "hash" : "0xc29b4e1dbb2e6aadb5534ac43bca93822b3fae633e395f5f448f6c4cccc2ec61",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecall_110_SuicideEnd.json b/GeneralStateTests/stCallCodes/callcodecallcodecall_110_SuicideEnd.json
index c0de20246..4749c368f 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcodecall_110_SuicideEnd.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcodecall_110_SuicideEnd.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecall_110_SuicideEnd" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d9678be89a85362b600713a7df23c1721e4263aa37de2b67c3a1fb88173ddedd",
+                    "hash" : "0xd9678be89a85362b600713a7df23c1721e4263aa37de2b67c3a1fb88173ddedd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d9678be89a85362b600713a7df23c1721e4263aa37de2b67c3a1fb88173ddedd",
+                    "hash" : "0xd9678be89a85362b600713a7df23c1721e4263aa37de2b67c3a1fb88173ddedd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "58797699a95dcbbc5692efe394ff177bb2bff2ac3a6846cb9480eeb49a4efaec",
+                    "hash" : "0x58797699a95dcbbc5692efe394ff177bb2bff2ac3a6846cb9480eeb49a4efaec",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "58797699a95dcbbc5692efe394ff177bb2bff2ac3a6846cb9480eeb49a4efaec",
+                    "hash" : "0x58797699a95dcbbc5692efe394ff177bb2bff2ac3a6846cb9480eeb49a4efaec",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d9678be89a85362b600713a7df23c1721e4263aa37de2b67c3a1fb88173ddedd",
+                    "hash" : "0xd9678be89a85362b600713a7df23c1721e4263aa37de2b67c3a1fb88173ddedd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f1600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecall_110_SuicideMiddle.json b/GeneralStateTests/stCallCodes/callcodecallcodecall_110_SuicideMiddle.json
index af3ebee28..416a84f2a 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcodecall_110_SuicideMiddle.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcodecall_110_SuicideMiddle.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecall_110_SuicideMiddle" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "45278fffe3975cce77c99af08b689011d6d53d9e700311878a04fc0aa30f1065",
+                    "hash" : "0xc9a2ccedb4f169e460684909680e9147dda2b46474e9bf8d24c65b6e8cde4522",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "45278fffe3975cce77c99af08b689011d6d53d9e700311878a04fc0aa30f1065",
+                    "hash" : "0xc9a2ccedb4f169e460684909680e9147dda2b46474e9bf8d24c65b6e8cde4522",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a9f074d01db22b4876c62d5a772b7e92f7f182d8ffff0aec50d664eb589306d8",
+                    "hash" : "0xddf1a3d22daf33c4a641fdf43b83399fbcbeaf8532792161e2e0fb0638640ad0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a9f074d01db22b4876c62d5a772b7e92f7f182d8ffff0aec50d664eb589306d8",
+                    "hash" : "0xddf1a3d22daf33c4a641fdf43b83399fbcbeaf8532792161e2e0fb0638640ad0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "45278fffe3975cce77c99af08b689011d6d53d9e700311878a04fc0aa30f1065",
+                    "hash" : "0xc9a2ccedb4f169e460684909680e9147dda2b46474e9bf8d24c65b6e8cde4522",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f1600255",
+                "code" : "0x731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecall_ABCB_RECURSIVE.json b/GeneralStateTests/stCallCodes/callcodecallcodecall_ABCB_RECURSIVE.json
index 28d222e4b..5417157c9 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcodecall_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcodecall_ABCB_RECURSIVE.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecall_ABCB_RECURSIVE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0xb2d05e00",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "cfc2b7464213422aa1bddca1d1742be8aa306fd41952e88ecc6a043efdb6c027",
+                    "hash" : "0xcfc2b7464213422aa1bddca1d1742be8aa306fd41952e88ecc6a043efdb6c027",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "cfc2b7464213422aa1bddca1d1742be8aa306fd41952e88ecc6a043efdb6c027",
+                    "hash" : "0xcfc2b7464213422aa1bddca1d1742be8aa306fd41952e88ecc6a043efdb6c027",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2bba4d9c82761de3e6014ee9ed7d1f97fd6e4c6819034126d611e8a273509a1b",
+                    "hash" : "0x2bba4d9c82761de3e6014ee9ed7d1f97fd6e4c6819034126d611e8a273509a1b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "2bba4d9c82761de3e6014ee9ed7d1f97fd6e4c6819034126d611e8a273509a1b",
+                    "hash" : "0x2bba4d9c82761de3e6014ee9ed7d1f97fd6e4c6819034126d611e8a273509a1b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "cfc2b7464213422aa1bddca1d1742be8aa306fd41952e88ecc6a043efdb6c027",
+                    "hash" : "0xcfc2b7464213422aa1bddca1d1742be8aa306fd41952e88ecc6a043efdb6c027",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "0x01c9c380"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111.json b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111.json
index de34b0ae7..aa8ba9714 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecallcode_111" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f4e9023a998d6eecdf641d51e5920f242564d47de4d1bd892bef8f3b0e9431f6",
+                    "hash" : "0xf4e9023a998d6eecdf641d51e5920f242564d47de4d1bd892bef8f3b0e9431f6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f4e9023a998d6eecdf641d51e5920f242564d47de4d1bd892bef8f3b0e9431f6",
+                    "hash" : "0xf4e9023a998d6eecdf641d51e5920f242564d47de4d1bd892bef8f3b0e9431f6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "30318df71268d521be11e6603e58f1895ee8a08ff83fbcffdf7b516bbf603f9a",
+                    "hash" : "0x30318df71268d521be11e6603e58f1895ee8a08ff83fbcffdf7b516bbf603f9a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "30318df71268d521be11e6603e58f1895ee8a08ff83fbcffdf7b516bbf603f9a",
+                    "hash" : "0x30318df71268d521be11e6603e58f1895ee8a08ff83fbcffdf7b516bbf603f9a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f4e9023a998d6eecdf641d51e5920f242564d47de4d1bd892bef8f3b0e9431f6",
+                    "hash" : "0xf4e9023a998d6eecdf641d51e5920f242564d47de4d1bd892bef8f3b0e9431f6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060037310000000000000000000000000000000000000036203d090f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGE.json b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGE.json
index d13c3e8a3..760de30dc 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGE.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGE.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecallcode_111_OOGE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "df1be3ee9f2feaf6ad531942194ac1a21e2584628ddfc8c5cb3ed1f27f9e1236",
+                    "hash" : "0xdf1be3ee9f2feaf6ad531942194ac1a21e2584628ddfc8c5cb3ed1f27f9e1236",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "df1be3ee9f2feaf6ad531942194ac1a21e2584628ddfc8c5cb3ed1f27f9e1236",
+                    "hash" : "0xdf1be3ee9f2feaf6ad531942194ac1a21e2584628ddfc8c5cb3ed1f27f9e1236",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3299b2945c527e8915e7cddf86273d80c4fd08b40e6961036d5eb102f5370f1d",
+                    "hash" : "0x3299b2945c527e8915e7cddf86273d80c4fd08b40e6961036d5eb102f5370f1d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3299b2945c527e8915e7cddf86273d80c4fd08b40e6961036d5eb102f5370f1d",
+                    "hash" : "0x3299b2945c527e8915e7cddf86273d80c4fd08b40e6961036d5eb102f5370f1d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "df1be3ee9f2feaf6ad531942194ac1a21e2584628ddfc8c5cb3ed1f27f9e1236",
+                    "hash" : "0xdf1be3ee9f2feaf6ad531942194ac1a21e2584628ddfc8c5cb3ed1f27f9e1236",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGMAfter.json b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGMAfter.json
index f4f985955..cce71941c 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGMAfter.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGMAfter.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecallcode_111_OOGMAfter" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "2f6ccfc9fda43ebb03e01bc68951ec9bf51f62a9c5cf1ed708701f343df4eee4",
+                    "hash" : "0x2f6ccfc9fda43ebb03e01bc68951ec9bf51f62a9c5cf1ed708701f343df4eee4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "2f6ccfc9fda43ebb03e01bc68951ec9bf51f62a9c5cf1ed708701f343df4eee4",
+                    "hash" : "0x2f6ccfc9fda43ebb03e01bc68951ec9bf51f62a9c5cf1ed708701f343df4eee4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6b91bfc795dca3991ec5721c8ea8a823e6dd446688e27285d8d0500bba8ab56c",
+                    "hash" : "0x6b91bfc795dca3991ec5721c8ea8a823e6dd446688e27285d8d0500bba8ab56c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6b91bfc795dca3991ec5721c8ea8a823e6dd446688e27285d8d0500bba8ab56c",
+                    "hash" : "0x6b91bfc795dca3991ec5721c8ea8a823e6dd446688e27285d8d0500bba8ab56c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "2f6ccfc9fda43ebb03e01bc68951ec9bf51f62a9c5cf1ed708701f343df4eee4",
+                    "hash" : "0x2f6ccfc9fda43ebb03e01bc68951ec9bf51f62a9c5cf1ed708701f343df4eee4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGMBefore.json b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGMBefore.json
index f23f29346..a9a7bc93d 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGMBefore.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGMBefore.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecallcode_111_OOGMBefore" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d8691751e00a60bf1e08b382b2e4d1e34af74710687e2f2a70deb77a46cbad54",
+                    "hash" : "0xd8691751e00a60bf1e08b382b2e4d1e34af74710687e2f2a70deb77a46cbad54",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d8691751e00a60bf1e08b382b2e4d1e34af74710687e2f2a70deb77a46cbad54",
+                    "hash" : "0xd8691751e00a60bf1e08b382b2e4d1e34af74710687e2f2a70deb77a46cbad54",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "719bf7118658117cc1ef6d2fc778e3a1257c0c5ce8a260dae629440cf839ad78",
+                    "hash" : "0x719bf7118658117cc1ef6d2fc778e3a1257c0c5ce8a260dae629440cf839ad78",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "719bf7118658117cc1ef6d2fc778e3a1257c0c5ce8a260dae629440cf839ad78",
+                    "hash" : "0x719bf7118658117cc1ef6d2fc778e3a1257c0c5ce8a260dae629440cf839ad78",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d8691751e00a60bf1e08b382b2e4d1e34af74710687e2f2a70deb77a46cbad54",
+                    "hash" : "0xd8691751e00a60bf1e08b382b2e4d1e34af74710687e2f2a70deb77a46cbad54",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_SuicideEnd.json b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_SuicideEnd.json
index d1553901f..260be1706 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_SuicideEnd.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_SuicideEnd.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecallcode_111_SuicideEnd" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "792734d18e18b7ecacb4500cbbdda6d00e956ce2952cb1e25847e2ae1bb9e7e6",
+                    "hash" : "0x792734d18e18b7ecacb4500cbbdda6d00e956ce2952cb1e25847e2ae1bb9e7e6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "792734d18e18b7ecacb4500cbbdda6d00e956ce2952cb1e25847e2ae1bb9e7e6",
+                    "hash" : "0x792734d18e18b7ecacb4500cbbdda6d00e956ce2952cb1e25847e2ae1bb9e7e6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "403b618a588daef088c707e25def251aa42c083092904234db5cccfff1689a7e",
+                    "hash" : "0x403b618a588daef088c707e25def251aa42c083092904234db5cccfff1689a7e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "403b618a588daef088c707e25def251aa42c083092904234db5cccfff1689a7e",
+                    "hash" : "0x403b618a588daef088c707e25def251aa42c083092904234db5cccfff1689a7e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "792734d18e18b7ecacb4500cbbdda6d00e956ce2952cb1e25847e2ae1bb9e7e6",
+                    "hash" : "0x792734d18e18b7ecacb4500cbbdda6d00e956ce2952cb1e25847e2ae1bb9e7e6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_SuicideMiddle.json b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_SuicideMiddle.json
index 085a42a9c..701019040 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_SuicideMiddle.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_SuicideMiddle.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecallcode_111_SuicideMiddle" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "07bc96c8159bd7fb04cf87532c1627021fed4ce85e92a4db4f6331f03e9191ad",
+                    "hash" : "0xc9a2ccedb4f169e460684909680e9147dda2b46474e9bf8d24c65b6e8cde4522",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "07bc96c8159bd7fb04cf87532c1627021fed4ce85e92a4db4f6331f03e9191ad",
+                    "hash" : "0xc9a2ccedb4f169e460684909680e9147dda2b46474e9bf8d24c65b6e8cde4522",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3795e19ed3276a737d84a353cbfa755a217005574bd7ee4934f9c1627d8603dd",
+                    "hash" : "0xddf1a3d22daf33c4a641fdf43b83399fbcbeaf8532792161e2e0fb0638640ad0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3795e19ed3276a737d84a353cbfa755a217005574bd7ee4934f9c1627d8603dd",
+                    "hash" : "0xddf1a3d22daf33c4a641fdf43b83399fbcbeaf8532792161e2e0fb0638640ad0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "07bc96c8159bd7fb04cf87532c1627021fed4ce85e92a4db4f6331f03e9191ad",
+                    "hash" : "0xc9a2ccedb4f169e460684909680e9147dda2b46474e9bf8d24c65b6e8cde4522",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f2600255",
+                "code" : "0x731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_ABCB_RECURSIVE.json b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_ABCB_RECURSIVE.json
index f5254a6cc..7aeb105b9 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_ABCB_RECURSIVE.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecallcode_ABCB_RECURSIVE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0xb2d05e00",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d7eb40ab8620545d410fc73953746a87439728298371a90e302b2ef531afaa17",
+                    "hash" : "0xd7eb40ab8620545d410fc73953746a87439728298371a90e302b2ef531afaa17",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d7eb40ab8620545d410fc73953746a87439728298371a90e302b2ef531afaa17",
+                    "hash" : "0xd7eb40ab8620545d410fc73953746a87439728298371a90e302b2ef531afaa17",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a62ec476ec7b2c034e5ddb7d512640e509e8f000c306f596881163fb6ac48ad0",
+                    "hash" : "0xa62ec476ec7b2c034e5ddb7d512640e509e8f000c306f596881163fb6ac48ad0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a62ec476ec7b2c034e5ddb7d512640e509e8f000c306f596881163fb6ac48ad0",
+                    "hash" : "0xa62ec476ec7b2c034e5ddb7d512640e509e8f000c306f596881163fb6ac48ad0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d7eb40ab8620545d410fc73953746a87439728298371a90e302b2ef531afaa17",
+                    "hash" : "0xd7eb40ab8620545d410fc73953746a87439728298371a90e302b2ef531afaa17",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "0x01c9c380"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/Call1024BalanceTooLow.json b/GeneralStateTests/stCallCreateCallCodeTest/Call1024BalanceTooLow.json
index 8cd46e765..29cab3609 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/Call1024BalanceTooLow.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/Call1024BalanceTooLow.json
@@ -1,17 +1,17 @@
 {
     "Call1024BalanceTooLow" : {
         "env" : {
-            "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "currentCoinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "db8bd286972ed997657cf36e784526bf117a5bc29f3b19a6da137c2317fd4b5b",
+                    "hash" : "0xdb8bd286972ed997657cf36e784526bf117a5bc29f3b19a6da137c2317fd4b5b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "db8bd286972ed997657cf36e784526bf117a5bc29f3b19a6da137c2317fd4b5b",
+                    "hash" : "0xdb8bd286972ed997657cf36e784526bf117a5bc29f3b19a6da137c2317fd4b5b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "fda56525128873c6bda3621666fd65a32fb7bc99e56566a42f8a668196d172d6",
+                    "hash" : "0xfda56525128873c6bda3621666fd65a32fb7bc99e56566a42f8a668196d172d6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "fda56525128873c6bda3621666fd65a32fb7bc99e56566a42f8a668196d172d6",
+                    "hash" : "0xfda56525128873c6bda3621666fd65a32fb7bc99e56566a42f8a668196d172d6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "db8bd286972ed997657cf36e784526bf117a5bc29f3b19a6da137c2317fd4b5b",
+                    "hash" : "0xdb8bd286972ed997657cf36e784526bf117a5bc29f3b19a6da137c2317fd4b5b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0400",
                 "code" : "0x600160005401600055600060006000600060005473bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff1600155",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "17592186099592"
+                "0x10000000d788"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/Call1024OOG.json b/GeneralStateTests/stCallCreateCallCodeTest/Call1024OOG.json
index 85e2dc85d..b07c3621a 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/Call1024OOG.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/Call1024OOG.json
@@ -1,17 +1,17 @@
 {
     "Call1024OOG" : {
         "env" : {
-            "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "currentCoinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7262a16f3f7d642357985ada81b318eaa5cef790b8ed41d89a0f5a48e271a574",
+                    "hash" : "0x7262a16f3f7d642357985ada81b318eaa5cef790b8ed41d89a0f5a48e271a574",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7262a16f3f7d642357985ada81b318eaa5cef790b8ed41d89a0f5a48e271a574",
+                    "hash" : "0x7262a16f3f7d642357985ada81b318eaa5cef790b8ed41d89a0f5a48e271a574",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "767787db28cc33cd1da3856af52b141063e8f3655991dd1d8a1db0d9fd12de66",
+                    "hash" : "0x767787db28cc33cd1da3856af52b141063e8f3655991dd1d8a1db0d9fd12de66",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "767787db28cc33cd1da3856af52b141063e8f3655991dd1d8a1db0d9fd12de66",
+                    "hash" : "0x767787db28cc33cd1da3856af52b141063e8f3655991dd1d8a1db0d9fd12de66",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7262a16f3f7d642357985ada81b318eaa5cef790b8ed41d89a0f5a48e271a574",
+                    "hash" : "0x7262a16f3f7d642357985ada81b318eaa5cef790b8ed41d89a0f5a48e271a574",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0400",
                 "code" : "0x6001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f16001556103e860005402600101600255",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "15720826"
+                "0xefe17a"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/Call1024PreCalls.json b/GeneralStateTests/stCallCreateCallCodeTest/Call1024PreCalls.json
index 833da55cf..3c6b2c2e5 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/Call1024PreCalls.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/Call1024PreCalls.json
@@ -1,17 +1,17 @@
 {
     "Call1024PreCalls" : {
         "env" : {
-            "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "currentCoinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9e669d3e957acb6c3fef146901512fdef074829b110e73df2c68ef16b63921b6",
+                    "hash" : "0x9e669d3e957acb6c3fef146901512fdef074829b110e73df2c68ef16b63921b6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9e669d3e957acb6c3fef146901512fdef074829b110e73df2c68ef16b63921b6",
+                    "hash" : "0x9e669d3e957acb6c3fef146901512fdef074829b110e73df2c68ef16b63921b6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "0e28b14b17542dc03eb8e0397c1c658947420a9d95fc96ca2926a38620d593aa",
+                    "hash" : "0x0e28b14b17542dc03eb8e0397c1c658947420a9d95fc96ca2926a38620d593aa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "0e28b14b17542dc03eb8e0397c1c658947420a9d95fc96ca2926a38620d593aa",
+                    "hash" : "0x0e28b14b17542dc03eb8e0397c1c658947420a9d95fc96ca2926a38620d593aa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9e669d3e957acb6c3fef146901512fdef074829b110e73df2c68ef16b63921b6",
+                    "hash" : "0x9e669d3e957acb6c3fef146901512fdef074829b110e73df2c68ef16b63921b6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0fffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x07e8",
                 "code" : "0x6000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16002556000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16003556001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff1600155",
                 "nonce" : "0x00",
@@ -92,10 +92,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/CallLoseGasOOG.json b/GeneralStateTests/stCallCreateCallCodeTest/CallLoseGasOOG.json
index a8d9683c8..065fa1e18 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/CallLoseGasOOG.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/CallLoseGasOOG.json
@@ -1,17 +1,17 @@
 {
     "CallLoseGasOOG" : {
         "env" : {
-            "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "currentCoinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "83936b93f345c2eadf1fc9059dd84c6b369410bbbfc8a1fa11a7a3499fe6b158",
+                    "hash" : "0x83936b93f345c2eadf1fc9059dd84c6b369410bbbfc8a1fa11a7a3499fe6b158",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "83936b93f345c2eadf1fc9059dd84c6b369410bbbfc8a1fa11a7a3499fe6b158",
+                    "hash" : "0x83936b93f345c2eadf1fc9059dd84c6b369410bbbfc8a1fa11a7a3499fe6b158",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "74be0756050e62737710a3520d833376ff4af5352afcb61012b8d69183062d45",
+                    "hash" : "0x74be0756050e62737710a3520d833376ff4af5352afcb61012b8d69183062d45",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "74be0756050e62737710a3520d833376ff4af5352afcb61012b8d69183062d45",
+                    "hash" : "0x74be0756050e62737710a3520d833376ff4af5352afcb61012b8d69183062d45",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "83936b93f345c2eadf1fc9059dd84c6b369410bbbfc8a1fa11a7a3499fe6b158",
+                    "hash" : "0x83936b93f345c2eadf1fc9059dd84c6b369410bbbfc8a1fa11a7a3499fe6b158",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0400",
                 "code" : "0x6001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f16001556103e860005402600101600255",
                 "nonce" : "0x00",
@@ -92,10 +92,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/CallRecursiveBombPreCall.json b/GeneralStateTests/stCallCreateCallCodeTest/CallRecursiveBombPreCall.json
index 819b6552b..694eb2b8a 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/CallRecursiveBombPreCall.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/CallRecursiveBombPreCall.json
@@ -1,17 +1,17 @@
 {
     "CallRecursiveBombPreCall" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7e6ec21bdd51c37e15a29e69628230064daf8a5caf804440103828982e105282",
+                    "hash" : "0x7e6ec21bdd51c37e15a29e69628230064daf8a5caf804440103828982e105282",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7e6ec21bdd51c37e15a29e69628230064daf8a5caf804440103828982e105282",
+                    "hash" : "0x7e6ec21bdd51c37e15a29e69628230064daf8a5caf804440103828982e105282",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a4efec395a4b6141d677b8e44da81c0faea446eec319bc1580ad2c8e10a3ebc1",
+                    "hash" : "0xa4efec395a4b6141d677b8e44da81c0faea446eec319bc1580ad2c8e10a3ebc1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a4efec395a4b6141d677b8e44da81c0faea446eec319bc1580ad2c8e10a3ebc1",
+                    "hash" : "0xa4efec395a4b6141d677b8e44da81c0faea446eec319bc1580ad2c8e10a3ebc1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7e6ec21bdd51c37e15a29e69628230064daf8a5caf804440103828982e105282",
+                    "hash" : "0x7e6ec21bdd51c37e15a29e69628230064daf8a5caf804440103828982e105282",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0fffffffffffffffffffffffffffffff",
                 "code" : "0x6000600060006000601773bad304eb96065b2a98b57a48a06ae28d285a71b5620186a0f1506000600060006000601773945304eb96065b2a98b57a48a06ae28d285a71b56707fffffffffffffff1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x600160005401600055600060006000600060003062036b005a03f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0fffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,10 +92,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024BalanceTooLow.json b/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024BalanceTooLow.json
index 822a4038e..4337f9744 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024BalanceTooLow.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024BalanceTooLow.json
@@ -1,17 +1,17 @@
 {
     "Callcode1024BalanceTooLow" : {
         "env" : {
-            "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "currentCoinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d80c72df613cb9c044a7e8bcd95f892e65bc22cb17e8a60741df003ed7c88d19",
+                    "hash" : "0xd80c72df613cb9c044a7e8bcd95f892e65bc22cb17e8a60741df003ed7c88d19",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d80c72df613cb9c044a7e8bcd95f892e65bc22cb17e8a60741df003ed7c88d19",
+                    "hash" : "0xd80c72df613cb9c044a7e8bcd95f892e65bc22cb17e8a60741df003ed7c88d19",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "c89b206d6fc403d255aa797950b45e77ccf21ba50ff4842e23ad92b1380d21d5",
+                    "hash" : "0xc89b206d6fc403d255aa797950b45e77ccf21ba50ff4842e23ad92b1380d21d5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c89b206d6fc403d255aa797950b45e77ccf21ba50ff4842e23ad92b1380d21d5",
+                    "hash" : "0xc89b206d6fc403d255aa797950b45e77ccf21ba50ff4842e23ad92b1380d21d5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d80c72df613cb9c044a7e8bcd95f892e65bc22cb17e8a60741df003ed7c88d19",
+                    "hash" : "0xd80c72df613cb9c044a7e8bcd95f892e65bc22cb17e8a60741df003ed7c88d19",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0400",
                 "code" : "0x600160005401600055600060006000600060005473bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff2600155",
                 "nonce" : "0x00",
@@ -92,10 +92,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024OOG.json b/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024OOG.json
index c03fbf14f..a1e2edcd5 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024OOG.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024OOG.json
@@ -1,17 +1,17 @@
 {
     "Callcode1024OOG" : {
         "env" : {
-            "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "currentCoinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b099610b72ed48fb35ad2b49960c61666edfd5918813dc27614388d567ed72d0",
+                    "hash" : "0xb099610b72ed48fb35ad2b49960c61666edfd5918813dc27614388d567ed72d0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b099610b72ed48fb35ad2b49960c61666edfd5918813dc27614388d567ed72d0",
+                    "hash" : "0xb099610b72ed48fb35ad2b49960c61666edfd5918813dc27614388d567ed72d0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "990bcaa8a52576a0f881f83a8dc43af9c26e56f0965cabaa554b892a810d6c21",
+                    "hash" : "0x990bcaa8a52576a0f881f83a8dc43af9c26e56f0965cabaa554b892a810d6c21",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "990bcaa8a52576a0f881f83a8dc43af9c26e56f0965cabaa554b892a810d6c21",
+                    "hash" : "0x990bcaa8a52576a0f881f83a8dc43af9c26e56f0965cabaa554b892a810d6c21",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b099610b72ed48fb35ad2b49960c61666edfd5918813dc27614388d567ed72d0",
+                    "hash" : "0xb099610b72ed48fb35ad2b49960c61666edfd5918813dc27614388d567ed72d0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0400",
                 "code" : "0x6001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f26001556103e860005402600101600255",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "15720826"
+                "0xefe17a"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/CallcodeLoseGasOOG.json b/GeneralStateTests/stCallCreateCallCodeTest/CallcodeLoseGasOOG.json
index e7318ebff..885712d21 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/CallcodeLoseGasOOG.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/CallcodeLoseGasOOG.json
@@ -1,17 +1,17 @@
 {
     "CallcodeLoseGasOOG" : {
         "env" : {
-            "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "currentCoinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "46a8f242088e78fb22bcfe144fa4c91f51774d11dc56810806d8a2005ff365da",
+                    "hash" : "0x46a8f242088e78fb22bcfe144fa4c91f51774d11dc56810806d8a2005ff365da",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "46a8f242088e78fb22bcfe144fa4c91f51774d11dc56810806d8a2005ff365da",
+                    "hash" : "0x46a8f242088e78fb22bcfe144fa4c91f51774d11dc56810806d8a2005ff365da",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e4315b558952437f6f4d4dff77780e72dacdcc0a0cd443e9517e7347b3364060",
+                    "hash" : "0xe4315b558952437f6f4d4dff77780e72dacdcc0a0cd443e9517e7347b3364060",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e4315b558952437f6f4d4dff77780e72dacdcc0a0cd443e9517e7347b3364060",
+                    "hash" : "0xe4315b558952437f6f4d4dff77780e72dacdcc0a0cd443e9517e7347b3364060",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "46a8f242088e78fb22bcfe144fa4c91f51774d11dc56810806d8a2005ff365da",
+                    "hash" : "0x46a8f242088e78fb22bcfe144fa4c91f51774d11dc56810806d8a2005ff365da",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0400",
                 "code" : "0x6001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f26001556103e860005402600101600255",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "166262"
+                "0x028976"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callOutput1.json b/GeneralStateTests/stCallCreateCallCodeTest/callOutput1.json
index 12473e101..ab5fa8cbf 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/callOutput1.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/callOutput1.json
@@ -1,17 +1,17 @@
 {
     "callOutput1" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7b27c1a486cad63a429086b85416cb2d8cebb0c159a7f73be018c30de2ecdf28",
+                    "hash" : "0x7b27c1a486cad63a429086b85416cb2d8cebb0c159a7f73be018c30de2ecdf28",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "798d1e55defeabefb8e2625b6429f7ab0d47474b6624a013ec0b385cf031e772",
+                    "hash" : "0x798d1e55defeabefb8e2625b6429f7ab0d47474b6624a013ec0b385cf031e772",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "7b27c1a486cad63a429086b85416cb2d8cebb0c159a7f73be018c30de2ecdf28",
+                    "hash" : "0x7b27c1a486cad63a429086b85416cb2d8cebb0c159a7f73be018c30de2ecdf28",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "7b27c1a486cad63a429086b85416cb2d8cebb0c159a7f73be018c30de2ecdf28",
+                    "hash" : "0x7b27c1a486cad63a429086b85416cb2d8cebb0c159a7f73be018c30de2ecdf28",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "798d1e55defeabefb8e2625b6429f7ab0d47474b6624a013ec0b385cf031e772",
+                    "hash" : "0x798d1e55defeabefb8e2625b6429f7ab0d47474b6624a013ec0b385cf031e772",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f150600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600101600055",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1000000"
+                "0x0f4240"
             ],
             "gasPrice" : "0x00",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callOutput2.json b/GeneralStateTests/stCallCreateCallCodeTest/callOutput2.json
index 906fc6012..961763ac0 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/callOutput2.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/callOutput2.json
@@ -1,17 +1,17 @@
 {
     "callOutput2" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "5e362b5144a434345036ebbd58cfe65a597cdcff2fa24ec661c7a09ca608ec0f",
+                    "hash" : "0x5e362b5144a434345036ebbd58cfe65a597cdcff2fa24ec661c7a09ca608ec0f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c0c87377411f756fa0ba9a8e0024811e84e9cf31c5967f50a04d3834ab32b4e1",
+                    "hash" : "0xc0c87377411f756fa0ba9a8e0024811e84e9cf31c5967f50a04d3834ab32b4e1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5e362b5144a434345036ebbd58cfe65a597cdcff2fa24ec661c7a09ca608ec0f",
+                    "hash" : "0x5e362b5144a434345036ebbd58cfe65a597cdcff2fa24ec661c7a09ca608ec0f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5e362b5144a434345036ebbd58cfe65a597cdcff2fa24ec661c7a09ca608ec0f",
+                    "hash" : "0x5e362b5144a434345036ebbd58cfe65a597cdcff2fa24ec661c7a09ca608ec0f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c0c87377411f756fa0ba9a8e0024811e84e9cf31c5967f50a04d3834ab32b4e1",
+                    "hash" : "0xc0c87377411f756fa0ba9a8e0024811e84e9cf31c5967f50a04d3834ab32b4e1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526000600060206000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f150600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600101600055",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1000000"
+                "0x0f4240"
             ],
             "gasPrice" : "0x00",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callOutput3.json b/GeneralStateTests/stCallCreateCallCodeTest/callOutput3.json
index cff0c0eca..58ccf033d 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/callOutput3.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/callOutput3.json
@@ -1,17 +1,17 @@
 {
     "callOutput3" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "0152447aa19bc18ad06b4c1ca4fa9f163d9f8c258925d9e1a38936588847a5ea",
+                    "hash" : "0x0152447aa19bc18ad06b4c1ca4fa9f163d9f8c258925d9e1a38936588847a5ea",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "5c0033c83177273d0ac13a79006fee34e001d9acd58e9f56e7841751a20e1c43",
+                    "hash" : "0x5c0033c83177273d0ac13a79006fee34e001d9acd58e9f56e7841751a20e1c43",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "0152447aa19bc18ad06b4c1ca4fa9f163d9f8c258925d9e1a38936588847a5ea",
+                    "hash" : "0x0152447aa19bc18ad06b4c1ca4fa9f163d9f8c258925d9e1a38936588847a5ea",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "0152447aa19bc18ad06b4c1ca4fa9f163d9f8c258925d9e1a38936588847a5ea",
+                    "hash" : "0x0152447aa19bc18ad06b4c1ca4fa9f163d9f8c258925d9e1a38936588847a5ea",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "5c0033c83177273d0ac13a79006fee34e001d9acd58e9f56e7841751a20e1c43",
+                    "hash" : "0x5c0033c83177273d0ac13a79006fee34e001d9acd58e9f56e7841751a20e1c43",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f150600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600101600055",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1000000"
+                "0x0f4240"
             ],
             "gasPrice" : "0x00",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callOutput3Fail.json b/GeneralStateTests/stCallCreateCallCodeTest/callOutput3Fail.json
index cfb6639b8..fe7d1575d 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/callOutput3Fail.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/callOutput3Fail.json
@@ -1,17 +1,17 @@
 {
     "callOutput3Fail" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b5f1a90133ac8a91c55acfe81e3c9fdda619081ae5251e160214090245bbebb9",
+                    "hash" : "0xb5f1a90133ac8a91c55acfe81e3c9fdda619081ae5251e160214090245bbebb9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "4548d282d5e76a7944f0ca0c562eff40124678658f1cc3420ad04bf64a926717",
+                    "hash" : "0x4548d282d5e76a7944f0ca0c562eff40124678658f1cc3420ad04bf64a926717",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b5f1a90133ac8a91c55acfe81e3c9fdda619081ae5251e160214090245bbebb9",
+                    "hash" : "0xb5f1a90133ac8a91c55acfe81e3c9fdda619081ae5251e160214090245bbebb9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b5f1a90133ac8a91c55acfe81e3c9fdda619081ae5251e160214090245bbebb9",
+                    "hash" : "0xb5f1a90133ac8a91c55acfe81e3c9fdda619081ae5251e160214090245bbebb9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "4548d282d5e76a7944f0ca0c562eff40124678658f1cc3420ad04bf64a926717",
+                    "hash" : "0x4548d282d5e76a7944f0ca0c562eff40124678658f1cc3420ad04bf64a926717",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f150600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x016001600101600055",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1000000"
+                "0x0f4240"
             ],
             "gasPrice" : "0x00",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partial.json b/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partial.json
index 5953b6d21..9e1ae1f44 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partial.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partial.json
@@ -1,17 +1,17 @@
 {
     "callOutput3partial" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a69a06073030c243674bff83b6b69e44cf1e5c3922a7bbb8e0f016b2bf16c67a",
+                    "hash" : "0xa69a06073030c243674bff83b6b69e44cf1e5c3922a7bbb8e0f016b2bf16c67a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f1758b5f24c9a06ccf2d242198e3b8813aef83cfa386c933a45b861cac7c2e07",
+                    "hash" : "0xf1758b5f24c9a06ccf2d242198e3b8813aef83cfa386c933a45b861cac7c2e07",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a69a06073030c243674bff83b6b69e44cf1e5c3922a7bbb8e0f016b2bf16c67a",
+                    "hash" : "0xa69a06073030c243674bff83b6b69e44cf1e5c3922a7bbb8e0f016b2bf16c67a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a69a06073030c243674bff83b6b69e44cf1e5c3922a7bbb8e0f016b2bf16c67a",
+                    "hash" : "0xa69a06073030c243674bff83b6b69e44cf1e5c3922a7bbb8e0f016b2bf16c67a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f1758b5f24c9a06ccf2d242198e3b8813aef83cfa386c933a45b861cac7c2e07",
+                    "hash" : "0xf1758b5f24c9a06ccf2d242198e3b8813aef83cfa386c933a45b861cac7c2e07",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f150600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600101600055",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1000000"
+                "0x0f4240"
             ],
             "gasPrice" : "0x00",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partialFail.json b/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partialFail.json
index 481eeb7fa..a544fb9ef 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partialFail.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partialFail.json
@@ -1,17 +1,17 @@
 {
     "callOutput3partialFail" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "24d198fb3b2d5fc65c0f331a129e013dedc29a4af9df00b77b6011cad25ee975",
+                    "hash" : "0x24d198fb3b2d5fc65c0f331a129e013dedc29a4af9df00b77b6011cad25ee975",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "ac14bbcd134a728e66846cf35c68f5c762ebb86519f152ba3172b4e8e3d0c88b",
+                    "hash" : "0xac14bbcd134a728e66846cf35c68f5c762ebb86519f152ba3172b4e8e3d0c88b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "24d198fb3b2d5fc65c0f331a129e013dedc29a4af9df00b77b6011cad25ee975",
+                    "hash" : "0x24d198fb3b2d5fc65c0f331a129e013dedc29a4af9df00b77b6011cad25ee975",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "24d198fb3b2d5fc65c0f331a129e013dedc29a4af9df00b77b6011cad25ee975",
+                    "hash" : "0x24d198fb3b2d5fc65c0f331a129e013dedc29a4af9df00b77b6011cad25ee975",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "ac14bbcd134a728e66846cf35c68f5c762ebb86519f152ba3172b4e8e3d0c88b",
+                    "hash" : "0xac14bbcd134a728e66846cf35c68f5c762ebb86519f152ba3172b4e8e3d0c88b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f150600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x016001600101600055",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1000000"
+                "0x0f4240"
             ],
             "gasPrice" : "0x00",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValue.json b/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValue.json
index 37d2e4fa0..30904d092 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValue.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValue.json
@@ -1,17 +1,17 @@
 {
     "callWithHighValue" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7def6ae28e9950b938eb97188f9520684902f336edf00bd3083f19bf8a2d15b1",
+                    "hash" : "0x7def6ae28e9950b938eb97188f9520684902f336edf00bd3083f19bf8a2d15b1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7def6ae28e9950b938eb97188f9520684902f336edf00bd3083f19bf8a2d15b1",
+                    "hash" : "0x7def6ae28e9950b938eb97188f9520684902f336edf00bd3083f19bf8a2d15b1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "1eb0027486ac4fc1b9d7a46ebecf09f931996982cc3d69c5a10c2706a8f02aa5",
+                    "hash" : "0x1eb0027486ac4fc1b9d7a46ebecf09f931996982cc3d69c5a10c2706a8f02aa5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "1eb0027486ac4fc1b9d7a46ebecf09f931996982cc3d69c5a10c2706a8f02aa5",
+                    "hash" : "0x1eb0027486ac4fc1b9d7a46ebecf09f931996982cc3d69c5a10c2706a8f02aa5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7def6ae28e9950b938eb97188f9520684902f336edf00bd3083f19bf8a2d15b1",
+                    "hash" : "0x7def6ae28e9950b938eb97188f9520684902f336edf00bd3083f19bf8a2d15b1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6002600060406000670de0b6b3a764000173945304eb96065b2a98b57a48a06ae28d285a71b561c350f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndGasOOG.json b/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndGasOOG.json
index 0ab9a000a..888bfd344 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndGasOOG.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndGasOOG.json
@@ -1,17 +1,17 @@
 {
     "callWithHighValueAndGasOOG" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "3bfbfff0f54880e052e6b15b21cea6308d5f8980382efd244ec6a156e80a682c",
+                    "hash" : "0x3bfbfff0f54880e052e6b15b21cea6308d5f8980382efd244ec6a156e80a682c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "3bfbfff0f54880e052e6b15b21cea6308d5f8980382efd244ec6a156e80a682c",
+                    "hash" : "0x3bfbfff0f54880e052e6b15b21cea6308d5f8980382efd244ec6a156e80a682c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a3ad91041fae57a25112cdccd43a1f0c5dcdf3d34d3e2c0540ea9e2ad397415e",
+                    "hash" : "0xa3ad91041fae57a25112cdccd43a1f0c5dcdf3d34d3e2c0540ea9e2ad397415e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a3ad91041fae57a25112cdccd43a1f0c5dcdf3d34d3e2c0540ea9e2ad397415e",
+                    "hash" : "0xa3ad91041fae57a25112cdccd43a1f0c5dcdf3d34d3e2c0540ea9e2ad397415e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "3bfbfff0f54880e052e6b15b21cea6308d5f8980382efd244ec6a156e80a682c",
+                    "hash" : "0x3bfbfff0f54880e052e6b15b21cea6308d5f8980382efd244ec6a156e80a682c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600068056bc75e2d6310000073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndOOGatTxLevel.json b/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndOOGatTxLevel.json
index 4bb5e5e5c..c303197a7 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndOOGatTxLevel.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndOOGatTxLevel.json
@@ -1,17 +1,17 @@
 {
     "callWithHighValueAndOOGatTxLevel" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f67e329eb3010477fe9721de02eed7171187a534ee81ad47609a049ff9af61b5",
+                    "hash" : "0xf67e329eb3010477fe9721de02eed7171187a534ee81ad47609a049ff9af61b5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f67e329eb3010477fe9721de02eed7171187a534ee81ad47609a049ff9af61b5",
+                    "hash" : "0xf67e329eb3010477fe9721de02eed7171187a534ee81ad47609a049ff9af61b5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "abcff5573348695b56596d30d93ec83f3adc2ec368a81e824dd60516ccb846e2",
+                    "hash" : "0xabcff5573348695b56596d30d93ec83f3adc2ec368a81e824dd60516ccb846e2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "abcff5573348695b56596d30d93ec83f3adc2ec368a81e824dd60516ccb846e2",
+                    "hash" : "0xabcff5573348695b56596d30d93ec83f3adc2ec368a81e824dd60516ccb846e2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f67e329eb3010477fe9721de02eed7171187a534ee81ad47609a049ff9af61b5",
+                    "hash" : "0xf67e329eb3010477fe9721de02eed7171187a534ee81ad47609a049ff9af61b5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x6000600060006000620186a173945304eb96065b2a98b57a48a06ae28d285a71b5622dc6c1f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueOOGinCall.json b/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueOOGinCall.json
index aa2f71e3e..1d6059335 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueOOGinCall.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueOOGinCall.json
@@ -1,17 +1,17 @@
 {
     "callWithHighValueOOGinCall" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "0867e91acfcccc804e1bf9a92ed3d40b97f87b630c1a992e3ff859de9fd0ebd5",
+                    "hash" : "0x0867e91acfcccc804e1bf9a92ed3d40b97f87b630c1a992e3ff859de9fd0ebd5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "0867e91acfcccc804e1bf9a92ed3d40b97f87b630c1a992e3ff859de9fd0ebd5",
+                    "hash" : "0x0867e91acfcccc804e1bf9a92ed3d40b97f87b630c1a992e3ff859de9fd0ebd5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "64a7fa9e0aa600695d031c61da404a5c2782ccc80a2392833a32cc62bd923cf1",
+                    "hash" : "0x64a7fa9e0aa600695d031c61da404a5c2782ccc80a2392833a32cc62bd923cf1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "64a7fa9e0aa600695d031c61da404a5c2782ccc80a2392833a32cc62bd923cf1",
+                    "hash" : "0x64a7fa9e0aa600695d031c61da404a5c2782ccc80a2392833a32cc62bd923cf1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0867e91acfcccc804e1bf9a92ed3d40b97f87b630c1a992e3ff859de9fd0ebd5",
+                    "hash" : "0x0867e91acfcccc804e1bf9a92ed3d40b97f87b630c1a992e3ff859de9fd0ebd5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x60016000600060006000601773945304eb96065b2a98b57a48a06ae28d285a71b5612710f101600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput1.json b/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput1.json
index 58ef34460..a490f7013 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput1.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput1.json
@@ -1,17 +1,17 @@
 {
     "callcodeOutput1" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6803680f0aea1573dfdde914548a5e1d7661b182d676cdb73f4c2bc7d348aae8",
+                    "hash" : "0x6803680f0aea1573dfdde914548a5e1d7661b182d676cdb73f4c2bc7d348aae8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c19c1d77d2fa6f03c16c3e0a2b21f32a6d6fd6e5c42d74a205ef3cacbcd20533",
+                    "hash" : "0xc19c1d77d2fa6f03c16c3e0a2b21f32a6d6fd6e5c42d74a205ef3cacbcd20533",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6803680f0aea1573dfdde914548a5e1d7661b182d676cdb73f4c2bc7d348aae8",
+                    "hash" : "0x6803680f0aea1573dfdde914548a5e1d7661b182d676cdb73f4c2bc7d348aae8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6803680f0aea1573dfdde914548a5e1d7661b182d676cdb73f4c2bc7d348aae8",
+                    "hash" : "0x6803680f0aea1573dfdde914548a5e1d7661b182d676cdb73f4c2bc7d348aae8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c19c1d77d2fa6f03c16c3e0a2b21f32a6d6fd6e5c42d74a205ef3cacbcd20533",
+                    "hash" : "0xc19c1d77d2fa6f03c16c3e0a2b21f32a6d6fd6e5c42d74a205ef3cacbcd20533",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600101600055",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1000000"
+                "0x0f4240"
             ],
             "gasPrice" : "0x00",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput2.json b/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput2.json
index aaccb14b1..1e3d95a47 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput2.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput2.json
@@ -1,17 +1,17 @@
 {
     "callcodeOutput2" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "78fe48479cfd9f57c8ab5937a0805d4d04d40823c291fcc4adf0c9b61f6fc0d9",
+                    "hash" : "0x78fe48479cfd9f57c8ab5937a0805d4d04d40823c291fcc4adf0c9b61f6fc0d9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "ff93a7763fb845955fac90917658906a99591d1fed6839bf9990df1eeb6aa9e2",
+                    "hash" : "0xff93a7763fb845955fac90917658906a99591d1fed6839bf9990df1eeb6aa9e2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "78fe48479cfd9f57c8ab5937a0805d4d04d40823c291fcc4adf0c9b61f6fc0d9",
+                    "hash" : "0x78fe48479cfd9f57c8ab5937a0805d4d04d40823c291fcc4adf0c9b61f6fc0d9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "78fe48479cfd9f57c8ab5937a0805d4d04d40823c291fcc4adf0c9b61f6fc0d9",
+                    "hash" : "0x78fe48479cfd9f57c8ab5937a0805d4d04d40823c291fcc4adf0c9b61f6fc0d9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "ff93a7763fb845955fac90917658906a99591d1fed6839bf9990df1eeb6aa9e2",
+                    "hash" : "0xff93a7763fb845955fac90917658906a99591d1fed6839bf9990df1eeb6aa9e2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526000600060206000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600101600055",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1000000"
+                "0x0f4240"
             ],
             "gasPrice" : "0x00",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3.json b/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3.json
index 8bd9f87a5..4da6e94e5 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3.json
@@ -1,17 +1,17 @@
 {
     "callcodeOutput3" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b737505a15b9bfdb788595646aeec43d1827feb376cdc56aefc9081cb7f6e8a7",
+                    "hash" : "0xb737505a15b9bfdb788595646aeec43d1827feb376cdc56aefc9081cb7f6e8a7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "cef78b273dc327acbe1104b428ea54e20358c1787f712ca76c3116024b347a03",
+                    "hash" : "0xcef78b273dc327acbe1104b428ea54e20358c1787f712ca76c3116024b347a03",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b737505a15b9bfdb788595646aeec43d1827feb376cdc56aefc9081cb7f6e8a7",
+                    "hash" : "0xb737505a15b9bfdb788595646aeec43d1827feb376cdc56aefc9081cb7f6e8a7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b737505a15b9bfdb788595646aeec43d1827feb376cdc56aefc9081cb7f6e8a7",
+                    "hash" : "0xb737505a15b9bfdb788595646aeec43d1827feb376cdc56aefc9081cb7f6e8a7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "cef78b273dc327acbe1104b428ea54e20358c1787f712ca76c3116024b347a03",
+                    "hash" : "0xcef78b273dc327acbe1104b428ea54e20358c1787f712ca76c3116024b347a03",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600101600055",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1000000"
+                "0x0f4240"
             ],
             "gasPrice" : "0x00",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3Fail.json b/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3Fail.json
index c26eb2005..67461f6a1 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3Fail.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3Fail.json
@@ -1,17 +1,17 @@
 {
     "callcodeOutput3Fail" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "fd3a6c8827305178fad93c3268903e7e3a04fe1347e56c3a05a20616ca4acd3f",
+                    "hash" : "0xfd3a6c8827305178fad93c3268903e7e3a04fe1347e56c3a05a20616ca4acd3f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "633b052741568a84cdda76bcdf140e188bfb89775935668c13c76769212520af",
+                    "hash" : "0x633b052741568a84cdda76bcdf140e188bfb89775935668c13c76769212520af",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "fd3a6c8827305178fad93c3268903e7e3a04fe1347e56c3a05a20616ca4acd3f",
+                    "hash" : "0xfd3a6c8827305178fad93c3268903e7e3a04fe1347e56c3a05a20616ca4acd3f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "fd3a6c8827305178fad93c3268903e7e3a04fe1347e56c3a05a20616ca4acd3f",
+                    "hash" : "0xfd3a6c8827305178fad93c3268903e7e3a04fe1347e56c3a05a20616ca4acd3f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "633b052741568a84cdda76bcdf140e188bfb89775935668c13c76769212520af",
+                    "hash" : "0x633b052741568a84cdda76bcdf140e188bfb89775935668c13c76769212520af",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x016001600101600055",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1000000"
+                "0x0f4240"
             ],
             "gasPrice" : "0x00",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partial.json b/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partial.json
index bfa902a06..eee64ba8e 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partial.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partial.json
@@ -1,17 +1,17 @@
 {
     "callcodeOutput3partial" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "5ea923fe41814229d0076dce8fe91703070eddef323b233e43901a9bd8cafcbc",
+                    "hash" : "0x5ea923fe41814229d0076dce8fe91703070eddef323b233e43901a9bd8cafcbc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "62e67a9eefce8bc4256ade3264a52606e421505048397736cec05454afd65ace",
+                    "hash" : "0x62e67a9eefce8bc4256ade3264a52606e421505048397736cec05454afd65ace",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5ea923fe41814229d0076dce8fe91703070eddef323b233e43901a9bd8cafcbc",
+                    "hash" : "0x5ea923fe41814229d0076dce8fe91703070eddef323b233e43901a9bd8cafcbc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5ea923fe41814229d0076dce8fe91703070eddef323b233e43901a9bd8cafcbc",
+                    "hash" : "0x5ea923fe41814229d0076dce8fe91703070eddef323b233e43901a9bd8cafcbc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "62e67a9eefce8bc4256ade3264a52606e421505048397736cec05454afd65ace",
+                    "hash" : "0x62e67a9eefce8bc4256ade3264a52606e421505048397736cec05454afd65ace",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600101600055",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1000000"
+                "0x0f4240"
             ],
             "gasPrice" : "0x00",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partialFail.json b/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partialFail.json
index f59e350ab..2a9689e1e 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partialFail.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partialFail.json
@@ -1,17 +1,17 @@
 {
     "callcodeOutput3partialFail" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "db077b8446cf6ccba2575d27f2656e89ed494a6fa5fa8302dba207ee16af8b56",
+                    "hash" : "0xdb077b8446cf6ccba2575d27f2656e89ed494a6fa5fa8302dba207ee16af8b56",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6dde5c3897639f0a36ccdba1addcee240c47c55fc04c90ffa0663ac4668dd2af",
+                    "hash" : "0x6dde5c3897639f0a36ccdba1addcee240c47c55fc04c90ffa0663ac4668dd2af",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "db077b8446cf6ccba2575d27f2656e89ed494a6fa5fa8302dba207ee16af8b56",
+                    "hash" : "0xdb077b8446cf6ccba2575d27f2656e89ed494a6fa5fa8302dba207ee16af8b56",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "db077b8446cf6ccba2575d27f2656e89ed494a6fa5fa8302dba207ee16af8b56",
+                    "hash" : "0xdb077b8446cf6ccba2575d27f2656e89ed494a6fa5fa8302dba207ee16af8b56",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6dde5c3897639f0a36ccdba1addcee240c47c55fc04c90ffa0663ac4668dd2af",
+                    "hash" : "0x6dde5c3897639f0a36ccdba1addcee240c47c55fc04c90ffa0663ac4668dd2af",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x016001600101600055",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1000000"
+                "0x0f4240"
             ],
             "gasPrice" : "0x00",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValue.json b/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValue.json
index c9636978d..bbda04b67 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValue.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValue.json
@@ -1,17 +1,17 @@
 {
     "callcodeWithHighValue" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "86067cf8a4293319dbc8884e0497b77acc13910e87f5bdb436f6f7abc338de7d",
+                    "hash" : "0x86067cf8a4293319dbc8884e0497b77acc13910e87f5bdb436f6f7abc338de7d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "86067cf8a4293319dbc8884e0497b77acc13910e87f5bdb436f6f7abc338de7d",
+                    "hash" : "0x86067cf8a4293319dbc8884e0497b77acc13910e87f5bdb436f6f7abc338de7d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b780598c57627c25b4378a47664f3c2719e68b60de2070d526ae3f90cc57b7c2",
+                    "hash" : "0xb780598c57627c25b4378a47664f3c2719e68b60de2070d526ae3f90cc57b7c2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b780598c57627c25b4378a47664f3c2719e68b60de2070d526ae3f90cc57b7c2",
+                    "hash" : "0xb780598c57627c25b4378a47664f3c2719e68b60de2070d526ae3f90cc57b7c2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "86067cf8a4293319dbc8884e0497b77acc13910e87f5bdb436f6f7abc338de7d",
+                    "hash" : "0x86067cf8a4293319dbc8884e0497b77acc13910e87f5bdb436f6f7abc338de7d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6002600060406000670de0b6b3a764000173945304eb96065b2a98b57a48a06ae28d285a71b561c350f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValueAndGasOOG.json b/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValueAndGasOOG.json
index f70e7a9a9..66e51ff6b 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValueAndGasOOG.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValueAndGasOOG.json
@@ -1,17 +1,17 @@
 {
     "callcodeWithHighValueAndGasOOG" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6d4dadb84a3e8ca3c0cda40ae936ce991724c5399d72a1a8c930450e869c0a13",
+                    "hash" : "0x6d4dadb84a3e8ca3c0cda40ae936ce991724c5399d72a1a8c930450e869c0a13",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6d4dadb84a3e8ca3c0cda40ae936ce991724c5399d72a1a8c930450e869c0a13",
+                    "hash" : "0x6d4dadb84a3e8ca3c0cda40ae936ce991724c5399d72a1a8c930450e869c0a13",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "c8f0273b761297b4f580d19488711d74e6b6900bcf55fd9c6fa9fd891809bc52",
+                    "hash" : "0xc8f0273b761297b4f580d19488711d74e6b6900bcf55fd9c6fa9fd891809bc52",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c8f0273b761297b4f580d19488711d74e6b6900bcf55fd9c6fa9fd891809bc52",
+                    "hash" : "0xc8f0273b761297b4f580d19488711d74e6b6900bcf55fd9c6fa9fd891809bc52",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6d4dadb84a3e8ca3c0cda40ae936ce991724c5399d72a1a8c930450e869c0a13",
+                    "hash" : "0x6d4dadb84a3e8ca3c0cda40ae936ce991724c5399d72a1a8c930450e869c0a13",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600068056bc75e2d6310000073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createFailBalanceTooLow.json b/GeneralStateTests/stCallCreateCallCodeTest/createFailBalanceTooLow.json
index a75cdf0af..b37239c75 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/createFailBalanceTooLow.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/createFailBalanceTooLow.json
@@ -1,17 +1,17 @@
 {
     "createFailBalanceTooLow" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x05f5e100",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "55c92327bbe8401de7efef3cd3f1fd2227224e415142bbc36f634920407d4ee5",
+                    "hash" : "0x55c92327bbe8401de7efef3cd3f1fd2227224e415142bbc36f634920407d4ee5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "55c92327bbe8401de7efef3cd3f1fd2227224e415142bbc36f634920407d4ee5",
+                    "hash" : "0x55c92327bbe8401de7efef3cd3f1fd2227224e415142bbc36f634920407d4ee5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5833e19631ddedaf4e3c9a766f696c2e59e7524e388eb871be19dc8e0ce37b6e",
+                    "hash" : "0x5833e19631ddedaf4e3c9a766f696c2e59e7524e388eb871be19dc8e0ce37b6e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5833e19631ddedaf4e3c9a766f696c2e59e7524e388eb871be19dc8e0ce37b6e",
+                    "hash" : "0x5833e19631ddedaf4e3c9a766f696c2e59e7524e388eb871be19dc8e0ce37b6e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "55c92327bbe8401de7efef3cd3f1fd2227224e415142bbc36f634920407d4ee5",
+                    "hash" : "0x55c92327bbe8401de7efef3cd3f1fd2227224e415142bbc36f634920407d4ee5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x605a60005360016000670de0b6b3a7640018f0ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "53021"
+                "0xcf1d"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "23"
+                "0x17"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createInitFailBadJumpDestination.json b/GeneralStateTests/stCallCreateCallCodeTest/createInitFailBadJumpDestination.json
index 154af8ab0..e86535c8e 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/createInitFailBadJumpDestination.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/createInitFailBadJumpDestination.json
@@ -1,17 +1,17 @@
 {
     "createInitFailBadJumpDestination" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x05f5e100",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "824c238b75708fb4a25f1b1fd6d157278ced70e717a294790e74b0a006f31949",
+                    "hash" : "0x824c238b75708fb4a25f1b1fd6d157278ced70e717a294790e74b0a006f31949",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "824c238b75708fb4a25f1b1fd6d157278ced70e717a294790e74b0a006f31949",
+                    "hash" : "0x824c238b75708fb4a25f1b1fd6d157278ced70e717a294790e74b0a006f31949",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "ccf7765eff3effe22a5f853099f7da88291b8346b689ffbf54b729ba04170e59",
+                    "hash" : "0xccf7765eff3effe22a5f853099f7da88291b8346b689ffbf54b729ba04170e59",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ccf7765eff3effe22a5f853099f7da88291b8346b689ffbf54b729ba04170e59",
+                    "hash" : "0xccf7765eff3effe22a5f853099f7da88291b8346b689ffbf54b729ba04170e59",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "824c238b75708fb4a25f1b1fd6d157278ced70e717a294790e74b0a006f31949",
+                    "hash" : "0x824c238b75708fb4a25f1b1fd6d157278ced70e717a294790e74b0a006f31949",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6056600053600160006001f0ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "100000000"
+                "0x05f5e100"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createInitFailStackSizeLargerThan1024.json b/GeneralStateTests/stCallCreateCallCodeTest/createInitFailStackSizeLargerThan1024.json
index 5e0a9e65c..3d5b64d26 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/createInitFailStackSizeLargerThan1024.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/createInitFailStackSizeLargerThan1024.json
@@ -1,17 +1,17 @@
 {
     "createInitFailStackSizeLargerThan1024" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x05f5e100",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "824c238b75708fb4a25f1b1fd6d157278ced70e717a294790e74b0a006f31949",
+                    "hash" : "0x824c238b75708fb4a25f1b1fd6d157278ced70e717a294790e74b0a006f31949",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "824c238b75708fb4a25f1b1fd6d157278ced70e717a294790e74b0a006f31949",
+                    "hash" : "0x824c238b75708fb4a25f1b1fd6d157278ced70e717a294790e74b0a006f31949",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "ccf7765eff3effe22a5f853099f7da88291b8346b689ffbf54b729ba04170e59",
+                    "hash" : "0xccf7765eff3effe22a5f853099f7da88291b8346b689ffbf54b729ba04170e59",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ccf7765eff3effe22a5f853099f7da88291b8346b689ffbf54b729ba04170e59",
+                    "hash" : "0xccf7765eff3effe22a5f853099f7da88291b8346b689ffbf54b729ba04170e59",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "824c238b75708fb4a25f1b1fd6d157278ced70e717a294790e74b0a006f31949",
+                    "hash" : "0x824c238b75708fb4a25f1b1fd6d157278ced70e717a294790e74b0a006f31949",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f6103ff6000525b7f0102030405060708090a0102030405060708090a010203046000527f05060708090a0102600160005103600052600051600657000000000000000000602052604060006001f0ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "100000000"
+                "0x05f5e100"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createInitFailStackUnderflow.json b/GeneralStateTests/stCallCreateCallCodeTest/createInitFailStackUnderflow.json
index 2667e739c..947d39ed9 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/createInitFailStackUnderflow.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/createInitFailStackUnderflow.json
@@ -1,17 +1,17 @@
 {
     "createInitFailStackUnderflow" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x05f5e100",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "824c238b75708fb4a25f1b1fd6d157278ced70e717a294790e74b0a006f31949",
+                    "hash" : "0x824c238b75708fb4a25f1b1fd6d157278ced70e717a294790e74b0a006f31949",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "824c238b75708fb4a25f1b1fd6d157278ced70e717a294790e74b0a006f31949",
+                    "hash" : "0x824c238b75708fb4a25f1b1fd6d157278ced70e717a294790e74b0a006f31949",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "ccf7765eff3effe22a5f853099f7da88291b8346b689ffbf54b729ba04170e59",
+                    "hash" : "0xccf7765eff3effe22a5f853099f7da88291b8346b689ffbf54b729ba04170e59",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ccf7765eff3effe22a5f853099f7da88291b8346b689ffbf54b729ba04170e59",
+                    "hash" : "0xccf7765eff3effe22a5f853099f7da88291b8346b689ffbf54b729ba04170e59",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "824c238b75708fb4a25f1b1fd6d157278ced70e717a294790e74b0a006f31949",
+                    "hash" : "0x824c238b75708fb4a25f1b1fd6d157278ced70e717a294790e74b0a006f31949",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600053600160006001f0ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "100000000"
+                "0x05f5e100"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createInitFailUndefinedInstruction.json b/GeneralStateTests/stCallCreateCallCodeTest/createInitFailUndefinedInstruction.json
index e19bfa1f8..5c4f8fa0e 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/createInitFailUndefinedInstruction.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/createInitFailUndefinedInstruction.json
@@ -1,17 +1,17 @@
 {
     "createInitFailUndefinedInstruction" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x05f5e100",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "824c238b75708fb4a25f1b1fd6d157278ced70e717a294790e74b0a006f31949",
+                    "hash" : "0x824c238b75708fb4a25f1b1fd6d157278ced70e717a294790e74b0a006f31949",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "824c238b75708fb4a25f1b1fd6d157278ced70e717a294790e74b0a006f31949",
+                    "hash" : "0x824c238b75708fb4a25f1b1fd6d157278ced70e717a294790e74b0a006f31949",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "ccf7765eff3effe22a5f853099f7da88291b8346b689ffbf54b729ba04170e59",
+                    "hash" : "0xccf7765eff3effe22a5f853099f7da88291b8346b689ffbf54b729ba04170e59",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ccf7765eff3effe22a5f853099f7da88291b8346b689ffbf54b729ba04170e59",
+                    "hash" : "0xccf7765eff3effe22a5f853099f7da88291b8346b689ffbf54b729ba04170e59",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "824c238b75708fb4a25f1b1fd6d157278ced70e717a294790e74b0a006f31949",
+                    "hash" : "0x824c238b75708fb4a25f1b1fd6d157278ced70e717a294790e74b0a006f31949",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60f4600053600160006001f0ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "100000000"
+                "0x05f5e100"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createInitFail_OOGduringInit.json b/GeneralStateTests/stCallCreateCallCodeTest/createInitFail_OOGduringInit.json
index 0453b1a2a..05ff50b9a 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/createInitFail_OOGduringInit.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/createInitFail_OOGduringInit.json
@@ -1,17 +1,17 @@
 {
     "createInitFail_OOGduringInit" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x05f5e100",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "97f22c8456ec99501c3eb4f86927b26c6aa50f658a5939fdc20234f1d376a6e0",
+                    "hash" : "0x97f22c8456ec99501c3eb4f86927b26c6aa50f658a5939fdc20234f1d376a6e0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "97f22c8456ec99501c3eb4f86927b26c6aa50f658a5939fdc20234f1d376a6e0",
+                    "hash" : "0x97f22c8456ec99501c3eb4f86927b26c6aa50f658a5939fdc20234f1d376a6e0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "297303455494578a5176177ff1b9db0b0a516255a3d062fb960bbc99e60d8eb5",
+                    "hash" : "0x297303455494578a5176177ff1b9db0b0a516255a3d062fb960bbc99e60d8eb5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "297303455494578a5176177ff1b9db0b0a516255a3d062fb960bbc99e60d8eb5",
+                    "hash" : "0x297303455494578a5176177ff1b9db0b0a516255a3d062fb960bbc99e60d8eb5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "97f22c8456ec99501c3eb4f86927b26c6aa50f658a5939fdc20234f1d376a6e0",
+                    "hash" : "0x97f22c8456ec99501c3eb4f86927b26c6aa50f658a5939fdc20234f1d376a6e0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x605a600053600160006001f0ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "53021"
+                "0xcf1d"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createInitOOGforCREATE.json b/GeneralStateTests/stCallCreateCallCodeTest/createInitOOGforCREATE.json
index d978f30bf..663e9adfa 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/createInitOOGforCREATE.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/createInitOOGforCREATE.json
@@ -1,17 +1,17 @@
 {
     "createInitOOGforCREATE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x05f5e100",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b61e4a95fae40806b0ddef0883479c3db70e79e019ab4260535560827525c00c",
+                    "hash" : "0xb61e4a95fae40806b0ddef0883479c3db70e79e019ab4260535560827525c00c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b61e4a95fae40806b0ddef0883479c3db70e79e019ab4260535560827525c00c",
+                    "hash" : "0xb61e4a95fae40806b0ddef0883479c3db70e79e019ab4260535560827525c00c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b61e4a95fae40806b0ddef0883479c3db70e79e019ab4260535560827525c00c",
+                    "hash" : "0xb61e4a95fae40806b0ddef0883479c3db70e79e019ab4260535560827525c00c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b61e4a95fae40806b0ddef0883479c3db70e79e019ab4260535560827525c00c",
+                    "hash" : "0xb61e4a95fae40806b0ddef0883479c3db70e79e019ab4260535560827525c00c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b61e4a95fae40806b0ddef0883479c3db70e79e019ab4260535560827525c00c",
+                    "hash" : "0xb61e4a95fae40806b0ddef0883479c3db70e79e019ab4260535560827525c00c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x605a600053600160006001f0ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "53020"
+                "0xcf1c"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createJS_ExampleContract.json b/GeneralStateTests/stCallCreateCallCodeTest/createJS_ExampleContract.json
index a814889b0..d03f062d5 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/createJS_ExampleContract.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/createJS_ExampleContract.json
@@ -1,17 +1,17 @@
 {
     "createJS_ExampleContract" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "79cec0dcf78cfc0ce36fa009677ea0e155d1e0b455e5293392d44d03fbd37b30",
+                    "hash" : "0x79cec0dcf78cfc0ce36fa009677ea0e155d1e0b455e5293392d44d03fbd37b30",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e2008905f4a23c83700e68796fcc26a6226605bab8ab75e382f3f4f133862667",
+                    "hash" : "0xe2008905f4a23c83700e68796fcc26a6226605bab8ab75e382f3f4f133862667",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a16625e1f3cb3713fcfa0d5160b6b09d3ce45c712f1a9650412e5aa54fe1998e",
+                    "hash" : "0xa16625e1f3cb3713fcfa0d5160b6b09d3ce45c712f1a9650412e5aa54fe1998e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "79cec0dcf78cfc0ce36fa009677ea0e155d1e0b455e5293392d44d03fbd37b30",
+                    "hash" : "0x79cec0dcf78cfc0ce36fa009677ea0e155d1e0b455e5293392d44d03fbd37b30",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e2008905f4a23c83700e68796fcc26a6226605bab8ab75e382f3f4f133862667",
+                    "hash" : "0xe2008905f4a23c83700e68796fcc26a6226605bab8ab75e382f3f4f133862667",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,7 +61,7 @@
             ]
         },
         "pre" : {
-            "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
                 "balance" : "0x0186a0",
                 "code" : "0x60003560e060020a9004806343d726d61461004257806391b7f5ed14610050578063d686f9ee14610061578063f5bade661461006f578063fcfff16f1461008057005b61004a6101de565b60006000f35b61005b6004356100bf565b60006000f35b610069610304565b60006000f35b61007a60043561008e565b60006000f35b6100886100f0565b60006000f35b600054600160a060020a031633600160a060020a031614156100af576100b4565b6100bc565b806001819055505b50565b600054600160a060020a031633600160a060020a031614156100e0576100e5565b6100ed565b806002819055505b50565b600054600160a060020a031633600160a060020a031614806101255750600354600160a060020a031633600160a060020a0316145b61012e57610161565b60016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a16101dc565b60045460011480610173575060015434105b6101b85760016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a142600581905550336003819055506101db565b33600160a060020a03166000346000600060006000848787f16101d757005b5050505b5b565b60006004546000146101ef576101f4565b610301565b600054600160a060020a031633600160a060020a031614801561022c5750600054600160a060020a0316600354600160a060020a0316145b61023557610242565b6000600481905550610301565b600354600160a060020a031633600160a060020a03161461026257610300565b600554420360025402905060015481116102c757600354600160a060020a0316600082600154036000600060006000848787f161029b57005b505050600054600160a060020a03166000826000600060006000848787f16102bf57005b5050506102ee565b600054600160a060020a031660006001546000600060006000848787f16102ea57005b5050505b60006004819055506000546003819055505b5b50565b6000600054600160a060020a031633600160a060020a031614156103275761032c565b61037e565b600554420360025402905060015481116103455761037d565b600054600160a060020a031660006001546000600060006000848787f161036857005b50505060006004819055506000546003819055505b5b5056",
                 "nonce" : "0x00",
@@ -73,9 +73,9 @@
                     "0x05" : "0x54c98c81"
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x09184e72a000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -86,14 +86,14 @@
                 "0x60406103ca600439600451602451336000819055506000600481905550816001819055508060028190555042600581905550336003819055505050610381806100496000396000f30060003560e060020a9004806343d726d61461004257806391b7f5ed14610050578063d686f9ee14610061578063f5bade661461006f578063fcfff16f1461008057005b61004a6101de565b60006000f35b61005b6004356100bf565b60006000f35b610069610304565b60006000f35b61007a60043561008e565b60006000f35b6100886100f0565b60006000f35b600054600160a060020a031633600160a060020a031614156100af576100b4565b6100bc565b806001819055505b50565b600054600160a060020a031633600160a060020a031614156100e0576100e5565b6100ed565b806002819055505b50565b600054600160a060020a031633600160a060020a031614806101255750600354600160a060020a031633600160a060020a0316145b61012e57610161565b60016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a16101dc565b60045460011480610173575060015434105b6101b85760016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a142600581905550336003819055506101db565b33600160a060020a03166000346000600060006000848787f16101d757005b5050505b5b565b60006004546000146101ef576101f4565b610301565b600054600160a060020a031633600160a060020a031614801561022c5750600054600160a060020a0316600354600160a060020a0316145b61023557610242565b6000600481905550610301565b600354600160a060020a031633600160a060020a03161461026257610300565b600554420360025402905060015481116102c757600354600160a060020a0316600082600154036000600060006000848787f161029b57005b505050600054600160a060020a03166000826000600060006000848787f16102bf57005b5050506102ee565b600054600160a060020a031660006001546000600060006000848787f16102ea57005b5050505b60006004819055506000546003819055505b5b50565b6000600054600160a060020a031633600160a060020a031614156103275761032c565b61037e565b600554420360025402905060015481116103455761037d565b600054600160a060020a031660006001546000600060006000848787f161036857005b50505060006004819055506000546003819055505b5b505600000000000000000000000000000000000000000000000000000000000000420000000000000000000000000000000000000000000000000000000000000023"
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createJS_NoCollision.json b/GeneralStateTests/stCallCreateCallCodeTest/createJS_NoCollision.json
index 8a98a182b..94f4be121 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/createJS_NoCollision.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/createJS_NoCollision.json
@@ -1,17 +1,17 @@
 {
     "createJS_NoCollision" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "2dcdc769bddc469d0eea04acebb4f082cd16bb90642264763c1f2efb4636f674",
+                    "hash" : "0x2dcdc769bddc469d0eea04acebb4f082cd16bb90642264763c1f2efb4636f674",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "8711293c80aa5a2ca90b9771b3ee453ec25a0c0799fa6aabcc09b427802880cc",
+                    "hash" : "0x8711293c80aa5a2ca90b9771b3ee453ec25a0c0799fa6aabcc09b427802880cc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e0974185f0c4317e900da502eddb5d6e5c5accbb8b98f7cb9e223cb054423b60",
+                    "hash" : "0xe0974185f0c4317e900da502eddb5d6e5c5accbb8b98f7cb9e223cb054423b60",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "2dcdc769bddc469d0eea04acebb4f082cd16bb90642264763c1f2efb4636f674",
+                    "hash" : "0x2dcdc769bddc469d0eea04acebb4f082cd16bb90642264763c1f2efb4636f674",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "8711293c80aa5a2ca90b9771b3ee453ec25a0c0799fa6aabcc09b427802880cc",
+                    "hash" : "0x8711293c80aa5a2ca90b9771b3ee453ec25a0c0799fa6aabcc09b427802880cc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x09184e72a000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -74,14 +74,14 @@
                 "0x60406103ca600439600451602451336000819055506000600481905550816001819055508060028190555042600581905550336003819055505050610381806100496000396000f30060003560e060020a9004806343d726d61461004257806391b7f5ed14610050578063d686f9ee14610061578063f5bade661461006f578063fcfff16f1461008057005b61004a6101de565b60006000f35b61005b6004356100bf565b60006000f35b610069610304565b60006000f35b61007a60043561008e565b60006000f35b6100886100f0565b60006000f35b600054600160a060020a031633600160a060020a031614156100af576100b4565b6100bc565b806001819055505b50565b600054600160a060020a031633600160a060020a031614156100e0576100e5565b6100ed565b806002819055505b50565b600054600160a060020a031633600160a060020a031614806101255750600354600160a060020a031633600160a060020a0316145b61012e57610161565b60016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a16101dc565b60045460011480610173575060015434105b6101b85760016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a142600581905550336003819055506101db565b33600160a060020a03166000346000600060006000848787f16101d757005b5050505b5b565b60006004546000146101ef576101f4565b610301565b600054600160a060020a031633600160a060020a031614801561022c5750600054600160a060020a0316600354600160a060020a0316145b61023557610242565b6000600481905550610301565b600354600160a060020a031633600160a060020a03161461026257610300565b600554420360025402905060015481116102c757600354600160a060020a0316600082600154036000600060006000848787f161029b57005b505050600054600160a060020a03166000826000600060006000848787f16102bf57005b5050506102ee565b600054600160a060020a031660006001546000600060006000848787f16102ea57005b5050505b60006004819055506000546003819055505b5b50565b6000600054600160a060020a031633600160a060020a031614156103275761032c565b61037e565b600554420360025402905060015481116103455761037d565b600054600160a060020a031660006001546000600060006000848787f161036857005b50505060006004819055506000546003819055505b5b505600000000000000000000000000000000000000000000000000000000000000420000000000000000000000000000000000000000000000000000000000000023"
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxs.json b/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxs.json
index 4e49bb9f4..7b48f1ee2 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxs.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxs.json
@@ -1,17 +1,17 @@
 {
     "createNameRegistratorPerTxs" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x02540be400",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a8d7d1b8699bdceade31abacca281e2570461a3083f2767cbaad1ed08581cf2b",
+                    "hash" : "0xa8d7d1b8699bdceade31abacca281e2570461a3083f2767cbaad1ed08581cf2b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "90fb2086df06776e9e04c413551df4b1aafcaeda3b3c5e754e16e65f75671bde",
+                    "hash" : "0x90fb2086df06776e9e04c413551df4b1aafcaeda3b3c5e754e16e65f75671bde",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e0911f5b8035d9192581b3a82ddb0a32955e880088c49e92936789be2310ef90",
+                    "hash" : "0xe0911f5b8035d9192581b3a82ddb0a32955e880088c49e92936789be2310ef90",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a8d7d1b8699bdceade31abacca281e2570461a3083f2767cbaad1ed08581cf2b",
+                    "hash" : "0xa8d7d1b8699bdceade31abacca281e2570461a3083f2767cbaad1ed08581cf2b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "90fb2086df06776e9e04c413551df4b1aafcaeda3b3c5e754e16e65f75671bde",
+                    "hash" : "0x90fb2086df06776e9e04c413551df4b1aafcaeda3b3c5e754e16e65f75671bde",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -78,10 +78,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGas.json b/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGas.json
index 332336f77..6966f3ff6 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGas.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGas.json
@@ -1,17 +1,17 @@
 {
     "createNameRegistratorPerTxsNotEnoughGas" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x02540be400",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
+                    "hash" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
+                    "hash" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -29,7 +29,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
+                    "hash" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -37,7 +37,7 @@
                     }
                 },
                 {
-                    "hash" : "517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
+                    "hash" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -47,7 +47,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
+                    "hash" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -55,7 +55,7 @@
                     }
                 },
                 {
-                    "hash" : "6dcd1874a8295fa628ca7c100e9fa6248e74b92afd9a7b8511879078dfc2f007",
+                    "hash" : "0x6dcd1874a8295fa628ca7c100e9fa6248e74b92afd9a7b8511879078dfc2f007",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -65,7 +65,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
+                    "hash" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -73,7 +73,7 @@
                     }
                 },
                 {
-                    "hash" : "517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
+                    "hash" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -83,7 +83,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
+                    "hash" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -91,7 +91,7 @@
                     }
                 },
                 {
-                    "hash" : "517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
+                    "hash" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -101,9 +101,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -119,10 +119,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPreStore1NotEnoughGas.json b/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPreStore1NotEnoughGas.json
index a3b60c3d8..650853285 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPreStore1NotEnoughGas.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPreStore1NotEnoughGas.json
@@ -1,17 +1,17 @@
 {
     "createNameRegistratorPreStore1NotEnoughGas" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x05f5e100",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "223d9667daa515577a93dc04cdd41a803c9c2529628009ed68b8f73efb87872e",
+                    "hash" : "0x223d9667daa515577a93dc04cdd41a803c9c2529628009ed68b8f73efb87872e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "223d9667daa515577a93dc04cdd41a803c9c2529628009ed68b8f73efb87872e",
+                    "hash" : "0x223d9667daa515577a93dc04cdd41a803c9c2529628009ed68b8f73efb87872e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3e4b203d9a716a8209c2af59c485f3c1e5bb7b97d482313676dcd64410ed6563",
+                    "hash" : "0x3e4b203d9a716a8209c2af59c485f3c1e5bb7b97d482313676dcd64410ed6563",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3e4b203d9a716a8209c2af59c485f3c1e5bb7b97d482313676dcd64410ed6563",
+                    "hash" : "0x3e4b203d9a716a8209c2af59c485f3c1e5bb7b97d482313676dcd64410ed6563",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "223d9667daa515577a93dc04cdd41a803c9c2529628009ed68b8f73efb87872e",
+                    "hash" : "0x223d9667daa515577a93dc04cdd41a803c9c2529628009ed68b8f73efb87872e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f6001600155601080600c6000396000f3006000355415600957005b602035600060005260356020536055602153602260006017f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "73071"
+                "0x011d6f"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorendowmentTooHigh.json b/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorendowmentTooHigh.json
index eb4d120fc..2a63b23a6 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorendowmentTooHigh.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorendowmentTooHigh.json
@@ -1,17 +1,17 @@
 {
     "createNameRegistratorendowmentTooHigh" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "cf37f045166beaaa2736f2d25cb253fec658f8a33529d2bdee8a8ae8342685c6",
+                    "hash" : "0xcf37f045166beaaa2736f2d25cb253fec658f8a33529d2bdee8a8ae8342685c6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "cf37f045166beaaa2736f2d25cb253fec658f8a33529d2bdee8a8ae8342685c6",
+                    "hash" : "0xcf37f045166beaaa2736f2d25cb253fec658f8a33529d2bdee8a8ae8342685c6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "cf37f045166beaaa2736f2d25cb253fec658f8a33529d2bdee8a8ae8342685c6",
+                    "hash" : "0xcf37f045166beaaa2736f2d25cb253fec658f8a33529d2bdee8a8ae8342685c6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "cf37f045166beaaa2736f2d25cb253fec658f8a33529d2bdee8a8ae8342685c6",
+                    "hash" : "0xcf37f045166beaaa2736f2d25cb253fec658f8a33529d2bdee8a8ae8342685c6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "cf37f045166beaaa2736f2d25cb253fec658f8a33529d2bdee8a8ae8342685c6",
+                    "hash" : "0xcf37f045166beaaa2736f2d25cb253fec658f8a33529d2bdee8a8ae8342685c6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7c601080600c6000396000f3006000355415600957005b60203560003555600052601d6003670de0b6b3a7640001f0600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "300000"
+                "0x0493e0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001.json
index 24f35d1a0..7d6a3cc9f 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001.json
@@ -1,17 +1,17 @@
 {
     "callcallcallcode_001" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "76b5f8584be3e265db1cb00ec75e9222d08221b9df73138094c698fa2ecf6807",
+                    "hash" : "0x76b5f8584be3e265db1cb00ec75e9222d08221b9df73138094c698fa2ecf6807",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "76b5f8584be3e265db1cb00ec75e9222d08221b9df73138094c698fa2ecf6807",
+                    "hash" : "0x76b5f8584be3e265db1cb00ec75e9222d08221b9df73138094c698fa2ecf6807",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4b4dd8277a751c3b68f63e63e99aedcac6e14ed41912e6ded7fe18226b0d1cea",
+                    "hash" : "0x4b4dd8277a751c3b68f63e63e99aedcac6e14ed41912e6ded7fe18226b0d1cea",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c3a1d582d201a1e0bec05b10a62eed64cabe23531ac87e33c8a2ac563910104e",
+                    "hash" : "0xc3a1d582d201a1e0bec05b10a62eed64cabe23531ac87e33c8a2ac563910104e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "76b5f8584be3e265db1cb00ec75e9222d08221b9df73138094c698fa2ecf6807",
+                    "hash" : "0x76b5f8584be3e265db1cb00ec75e9222d08221b9df73138094c698fa2ecf6807",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060007310000000000000000000000000000000000000036203d090f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346005553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGE.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGE.json
index 969b028d2..5bb5f5d45 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGE.json
@@ -1,17 +1,17 @@
 {
     "callcallcallcode_001_OOGE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "27fd103b518e62155f72dc94bc3fd4a5828f3b0e50e8214d565da908bc6d6eae",
+                    "hash" : "0x27fd103b518e62155f72dc94bc3fd4a5828f3b0e50e8214d565da908bc6d6eae",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "27fd103b518e62155f72dc94bc3fd4a5828f3b0e50e8214d565da908bc6d6eae",
+                    "hash" : "0x27fd103b518e62155f72dc94bc3fd4a5828f3b0e50e8214d565da908bc6d6eae",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "8bfd99232c43915d3204298146dee2dab5be51559b9e2464ecc9b018c91cd998",
+                    "hash" : "0x8bfd99232c43915d3204298146dee2dab5be51559b9e2464ecc9b018c91cd998",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e2999ab775829c7a7f1e781bdc6f396daeb7b809b4bebd3471b251d136a4e83e",
+                    "hash" : "0xe2999ab775829c7a7f1e781bdc6f396daeb7b809b4bebd3471b251d136a4e83e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "27fd103b518e62155f72dc94bc3fd4a5828f3b0e50e8214d565da908bc6d6eae",
+                    "hash" : "0x27fd103b518e62155f72dc94bc3fd4a5828f3b0e50e8214d565da908bc6d6eae",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMAfter.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMAfter.json
index fe5ba9ff9..704a880a8 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMAfter.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMAfter.json
@@ -1,17 +1,17 @@
 {
     "callcallcallcode_001_OOGMAfter" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a17df9238a8f84b1d45abbf2608ef80e5dcd07de0c8dd2bbcf98ca21db99753c",
+                    "hash" : "0xa17df9238a8f84b1d45abbf2608ef80e5dcd07de0c8dd2bbcf98ca21db99753c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a17df9238a8f84b1d45abbf2608ef80e5dcd07de0c8dd2bbcf98ca21db99753c",
+                    "hash" : "0xa17df9238a8f84b1d45abbf2608ef80e5dcd07de0c8dd2bbcf98ca21db99753c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "59f3975264b93f4097b183f9ed5dfda26667e2feb0ef6c0938dd9f49e97fdbdc",
+                    "hash" : "0x59f3975264b93f4097b183f9ed5dfda26667e2feb0ef6c0938dd9f49e97fdbdc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ef211f7b041d3ef77a8575136a6364fd7ec5975ec2fedac3668d61ed1d9ff93e",
+                    "hash" : "0xef211f7b041d3ef77a8575136a6364fd7ec5975ec2fedac3668d61ed1d9ff93e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a17df9238a8f84b1d45abbf2608ef80e5dcd07de0c8dd2bbcf98ca21db99753c",
+                    "hash" : "0xa17df9238a8f84b1d45abbf2608ef80e5dcd07de0c8dd2bbcf98ca21db99753c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf7f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c89f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMBefore.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMBefore.json
index 6c52abfc0..575761318 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMBefore.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMBefore.json
@@ -1,17 +1,17 @@
 {
     "callcallcallcode_001_OOGMBefore" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "fa8ea8b5f31fcbe1671779794d1a8f40ac5e17c80bd2fc238a0aebd64a08459e",
+                    "hash" : "0xfa8ea8b5f31fcbe1671779794d1a8f40ac5e17c80bd2fc238a0aebd64a08459e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "fa8ea8b5f31fcbe1671779794d1a8f40ac5e17c80bd2fc238a0aebd64a08459e",
+                    "hash" : "0xfa8ea8b5f31fcbe1671779794d1a8f40ac5e17c80bd2fc238a0aebd64a08459e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "89756fb72b4debba20c92e7af6fd5d37923614fdc071135f7f4f493c927e298a",
+                    "hash" : "0x89756fb72b4debba20c92e7af6fd5d37923614fdc071135f7f4f493c927e298a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "89756fb72b4debba20c92e7af6fd5d37923614fdc071135f7f4f493c927e298a",
+                    "hash" : "0x89756fb72b4debba20c92e7af6fd5d37923614fdc071135f7f4f493c927e298a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "fa8ea8b5f31fcbe1671779794d1a8f40ac5e17c80bd2fc238a0aebd64a08459e",
+                    "hash" : "0xfa8ea8b5f31fcbe1671779794d1a8f40ac5e17c80bd2fc238a0aebd64a08459e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf7f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c89f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016003526040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideEnd.json
index 257a96a1d..0de27cb07 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideEnd.json
@@ -1,17 +1,17 @@
 {
     "callcallcallcode_001_SuicideEnd" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d0b64ffa7b6b20189b5b8ddfcac6f7751e2db9e5a6319289e8393360b399ef3a",
+                    "hash" : "0xd0b64ffa7b6b20189b5b8ddfcac6f7751e2db9e5a6319289e8393360b399ef3a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d0b64ffa7b6b20189b5b8ddfcac6f7751e2db9e5a6319289e8393360b399ef3a",
+                    "hash" : "0xd0b64ffa7b6b20189b5b8ddfcac6f7751e2db9e5a6319289e8393360b399ef3a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "0c880ada7adb2626c08ab5449f60489e1ed272c19de0d44092962f366644995f",
+                    "hash" : "0x0c880ada7adb2626c08ab5449f60489e1ed272c19de0d44092962f366644995f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "518b1641c608b5dc5be73761b5d874d44bbfe4c94feeb583712412d671f723ca",
+                    "hash" : "0x518b1641c608b5dc5be73761b5d874d44bbfe4c94feeb583712412d671f723ca",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d0b64ffa7b6b20189b5b8ddfcac6f7751e2db9e5a6319289e8393360b399ef3a",
+                    "hash" : "0xd0b64ffa7b6b20189b5b8ddfcac6f7751e2db9e5a6319289e8393360b399ef3a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000361c350f4600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideMiddle.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideMiddle.json
index 5859394f3..3359c61a5 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideMiddle.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideMiddle.json
@@ -1,17 +1,17 @@
 {
     "callcallcallcode_001_SuicideMiddle" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a51747e748e57a4f6d3e84a46e4f825ceb03683bb1362f0bea5624ab95fc9a0b",
+                    "hash" : "0xc9a2ccedb4f169e460684909680e9147dda2b46474e9bf8d24c65b6e8cde4522",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a51747e748e57a4f6d3e84a46e4f825ceb03683bb1362f0bea5624ab95fc9a0b",
+                    "hash" : "0xc9a2ccedb4f169e460684909680e9147dda2b46474e9bf8d24c65b6e8cde4522",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a03cdf60951182740c85f38e0678fad1592319eacbfbae5fdafa742e0753a9c6",
+                    "hash" : "0xddf1a3d22daf33c4a641fdf43b83399fbcbeaf8532792161e2e0fb0638640ad0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a03cdf60951182740c85f38e0678fad1592319eacbfbae5fdafa742e0753a9c6",
+                    "hash" : "0xddf1a3d22daf33c4a641fdf43b83399fbcbeaf8532792161e2e0fb0638640ad0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a51747e748e57a4f6d3e84a46e4f825ceb03683bb1362f0bea5624ab95fc9a0b",
+                    "hash" : "0xc9a2ccedb4f169e460684909680e9147dda2b46474e9bf8d24c65b6e8cde4522",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff604060006040600073100000000000000000000000000000000000000361c350f4600255",
+                "code" : "0x731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_ABCB_RECURSIVE.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_ABCB_RECURSIVE.json
index ff9a87a5b..d79b3c08c 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_ABCB_RECURSIVE.json
@@ -1,17 +1,17 @@
 {
     "callcallcallcode_ABCB_RECURSIVE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0xb2d05e00",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "00aefdf2557f665cdb2328e30a9e703985b5c427ad9a24e111b9bd36b8c73571",
+                    "hash" : "0x00aefdf2557f665cdb2328e30a9e703985b5c427ad9a24e111b9bd36b8c73571",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "00aefdf2557f665cdb2328e30a9e703985b5c427ad9a24e111b9bd36b8c73571",
+                    "hash" : "0x00aefdf2557f665cdb2328e30a9e703985b5c427ad9a24e111b9bd36b8c73571",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "57f5cb02223fc5088ccf1424e7f6580dbf33736871eb6e21dbe935a25cb8fcce",
+                    "hash" : "0x57f5cb02223fc5088ccf1424e7f6580dbf33736871eb6e21dbe935a25cb8fcce",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4147efecb96df3d57d5ca561c9c2d56d454908d62cdfcce7eaeecc06f674a15c",
+                    "hash" : "0x4147efecb96df3d57d5ca561c9c2d56d454908d62cdfcce7eaeecc06f674a15c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "00aefdf2557f665cdb2328e30a9e703985b5c427ad9a24e111b9bd36b8c73571",
+                    "hash" : "0x00aefdf2557f665cdb2328e30a9e703985b5c427ad9a24e111b9bd36b8c73571",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060007310000000000000000000000000000000000000016207a120f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "0x01c9c380"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcode_01.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcode_01.json
index 431c0d743..40599077b 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcode_01.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcode_01.json
@@ -1,17 +1,17 @@
 {
     "callcallcode_01" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "2565cba5a627c072ece8ca1b220e2881bf20c4b8ee5197e71cc8f2143cca2ad8",
+                    "hash" : "0x2565cba5a627c072ece8ca1b220e2881bf20c4b8ee5197e71cc8f2143cca2ad8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "2565cba5a627c072ece8ca1b220e2881bf20c4b8ee5197e71cc8f2143cca2ad8",
+                    "hash" : "0x2565cba5a627c072ece8ca1b220e2881bf20c4b8ee5197e71cc8f2143cca2ad8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9969d29090f0acdfc1d3d449fa4f0137fdfed134326a87a18c8a5c7f9e51db6e",
+                    "hash" : "0x9969d29090f0acdfc1d3d449fa4f0137fdfed134326a87a18c8a5c7f9e51db6e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "bf3420a5296914baaea4264444382a16cefed59df3ea7a4e578fe145165c8462",
+                    "hash" : "0xbf3420a5296914baaea4264444382a16cefed59df3ea7a4e578fe145165c8462",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "2565cba5a627c072ece8ca1b220e2881bf20c4b8ee5197e71cc8f2143cca2ad8",
+                    "hash" : "0x2565cba5a627c072ece8ca1b220e2881bf20c4b8ee5197e71cc8f2143cca2ad8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060007310000000000000000000000000000000000000026203d090f4600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160025533600455346005553060e6553260e8553660ec553860ee553a60f055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcode_01_OOGE.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcode_01_OOGE.json
index 5f0890412..dd298c33a 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcode_01_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcode_01_OOGE.json
@@ -1,17 +1,17 @@
 {
     "callcallcode_01_OOGE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "cba87c3ca6dea43accecde7d7bb6869168172533bb2cdcf6675d898d7d20bd19",
+                    "hash" : "0xcba87c3ca6dea43accecde7d7bb6869168172533bb2cdcf6675d898d7d20bd19",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "cba87c3ca6dea43accecde7d7bb6869168172533bb2cdcf6675d898d7d20bd19",
+                    "hash" : "0xcba87c3ca6dea43accecde7d7bb6869168172533bb2cdcf6675d898d7d20bd19",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "d6e92f864b605abedc77221dba97086bae3856df17aa9ebc605a4ea47e1ccbad",
+                    "hash" : "0xd6e92f864b605abedc77221dba97086bae3856df17aa9ebc605a4ea47e1ccbad",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "1488e41eb05d14faacd98ac3721273e5204dfe898b810c67bc0a95ef957bf19c",
+                    "hash" : "0x1488e41eb05d14faacd98ac3721273e5204dfe898b810c67bc0a95ef957bf19c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "cba87c3ca6dea43accecde7d7bb6869168172533bb2cdcf6675d898d7d20bd19",
+                    "hash" : "0xcba87c3ca6dea43accecde7d7bb6869168172533bb2cdcf6675d898d7d20bd19",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaa8f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002614e34f4600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016002556001600252",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcode_01_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcode_01_SuicideEnd.json
index 4eb17e206..6b6d1a465 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcode_01_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcode_01_SuicideEnd.json
@@ -1,17 +1,17 @@
 {
     "callcallcode_01_SuicideEnd" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6cdabb1d1e4e89cc6c0a89463dabb952b94a2384c251bb1e3cd14766a39af351",
+                    "hash" : "0x6cdabb1d1e4e89cc6c0a89463dabb952b94a2384c251bb1e3cd14766a39af351",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6cdabb1d1e4e89cc6c0a89463dabb952b94a2384c251bb1e3cd14766a39af351",
+                    "hash" : "0x6cdabb1d1e4e89cc6c0a89463dabb952b94a2384c251bb1e3cd14766a39af351",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9ef2bba4092f8640ce36e2a2a7255edcd055bd777d40b8112efba66fdfb85b7e",
+                    "hash" : "0x9ef2bba4092f8640ce36e2a2a7255edcd055bd777d40b8112efba66fdfb85b7e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "0cf1cd9a7849fc8458041e8a5b61de5a0f216cb46d7ddd81150adf71cc020b17",
+                    "hash" : "0x0cf1cd9a7849fc8458041e8a5b61de5a0f216cb46d7ddd81150adf71cc020b17",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6cdabb1d1e4e89cc6c0a89463dabb952b94a2384c251bb1e3cd14766a39af351",
+                    "hash" : "0x6cdabb1d1e4e89cc6c0a89463dabb952b94a2384c251bb1e3cd14766a39af351",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000261c350f4600155731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010.json
index 9c2124355..caa065b2a 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010.json
@@ -1,17 +1,17 @@
 {
     "callcallcodecall_010" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a0f23a81222fb5355119b536185264b63eec497f08529bffafaa233ed0a4788b",
+                    "hash" : "0xa0f23a81222fb5355119b536185264b63eec497f08529bffafaa233ed0a4788b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a0f23a81222fb5355119b536185264b63eec497f08529bffafaa233ed0a4788b",
+                    "hash" : "0xa0f23a81222fb5355119b536185264b63eec497f08529bffafaa233ed0a4788b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "c734fb74138bf68c4ba9168cfeb17463b0edd6bbcdd10279e910280127628249",
+                    "hash" : "0xc734fb74138bf68c4ba9168cfeb17463b0edd6bbcdd10279e910280127628249",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "7ea720933b432c49edbd0fc898ad77183180145720148227884ecebc0bb1dc7b",
+                    "hash" : "0x7ea720933b432c49edbd0fc898ad77183180145720148227884ecebc0bb1dc7b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a0f23a81222fb5355119b536185264b63eec497f08529bffafaa233ed0a4788b",
+                    "hash" : "0xa0f23a81222fb5355119b536185264b63eec497f08529bffafaa233ed0a4788b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002620493e0f4600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060027310000000000000000000000000000000000000036203d090f260025533600555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346006553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGE.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGE.json
index 420d8227d..bcae4f1fc 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGE.json
@@ -1,17 +1,17 @@
 {
     "callcallcodecall_010_OOGE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "df6cbac7fc17feddb3bf7f923d12b5ce81e25ab70dcac2f31c4038cd16fd4c71",
+                    "hash" : "0xdf6cbac7fc17feddb3bf7f923d12b5ce81e25ab70dcac2f31c4038cd16fd4c71",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "df6cbac7fc17feddb3bf7f923d12b5ce81e25ab70dcac2f31c4038cd16fd4c71",
+                    "hash" : "0xdf6cbac7fc17feddb3bf7f923d12b5ce81e25ab70dcac2f31c4038cd16fd4c71",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "1ef2aeaaf97a680b1facf49a4eeb975af2f064af0cfc0247456a9fa728299599",
+                    "hash" : "0x1ef2aeaaf97a680b1facf49a4eeb975af2f064af0cfc0247456a9fa728299599",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f764a37a456d088da38d0cb216679fd7d98e25ef701d7b43045450017d343dcf",
+                    "hash" : "0xf764a37a456d088da38d0cb216679fd7d98e25ef701d7b43045450017d343dcf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "df6cbac7fc17feddb3bf7f923d12b5ce81e25ab70dcac2f31c4038cd16fd4c71",
+                    "hash" : "0xdf6cbac7fc17feddb3bf7f923d12b5ce81e25ab70dcac2f31c4038cd16fd4c71",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMAfter.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMAfter.json
index fbabe85e5..6a1b935f8 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMAfter.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMAfter.json
@@ -1,17 +1,17 @@
 {
     "callcallcodecall_010_OOGMAfter" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "de101ef70f3ec3b41bfbc894ed9af86d9f1e28b95d30fba017aeb5f5fbda601b",
+                    "hash" : "0xde101ef70f3ec3b41bfbc894ed9af86d9f1e28b95d30fba017aeb5f5fbda601b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "de101ef70f3ec3b41bfbc894ed9af86d9f1e28b95d30fba017aeb5f5fbda601b",
+                    "hash" : "0xde101ef70f3ec3b41bfbc894ed9af86d9f1e28b95d30fba017aeb5f5fbda601b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "dd76ee8ba39a7071c313c6482b98e2db641023bf18a796e77cf2eb4758a18549",
+                    "hash" : "0xdd76ee8ba39a7071c313c6482b98e2db641023bf18a796e77cf2eb4758a18549",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "dd76ee8ba39a7071c313c6482b98e2db641023bf18a796e77cf2eb4758a18549",
+                    "hash" : "0xdd76ee8ba39a7071c313c6482b98e2db641023bf18a796e77cf2eb4758a18549",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "de101ef70f3ec3b41bfbc894ed9af86d9f1e28b95d30fba017aeb5f5fbda601b",
+                    "hash" : "0xde101ef70f3ec3b41bfbc894ed9af86d9f1e28b95d30fba017aeb5f5fbda601b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf7f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c8df46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMBefore.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMBefore.json
index 6af5a294d..2f05ab8fb 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMBefore.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMBefore.json
@@ -1,17 +1,17 @@
 {
     "callcallcodecall_010_OOGMBefore" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1e925d4e5f55bb8978bb79f00fe154b6783cbe3f7c86ce73a81b3ddc6632e2bd",
+                    "hash" : "0x1e925d4e5f55bb8978bb79f00fe154b6783cbe3f7c86ce73a81b3ddc6632e2bd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "1e925d4e5f55bb8978bb79f00fe154b6783cbe3f7c86ce73a81b3ddc6632e2bd",
+                    "hash" : "0x1e925d4e5f55bb8978bb79f00fe154b6783cbe3f7c86ce73a81b3ddc6632e2bd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3f9173190b1d98b598134751fcbd26bf8bc1a1c84adb5a52367fe481604f709a",
+                    "hash" : "0x3f9173190b1d98b598134751fcbd26bf8bc1a1c84adb5a52367fe481604f709a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "21ffc10aa60a9578527ffd543d69ebacb5cff9f39cdbe70a1c89b8ce14b45f5a",
+                    "hash" : "0x21ffc10aa60a9578527ffd543d69ebacb5cff9f39cdbe70a1c89b8ce14b45f5a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "1e925d4e5f55bb8978bb79f00fe154b6783cbe3f7c86ce73a81b3ddc6632e2bd",
+                    "hash" : "0x1e925d4e5f55bb8978bb79f00fe154b6783cbe3f7c86ce73a81b3ddc6632e2bd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000162011206f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c94f4600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideEnd.json
index 24d4945f4..a7c4cb4fb 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideEnd.json
@@ -1,17 +1,17 @@
 {
     "callcallcodecall_010_SuicideEnd" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "14f76494a1acee67b8abc22aafd236664aa063bc57fcdc806369965bd9d636ab",
+                    "hash" : "0x14f76494a1acee67b8abc22aafd236664aa063bc57fcdc806369965bd9d636ab",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "14f76494a1acee67b8abc22aafd236664aa063bc57fcdc806369965bd9d636ab",
+                    "hash" : "0x14f76494a1acee67b8abc22aafd236664aa063bc57fcdc806369965bd9d636ab",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "53d9ec0ba038f05b87797047791541f6b68d6902dd84e917a9cc1358190873e1",
+                    "hash" : "0x53d9ec0ba038f05b87797047791541f6b68d6902dd84e917a9cc1358190873e1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ca62c6b192b47460c49bcc57dd6a0f6b7d853e0943a322d21aac4031061b241e",
+                    "hash" : "0xca62c6b192b47460c49bcc57dd6a0f6b7d853e0943a322d21aac4031061b241e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "14f76494a1acee67b8abc22aafd236664aa063bc57fcdc806369965bd9d636ab",
+                    "hash" : "0x14f76494a1acee67b8abc22aafd236664aa063bc57fcdc806369965bd9d636ab",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideMiddle.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideMiddle.json
index 68921b265..7317f8a5c 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideMiddle.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideMiddle.json
@@ -1,17 +1,17 @@
 {
     "callcallcodecall_010_SuicideMiddle" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "05e1d37f28828fccbcacb2f3b4b56d50a7ec608a868e7aae44c3e73fe782b13f",
+                    "hash" : "0x0790915f009aad54c0077bb9142d9d262b9ae250515a4b382218b6aea2b14c18",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "05e1d37f28828fccbcacb2f3b4b56d50a7ec608a868e7aae44c3e73fe782b13f",
+                    "hash" : "0x0790915f009aad54c0077bb9142d9d262b9ae250515a4b382218b6aea2b14c18",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "afce89ba5ad9724841bea52b8c51db50128129e7a1c455fe50da46af00e7ddd8",
+                    "hash" : "0x6d21e47580c9b8a9622c64cf98eff46fb9dfa0a5228ae511acb6c0a5caacd2b8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c8a3ad55598b5fdf76bf6389c2ac3b57c7e28cb94a3ff1843820f52990748d18",
+                    "hash" : "0x6b0e71c38986244674302f43b4e100b7b48c1e0fbf4da59aad11f4fe871295b1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "05e1d37f28828fccbcacb2f3b4b56d50a7ec608a868e7aae44c3e73fe782b13f",
+                    "hash" : "0x0790915f009aad54c0077bb9142d9d262b9ae250515a4b382218b6aea2b14c18",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f2600255",
+                "code" : "0x731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_ABCB_RECURSIVE.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_ABCB_RECURSIVE.json
index 7a9de03ae..47aedbb84 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_ABCB_RECURSIVE.json
@@ -1,17 +1,17 @@
 {
     "callcallcodecall_ABCB_RECURSIVE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0xb2d05e00",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9a91ed9259c40134fc63ee43e31838c34c278097e0444d41205c7b2e1d6dee61",
+                    "hash" : "0x9a91ed9259c40134fc63ee43e31838c34c278097e0444d41205c7b2e1d6dee61",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9a91ed9259c40134fc63ee43e31838c34c278097e0444d41205c7b2e1d6dee61",
+                    "hash" : "0x9a91ed9259c40134fc63ee43e31838c34c278097e0444d41205c7b2e1d6dee61",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "fce8a4c134d08c91c07360181a10147fae16719e4601b046fd42f08af898e2bf",
+                    "hash" : "0xfce8a4c134d08c91c07360181a10147fae16719e4601b046fd42f08af898e2bf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ee3561b235b4068db77139423e4c0924089edef1c0d6a2fee982ab56be33d0a5",
+                    "hash" : "0xee3561b235b4068db77139423e4c0924089edef1c0d6a2fee982ab56be33d0a5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9a91ed9259c40134fc63ee43e31838c34c278097e0444d41205c7b2e1d6dee61",
+                    "hash" : "0x9a91ed9259c40134fc63ee43e31838c34c278097e0444d41205c7b2e1d6dee61",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002620f4240f4600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "0x01c9c380"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011.json
index 0e6f09536..9e240d656 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011.json
@@ -1,17 +1,17 @@
 {
     "callcallcodecallcode_011" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a76cb747cf1f203265688de53807caeba3a997ddbef949753236eb7b8d9af62d",
+                    "hash" : "0xa76cb747cf1f203265688de53807caeba3a997ddbef949753236eb7b8d9af62d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a76cb747cf1f203265688de53807caeba3a997ddbef949753236eb7b8d9af62d",
+                    "hash" : "0xa76cb747cf1f203265688de53807caeba3a997ddbef949753236eb7b8d9af62d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f7761ec943b56776102dc01050059bfca1c3b842d68e09f484a0e98d45a28033",
+                    "hash" : "0xf7761ec943b56776102dc01050059bfca1c3b842d68e09f484a0e98d45a28033",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ed05a91aa638e472c45034ad455b0bd7279c2316e7bd69bf1fbc5f311dc6c785",
+                    "hash" : "0xed05a91aa638e472c45034ad455b0bd7279c2316e7bd69bf1fbc5f311dc6c785",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a76cb747cf1f203265688de53807caeba3a997ddbef949753236eb7b8d9af62d",
+                    "hash" : "0xa76cb747cf1f203265688de53807caeba3a997ddbef949753236eb7b8d9af62d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002620493e0f4600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000362030d40f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346006553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGE.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGE.json
index 1e61d835f..33a4ff575 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGE.json
@@ -1,17 +1,17 @@
 {
     "callcallcodecallcode_011_OOGE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "22145358b2fc36dd15d6e6ec01f466be5b153616d93a8fa37262d0e5bd32ce71",
+                    "hash" : "0x22145358b2fc36dd15d6e6ec01f466be5b153616d93a8fa37262d0e5bd32ce71",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "22145358b2fc36dd15d6e6ec01f466be5b153616d93a8fa37262d0e5bd32ce71",
+                    "hash" : "0x22145358b2fc36dd15d6e6ec01f466be5b153616d93a8fa37262d0e5bd32ce71",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "19234d55fac3e6bf9b077f71f9da732f807b689401bbbc96f705ade59d84db12",
+                    "hash" : "0x19234d55fac3e6bf9b077f71f9da732f807b689401bbbc96f705ade59d84db12",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5ca0140fdbcc77fd2d4e5cb5094d9d7857245569ef7d3caaae6537a7ca4d2c69",
+                    "hash" : "0x5ca0140fdbcc77fd2d4e5cb5094d9d7857245569ef7d3caaae6537a7ca4d2c69",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "22145358b2fc36dd15d6e6ec01f466be5b153616d93a8fa37262d0e5bd32ce71",
+                    "hash" : "0x22145358b2fc36dd15d6e6ec01f466be5b153616d93a8fa37262d0e5bd32ce71",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMAfter.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMAfter.json
index 3cfcbfb4c..534229d32 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMAfter.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMAfter.json
@@ -1,17 +1,17 @@
 {
     "callcallcodecallcode_011_OOGMAfter" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "2026f1fd527a64566ff84ec9ec0a5b0fe32e86a96055762ad278bcc761d7dc0f",
+                    "hash" : "0x2026f1fd527a64566ff84ec9ec0a5b0fe32e86a96055762ad278bcc761d7dc0f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "2026f1fd527a64566ff84ec9ec0a5b0fe32e86a96055762ad278bcc761d7dc0f",
+                    "hash" : "0x2026f1fd527a64566ff84ec9ec0a5b0fe32e86a96055762ad278bcc761d7dc0f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e42eebbc9e79bdfd97d94f2c4d03b9cad5bb7f41ea1a0a2e109ecc4fff9e5787",
+                    "hash" : "0xe42eebbc9e79bdfd97d94f2c4d03b9cad5bb7f41ea1a0a2e109ecc4fff9e5787",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e42eebbc9e79bdfd97d94f2c4d03b9cad5bb7f41ea1a0a2e109ecc4fff9e5787",
+                    "hash" : "0xe42eebbc9e79bdfd97d94f2c4d03b9cad5bb7f41ea1a0a2e109ecc4fff9e5787",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "2026f1fd527a64566ff84ec9ec0a5b0fe32e86a96055762ad278bcc761d7dc0f",
+                    "hash" : "0x2026f1fd527a64566ff84ec9ec0a5b0fe32e86a96055762ad278bcc761d7dc0f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf1f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000261c350f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMBefore.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMBefore.json
index f48a9bbe3..526147bf2 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMBefore.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMBefore.json
@@ -1,17 +1,17 @@
 {
     "callcallcodecallcode_011_OOGMBefore" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f2a3d3622932fbceeba665a47e9bfdbd5610bcde67cb98acb802a283ca706fa2",
+                    "hash" : "0xf2a3d3622932fbceeba665a47e9bfdbd5610bcde67cb98acb802a283ca706fa2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f2a3d3622932fbceeba665a47e9bfdbd5610bcde67cb98acb802a283ca706fa2",
+                    "hash" : "0xf2a3d3622932fbceeba665a47e9bfdbd5610bcde67cb98acb802a283ca706fa2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "56b30b7c2c95a4affe227d945def7919d5f05556848701eaf3ec095c413ae54a",
+                    "hash" : "0x56b30b7c2c95a4affe227d945def7919d5f05556848701eaf3ec095c413ae54a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c616036740ee42d9795fec7bf0180491d355ff07f1b5205a99bdb5a41cdf3f15",
+                    "hash" : "0xc616036740ee42d9795fec7bf0180491d355ff07f1b5205a99bdb5a41cdf3f15",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f2a3d3622932fbceeba665a47e9bfdbd5610bcde67cb98acb802a283ca706fa2",
+                    "hash" : "0xf2a3d3622932fbceeba665a47e9bfdbd5610bcde67cb98acb802a283ca706fa2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f4600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016003526040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideEnd.json
index ce8acfdfe..506f058af 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideEnd.json
@@ -1,17 +1,17 @@
 {
     "callcallcodecallcode_011_SuicideEnd" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "5e789dd56f8f1de89beb0a5fb4e05f89698202dca811b25a8aa149165713699a",
+                    "hash" : "0x5e789dd56f8f1de89beb0a5fb4e05f89698202dca811b25a8aa149165713699a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "5e789dd56f8f1de89beb0a5fb4e05f89698202dca811b25a8aa149165713699a",
+                    "hash" : "0x5e789dd56f8f1de89beb0a5fb4e05f89698202dca811b25a8aa149165713699a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "0a836282c514c3f376236b757ba9929da905ea0cfca9a61d1419dc96f726da65",
+                    "hash" : "0x0a836282c514c3f376236b757ba9929da905ea0cfca9a61d1419dc96f726da65",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "25e77c53b764f5230036afaecf946cc5311e5244467f3bff2e6a42f479dd793e",
+                    "hash" : "0x25e77c53b764f5230036afaecf946cc5311e5244467f3bff2e6a42f479dd793e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "5e789dd56f8f1de89beb0a5fb4e05f89698202dca811b25a8aa149165713699a",
+                    "hash" : "0x5e789dd56f8f1de89beb0a5fb4e05f89698202dca811b25a8aa149165713699a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000361c350f4600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideMiddle.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideMiddle.json
index 0a4ca7f6e..1fc07ce86 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideMiddle.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideMiddle.json
@@ -1,17 +1,17 @@
 {
     "callcallcodecallcode_011_SuicideMiddle" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d3fda3323d8eb81d00572a9329c1ad9d12e79927e8d1f90ea3a870190d3221ae",
+                    "hash" : "0x0790915f009aad54c0077bb9142d9d262b9ae250515a4b382218b6aea2b14c18",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d3fda3323d8eb81d00572a9329c1ad9d12e79927e8d1f90ea3a870190d3221ae",
+                    "hash" : "0x0790915f009aad54c0077bb9142d9d262b9ae250515a4b382218b6aea2b14c18",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3112f5f92321cd51266f3e0b51eaa161419001181b6b1f1ff8ce2256528faede",
+                    "hash" : "0x6d21e47580c9b8a9622c64cf98eff46fb9dfa0a5228ae511acb6c0a5caacd2b8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "24c83a5fe374ad2fa879be22f53086e9e41945181e0ad8da5e317623336aeebc",
+                    "hash" : "0x6b0e71c38986244674302f43b4e100b7b48c1e0fbf4da59aad11f4fe871295b1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d3fda3323d8eb81d00572a9329c1ad9d12e79927e8d1f90ea3a870190d3221ae",
+                    "hash" : "0x0790915f009aad54c0077bb9142d9d262b9ae250515a4b382218b6aea2b14c18",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff604060006040600073100000000000000000000000000000000000000361c350f4600255",
+                "code" : "0x731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_ABCB_RECURSIVE.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_ABCB_RECURSIVE.json
index c9e4b763a..053fb0d97 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_ABCB_RECURSIVE.json
@@ -1,17 +1,17 @@
 {
     "callcallcodecallcode_ABCB_RECURSIVE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0xb2d05e00",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "0c68792192282aedd7ce980b75830b9582f44bc9b9ae24be9680320b70ad0f17",
+                    "hash" : "0x0c68792192282aedd7ce980b75830b9582f44bc9b9ae24be9680320b70ad0f17",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "0c68792192282aedd7ce980b75830b9582f44bc9b9ae24be9680320b70ad0f17",
+                    "hash" : "0x0c68792192282aedd7ce980b75830b9582f44bc9b9ae24be9680320b70ad0f17",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "dfa4e08d9a120b6dcb2a14844ca8d00a154a9e588603e783b553fa3df063ddf7",
+                    "hash" : "0xdfa4e08d9a120b6dcb2a14844ca8d00a154a9e588603e783b553fa3df063ddf7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f1918b697d3297f9bd7be6eaacae14630b9b1bf8a478e716dca790c54fc12355",
+                    "hash" : "0xf1918b697d3297f9bd7be6eaacae14630b9b1bf8a478e716dca790c54fc12355",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0c68792192282aedd7ce980b75830b9582f44bc9b9ae24be9680320b70ad0f17",
+                    "hash" : "0x0c68792192282aedd7ce980b75830b9582f44bc9b9ae24be9680320b70ad0f17",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002620f4240f4600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060007310000000000000000000000000000000000000016207a120f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "0x01c9c380"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecall_10.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecall_10.json
index 8ea07b396..e2e04201e 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecall_10.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecall_10.json
@@ -1,17 +1,17 @@
 {
     "callcodecall_10" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "0ff88770616fd51250d60cd6163dd123e42f58685a20fccca6b874f8d807e64c",
+                    "hash" : "0x0ff88770616fd51250d60cd6163dd123e42f58685a20fccca6b874f8d807e64c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "0ff88770616fd51250d60cd6163dd123e42f58685a20fccca6b874f8d807e64c",
+                    "hash" : "0x0ff88770616fd51250d60cd6163dd123e42f58685a20fccca6b874f8d807e64c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b10034a1bbbfe4d21459c00db5fe2ded004f038b3557262885a31ccc2bf03147",
+                    "hash" : "0xb10034a1bbbfe4d21459c00db5fe2ded004f038b3557262885a31ccc2bf03147",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "14201ae7e42e0800fda4e5c8299db59f28b853db1a97a14e9bbd55e7a384164c",
+                    "hash" : "0x14201ae7e42e0800fda4e5c8299db59f28b853db1a97a14e9bbd55e7a384164c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0ff88770616fd51250d60cd6163dd123e42f58685a20fccca6b874f8d807e64c",
+                    "hash" : "0x0ff88770616fd51250d60cd6163dd123e42f58685a20fccca6b874f8d807e64c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000162055730f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160025533600455346005553060e6553260e8553660ec553860ee553a60f055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecall_10_OOGE.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecall_10_OOGE.json
index b81879e82..6301d59bf 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecall_10_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecall_10_OOGE.json
@@ -1,17 +1,17 @@
 {
     "callcodecall_10_OOGE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "02c20b6694a45cddffc38dbbffb40819e3b3904784ed15acc5f7ce88582cc64e",
+                    "hash" : "0x02c20b6694a45cddffc38dbbffb40819e3b3904784ed15acc5f7ce88582cc64e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "02c20b6694a45cddffc38dbbffb40819e3b3904784ed15acc5f7ce88582cc64e",
+                    "hash" : "0x02c20b6694a45cddffc38dbbffb40819e3b3904784ed15acc5f7ce88582cc64e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "8b06f4df4a83ee0b53f9c9a301bda642cb2116c60c170e88d1010627f97f5757",
+                    "hash" : "0x8b06f4df4a83ee0b53f9c9a301bda642cb2116c60c170e88d1010627f97f5757",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e0609054e39ad070b2bbc6a650716b386d29944e883e30836b8a6f159f9cae2c",
+                    "hash" : "0xe0609054e39ad070b2bbc6a650716b386d29944e883e30836b8a6f159f9cae2c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "02c20b6694a45cddffc38dbbffb40819e3b3904784ed15acc5f7ce88582cc64e",
+                    "hash" : "0x02c20b6694a45cddffc38dbbffb40819e3b3904784ed15acc5f7ce88582cc64e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016002556001600252",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecall_10_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecall_10_SuicideEnd.json
index c957eb534..21ddee7bb 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecall_10_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecall_10_SuicideEnd.json
@@ -1,17 +1,17 @@
 {
     "callcodecall_10_SuicideEnd" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "ae008399897a350a11206d6a3942bf642a274150a334c3769341974bd3867745",
+                    "hash" : "0xae008399897a350a11206d6a3942bf642a274150a334c3769341974bd3867745",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "ae008399897a350a11206d6a3942bf642a274150a334c3769341974bd3867745",
+                    "hash" : "0xae008399897a350a11206d6a3942bf642a274150a334c3769341974bd3867745",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4ba1494e431b8bb9c88a83b4812c409a2c7b6a1e9816212d93ec1d1eb9efda43",
+                    "hash" : "0x4ba1494e431b8bb9c88a83b4812c409a2c7b6a1e9816212d93ec1d1eb9efda43",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "8bed167b8eb08a83ca46c378c06f909749a11e9b073f4f82fe04fb3e27279dc8",
+                    "hash" : "0x8bed167b8eb08a83ca46c378c06f909749a11e9b073f4f82fe04fb3e27279dc8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "ae008399897a350a11206d6a3942bf642a274150a334c3769341974bd3867745",
+                    "hash" : "0xae008399897a350a11206d6a3942bf642a274150a334c3769341974bd3867745",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000261c350f2600155731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100.json
index b7ac962cc..e4619bef5 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcall_100" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c7cf67a17215ed6eac0f53120c0afbd264489e23fe456fa88fd794e3dd620fbb",
+                    "hash" : "0xc7cf67a17215ed6eac0f53120c0afbd264489e23fe456fa88fd794e3dd620fbb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c7cf67a17215ed6eac0f53120c0afbd264489e23fe456fa88fd794e3dd620fbb",
+                    "hash" : "0xc7cf67a17215ed6eac0f53120c0afbd264489e23fe456fa88fd794e3dd620fbb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "d40df4466e98a878d279fee738896a4f8cffc30ff08e661ef60d0a0c31106c72",
+                    "hash" : "0xd40df4466e98a878d279fee738896a4f8cffc30ff08e661ef60d0a0c31106c72",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "55633632d687fcd5ab41330fa9d08a7166cd48b0b30fdc3bf8893ccb88a2f74c",
+                    "hash" : "0x55633632d687fcd5ab41330fa9d08a7166cd48b0b30fdc3bf8893ccb88a2f74c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c7cf67a17215ed6eac0f53120c0afbd264489e23fe456fa88fd794e3dd620fbb",
+                    "hash" : "0xc7cf67a17215ed6eac0f53120c0afbd264489e23fe456fa88fd794e3dd620fbb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000162055730f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006001731000000000000000000000000000000000000002620493e0f260015533600555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060027310000000000000000000000000000000000000036203d090f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346006553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGE.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGE.json
index 455ffdc08..45665abe6 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGE.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcall_100_OOGE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "102903e11c7d8ae08cfdfd314e0bc1e1e017fc8e303ef4588049ac220ca5a299",
+                    "hash" : "0x102903e11c7d8ae08cfdfd314e0bc1e1e017fc8e303ef4588049ac220ca5a299",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "102903e11c7d8ae08cfdfd314e0bc1e1e017fc8e303ef4588049ac220ca5a299",
+                    "hash" : "0x102903e11c7d8ae08cfdfd314e0bc1e1e017fc8e303ef4588049ac220ca5a299",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "af01a3e2e2e25e1244eb8d0d5e1dc18ed02d78f731edeab25b46af592ee1bc2d",
+                    "hash" : "0xaf01a3e2e2e25e1244eb8d0d5e1dc18ed02d78f731edeab25b46af592ee1bc2d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "54071d8f0252fa16559dc95a4c754456cb9d1eb0add820917f37dd9f66c89c60",
+                    "hash" : "0x54071d8f0252fa16559dc95a4c754456cb9d1eb0add820917f37dd9f66c89c60",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "102903e11c7d8ae08cfdfd314e0bc1e1e017fc8e303ef4588049ac220ca5a299",
+                    "hash" : "0x102903e11c7d8ae08cfdfd314e0bc1e1e017fc8e303ef4588049ac220ca5a299",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMAfter.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMAfter.json
index 09450d6be..bad85144f 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMAfter.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMAfter.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcall_100_OOGMAfter" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "af584519416197f347328bd8c334df83e892e6821fa77a6409e17acc7f07c875",
+                    "hash" : "0xaf584519416197f347328bd8c334df83e892e6821fa77a6409e17acc7f07c875",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "af584519416197f347328bd8c334df83e892e6821fa77a6409e17acc7f07c875",
+                    "hash" : "0xaf584519416197f347328bd8c334df83e892e6821fa77a6409e17acc7f07c875",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b62569cbaffe068e783d4870d965fa783b0dd7d06bded6838715228457cb3262",
+                    "hash" : "0xb62569cbaffe068e783d4870d965fa783b0dd7d06bded6838715228457cb3262",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "aae346ca92f96acc0d6b144e16bf1690ff1c32d06bf5e595f6f23f3366925abd",
+                    "hash" : "0xaae346ca92f96acc0d6b144e16bf1690ff1c32d06bf5e595f6f23f3366925abd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "af584519416197f347328bd8c334df83e892e6821fa77a6409e17acc7f07c875",
+                    "hash" : "0xaf584519416197f347328bd8c334df83e892e6821fa77a6409e17acc7f07c875",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c95f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMBefore.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMBefore.json
index 8d3323e90..ca0aff3d3 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMBefore.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMBefore.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcall_100_OOGMBefore" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6bba427dc57b4ecc5fa6a2032174a78fcf32830d9499dde6523973886371b09f",
+                    "hash" : "0x6bba427dc57b4ecc5fa6a2032174a78fcf32830d9499dde6523973886371b09f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6bba427dc57b4ecc5fa6a2032174a78fcf32830d9499dde6523973886371b09f",
+                    "hash" : "0x6bba427dc57b4ecc5fa6a2032174a78fcf32830d9499dde6523973886371b09f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "842bf7ae887e7cb7dcfc2f6eabdd18646d8a2bda516f9fd562c19b6f56efa2db",
+                    "hash" : "0x842bf7ae887e7cb7dcfc2f6eabdd18646d8a2bda516f9fd562c19b6f56efa2db",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "cac5c264b70a1f8323b5d3e97d12c3d81d5c491b1e80ad650e3aa19fd56a4fc8",
+                    "hash" : "0xcac5c264b70a1f8323b5d3e97d12c3d81d5c491b1e80ad650e3aa19fd56a4fc8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6bba427dc57b4ecc5fa6a2032174a78fcf32830d9499dde6523973886371b09f",
+                    "hash" : "0x6bba427dc57b4ecc5fa6a2032174a78fcf32830d9499dde6523973886371b09f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideEnd.json
index 9c4ad99b4..a84851215 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideEnd.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcall_100_SuicideEnd" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "23378211710a61d42023e52ac4f3ced5520424913d83e6b83d702458a33101cd",
+                    "hash" : "0x23378211710a61d42023e52ac4f3ced5520424913d83e6b83d702458a33101cd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "23378211710a61d42023e52ac4f3ced5520424913d83e6b83d702458a33101cd",
+                    "hash" : "0x23378211710a61d42023e52ac4f3ced5520424913d83e6b83d702458a33101cd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "947f9731043ecfbe5a5ec562e35fe42aceb1af3fbc527f294c376c2d3e7f0188",
+                    "hash" : "0x947f9731043ecfbe5a5ec562e35fe42aceb1af3fbc527f294c376c2d3e7f0188",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4f8f62adf90225d39a8aafaa24a7572e9fa7a219da75698eb4b39f75dae23370",
+                    "hash" : "0x4f8f62adf90225d39a8aafaa24a7572e9fa7a219da75698eb4b39f75dae23370",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "23378211710a61d42023e52ac4f3ced5520424913d83e6b83d702458a33101cd",
+                    "hash" : "0x23378211710a61d42023e52ac4f3ced5520424913d83e6b83d702458a33101cd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideMiddle.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideMiddle.json
index f7f4bb026..e62793c18 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideMiddle.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideMiddle.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcall_100_SuicideMiddle" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7f25a1476e5257afdaa7fcdc8e088f3f34857e9aebcfa22ab2593b6e7216f669",
+                    "hash" : "0xe106c85fe7fd2b684377a93616b1c91ca1a015c87fbf00eda6e829a9b298127b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7f25a1476e5257afdaa7fcdc8e088f3f34857e9aebcfa22ab2593b6e7216f669",
+                    "hash" : "0xe106c85fe7fd2b684377a93616b1c91ca1a015c87fbf00eda6e829a9b298127b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "d962e1865318249b113ba5d1fc701b918d184c270718744d6a9535405d476299",
+                    "hash" : "0x2f33596d5f44d27a283f42ab80573b0c0679a747956947fa95cc834b29568a6d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4f6e821c1d0b4ebdc4a861d0c45b7bd632e421852f6f07c404c0a35cca65ded6",
+                    "hash" : "0xadb05591af22edf890ca98b2f7c75c5aa422db762452c7dee6bdd768d09451da",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7f25a1476e5257afdaa7fcdc8e088f3f34857e9aebcfa22ab2593b6e7216f669",
+                    "hash" : "0xe106c85fe7fd2b684377a93616b1c91ca1a015c87fbf00eda6e829a9b298127b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f2600255",
+                "code" : "0x731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_ABCB_RECURSIVE.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_ABCB_RECURSIVE.json
index 20c2760e9..f3fc98af8 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_ABCB_RECURSIVE.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcall_ABCB_RECURSIVE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0xb2d05e00",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c71c3c72a86af0113389ac1e4a61aa898945cf5f7b9a025aea9bff4be67f860c",
+                    "hash" : "0xc71c3c72a86af0113389ac1e4a61aa898945cf5f7b9a025aea9bff4be67f860c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c71c3c72a86af0113389ac1e4a61aa898945cf5f7b9a025aea9bff4be67f860c",
+                    "hash" : "0xc71c3c72a86af0113389ac1e4a61aa898945cf5f7b9a025aea9bff4be67f860c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "47556352d5416f990a6a0220c889d05e2d2a0f54432db3f86ad4905f7b7d44d9",
+                    "hash" : "0x47556352d5416f990a6a0220c889d05e2d2a0f54432db3f86ad4905f7b7d44d9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4289ba2d0ff2046af6580fb4a5183083d6fd88ce3c29cabd91c288069176c028",
+                    "hash" : "0x4289ba2d0ff2046af6580fb4a5183083d6fd88ce3c29cabd91c288069176c028",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c71c3c72a86af0113389ac1e4a61aa898945cf5f7b9a025aea9bff4be67f860c",
+                    "hash" : "0xc71c3c72a86af0113389ac1e4a61aa898945cf5f7b9a025aea9bff4be67f860c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000163017d7840f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "0x01c9c380"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101.json
index c54d47163..eb1005c6d 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcallcode_101" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "fa8213e5be374f800e16897651e302474f1854eb3866ed981644222b3b1fe24a",
+                    "hash" : "0xfa8213e5be374f800e16897651e302474f1854eb3866ed981644222b3b1fe24a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "fa8213e5be374f800e16897651e302474f1854eb3866ed981644222b3b1fe24a",
+                    "hash" : "0xfa8213e5be374f800e16897651e302474f1854eb3866ed981644222b3b1fe24a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9ebae797a3e14cbe9fe7a3cd3a8e0c1812b80bc4474b7c70e1b85835771f83dd",
+                    "hash" : "0x9ebae797a3e14cbe9fe7a3cd3a8e0c1812b80bc4474b7c70e1b85835771f83dd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4cacaa96bfe003df5eb59210ce7a3faadb45dd45b6dae415b38ff0bf8be9e083",
+                    "hash" : "0x4cacaa96bfe003df5eb59210ce7a3faadb45dd45b6dae415b38ff0bf8be9e083",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "fa8213e5be374f800e16897651e302474f1854eb3866ed981644222b3b1fe24a",
+                    "hash" : "0xfa8213e5be374f800e16897651e302474f1854eb3866ed981644222b3b1fe24a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000162055730f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006001731000000000000000000000000000000000000002620493e0f260015533600555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060007310000000000000000000000000000000000000036203d090f460025533600655",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGE.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGE.json
index 38e0699ac..dbc606a55 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGE.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcallcode_101_OOGE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "715153239b646d65f629652a1019cd53344223e2ad15b413c6ea5cb0260dacf9",
+                    "hash" : "0x715153239b646d65f629652a1019cd53344223e2ad15b413c6ea5cb0260dacf9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "715153239b646d65f629652a1019cd53344223e2ad15b413c6ea5cb0260dacf9",
+                    "hash" : "0x715153239b646d65f629652a1019cd53344223e2ad15b413c6ea5cb0260dacf9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "0aafff502c7a40bac1d3f97bc989a050deba280ecc16f1acdc4e7afc6771427c",
+                    "hash" : "0x0aafff502c7a40bac1d3f97bc989a050deba280ecc16f1acdc4e7afc6771427c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9c5d980fe2ee46663a7faf368c6d135baff3d4fa78522b1b441fa19e95b08865",
+                    "hash" : "0x9c5d980fe2ee46663a7faf368c6d135baff3d4fa78522b1b441fa19e95b08865",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "715153239b646d65f629652a1019cd53344223e2ad15b413c6ea5cb0260dacf9",
+                    "hash" : "0x715153239b646d65f629652a1019cd53344223e2ad15b413c6ea5cb0260dacf9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMAfter.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMAfter.json
index 224a065e6..b48e41c89 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMAfter.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMAfter.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcallcode_101_OOGMAfter" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "72789093fd286d124a94068c11cb5189564e50490626464d2d3aab6ec7049aac",
+                    "hash" : "0x72789093fd286d124a94068c11cb5189564e50490626464d2d3aab6ec7049aac",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "72789093fd286d124a94068c11cb5189564e50490626464d2d3aab6ec7049aac",
+                    "hash" : "0x72789093fd286d124a94068c11cb5189564e50490626464d2d3aab6ec7049aac",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6d479eeebd4394d608e4c0773568b4b397afc1528e762283fe0e412f9dd4cd61",
+                    "hash" : "0x6d479eeebd4394d608e4c0773568b4b397afc1528e762283fe0e412f9dd4cd61",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e992a79fb556b4ffabc16a460d25f8201d477ff4bccf72b91d505b74e5084069",
+                    "hash" : "0xe992a79fb556b4ffabc16a460d25f8201d477ff4bccf72b91d505b74e5084069",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "72789093fd286d124a94068c11cb5189564e50490626464d2d3aab6ec7049aac",
+                    "hash" : "0x72789093fd286d124a94068c11cb5189564e50490626464d2d3aab6ec7049aac",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c95f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMBefore.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMBefore.json
index d3a7470ff..ec0621a88 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMBefore.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMBefore.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcallcode_101_OOGMBefore" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e041950fb990326f0a02309d3cdf8bed86696119d56846e181c26c63d97c9faf",
+                    "hash" : "0xe041950fb990326f0a02309d3cdf8bed86696119d56846e181c26c63d97c9faf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e041950fb990326f0a02309d3cdf8bed86696119d56846e181c26c63d97c9faf",
+                    "hash" : "0xe041950fb990326f0a02309d3cdf8bed86696119d56846e181c26c63d97c9faf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5092376083f685f0fc65d383505ae3611a277aaa5791285bbe39afd35bd03c73",
+                    "hash" : "0x5092376083f685f0fc65d383505ae3611a277aaa5791285bbe39afd35bd03c73",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3ae5302a42daf536aa38dba4b188cf302e997e07fbe10bc2576c28241f52d7d8",
+                    "hash" : "0x3ae5302a42daf536aa38dba4b188cf302e997e07fbe10bc2576c28241f52d7d8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e041950fb990326f0a02309d3cdf8bed86696119d56846e181c26c63d97c9faf",
+                    "hash" : "0xe041950fb990326f0a02309d3cdf8bed86696119d56846e181c26c63d97c9faf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016003526040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideEnd.json
index 36316c881..2d7433d5f 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideEnd.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcallcode_101_SuicideEnd" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "35cb1045a24a1a4811760a686caec7d70e026c4a338b3b9e5f97f9f5514abf50",
+                    "hash" : "0x35cb1045a24a1a4811760a686caec7d70e026c4a338b3b9e5f97f9f5514abf50",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "35cb1045a24a1a4811760a686caec7d70e026c4a338b3b9e5f97f9f5514abf50",
+                    "hash" : "0x35cb1045a24a1a4811760a686caec7d70e026c4a338b3b9e5f97f9f5514abf50",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b61abe9090a96f92bcc332c452ed9534dd7603a6223e30be809cd394d112f044",
+                    "hash" : "0xb61abe9090a96f92bcc332c452ed9534dd7603a6223e30be809cd394d112f044",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "7677407312741db39826ebb72c352c0bf8becab1f0f82a5e21258891182f138b",
+                    "hash" : "0x7677407312741db39826ebb72c352c0bf8becab1f0f82a5e21258891182f138b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "35cb1045a24a1a4811760a686caec7d70e026c4a338b3b9e5f97f9f5514abf50",
+                    "hash" : "0x35cb1045a24a1a4811760a686caec7d70e026c4a338b3b9e5f97f9f5514abf50",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000361c350f4600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideMiddle.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideMiddle.json
index f95e0de21..047c7e5e6 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideMiddle.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideMiddle.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcallcode_101_SuicideMiddle" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c298a3c14a86d6466c761b39240c9647b93175ded193d4b16c84f4669de570c8",
+                    "hash" : "0xe106c85fe7fd2b684377a93616b1c91ca1a015c87fbf00eda6e829a9b298127b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c298a3c14a86d6466c761b39240c9647b93175ded193d4b16c84f4669de570c8",
+                    "hash" : "0xe106c85fe7fd2b684377a93616b1c91ca1a015c87fbf00eda6e829a9b298127b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5dbc9f91e01e584e5f20fefa9863da9e569e91c4636528bcbf7dd1f0be2a1325",
+                    "hash" : "0x2f33596d5f44d27a283f42ab80573b0c0679a747956947fa95cc834b29568a6d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "95f196d124b181dd3ea61e3fe2d3fa7d0e32f9b1c74d104bd6f5059d3ae67141",
+                    "hash" : "0xadb05591af22edf890ca98b2f7c75c5aa422db762452c7dee6bdd768d09451da",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c298a3c14a86d6466c761b39240c9647b93175ded193d4b16c84f4669de570c8",
+                    "hash" : "0xe106c85fe7fd2b684377a93616b1c91ca1a015c87fbf00eda6e829a9b298127b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff604060006040600073100000000000000000000000000000000000000361c350f4600255",
+                "code" : "0x731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_ABCB_RECURSIVE.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_ABCB_RECURSIVE.json
index 9243449c8..7b660c2a8 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_ABCB_RECURSIVE.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcallcode_ABCB_RECURSIVE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0xb2d05e00",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "22a796e402ab3a4bd59e562faa7a7568200221b1230b1d6f37945cbcdd4c5760",
+                    "hash" : "0x22a796e402ab3a4bd59e562faa7a7568200221b1230b1d6f37945cbcdd4c5760",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "22a796e402ab3a4bd59e562faa7a7568200221b1230b1d6f37945cbcdd4c5760",
+                    "hash" : "0x22a796e402ab3a4bd59e562faa7a7568200221b1230b1d6f37945cbcdd4c5760",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "da6f304b6e4c2e696db384657ccec735d83bdf3d202fe019b5b5bebd16446734",
+                    "hash" : "0xda6f304b6e4c2e696db384657ccec735d83bdf3d202fe019b5b5bebd16446734",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "8e577c9142bb10a14fce4064aee95b80c33d5226c92f99a4eea0c9d9451f0d92",
+                    "hash" : "0x8e577c9142bb10a14fce4064aee95b80c33d5226c92f99a4eea0c9d9451f0d92",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "22a796e402ab3a4bd59e562faa7a7568200221b1230b1d6f37945cbcdd4c5760",
+                    "hash" : "0x22a796e402ab3a4bd59e562faa7a7568200221b1230b1d6f37945cbcdd4c5760",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000163017d7840f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060007310000000000000000000000000000000000000016207a120f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "0x01c9c380"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11.json
index 1d540a268..81c914277 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcode_11" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6bb5dcba63963fbecffe9dc14d5fdeda6dc28890fc919a514288050eb3688cd9",
+                    "hash" : "0x6bb5dcba63963fbecffe9dc14d5fdeda6dc28890fc919a514288050eb3688cd9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6bb5dcba63963fbecffe9dc14d5fdeda6dc28890fc919a514288050eb3688cd9",
+                    "hash" : "0x6bb5dcba63963fbecffe9dc14d5fdeda6dc28890fc919a514288050eb3688cd9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "d20f21ffe89418f85b8316c0e28945dfd51b90df8d7484e01c0ca7559ea786e6",
+                    "hash" : "0xd20f21ffe89418f85b8316c0e28945dfd51b90df8d7484e01c0ca7559ea786e6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ad88e26cac530cf65bedbddc21bcd34c079dfb51c60cdb4584a522a154459f67",
+                    "hash" : "0xad88e26cac530cf65bedbddc21bcd34c079dfb51c60cdb4584a522a154459f67",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6bb5dcba63963fbecffe9dc14d5fdeda6dc28890fc919a514288050eb3688cd9",
+                    "hash" : "0x6bb5dcba63963fbecffe9dc14d5fdeda6dc28890fc919a514288050eb3688cd9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000162055730f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060007310000000000000000000000000000000000000026203d090f4600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160025533600455346005553060e6553260e8553660ec553860ee553a60f055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_OOGE.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_OOGE.json
index 18f0833a5..7000eb4de 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_OOGE.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcode_11_OOGE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "0e28cf3f4db47f3b35650b9458b37fd2c6ef988619e9357c7aad99c2ca509bb4",
+                    "hash" : "0x0e28cf3f4db47f3b35650b9458b37fd2c6ef988619e9357c7aad99c2ca509bb4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "0e28cf3f4db47f3b35650b9458b37fd2c6ef988619e9357c7aad99c2ca509bb4",
+                    "hash" : "0x0e28cf3f4db47f3b35650b9458b37fd2c6ef988619e9357c7aad99c2ca509bb4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "096698b31d54f0040cd099ba66b817a9f1ffc5a5bafa28ffa59a3d758923547a",
+                    "hash" : "0x096698b31d54f0040cd099ba66b817a9f1ffc5a5bafa28ffa59a3d758923547a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "cd71afecf18c68473965101df3bee68f05e811bc3cc85263f2e873db0bab603e",
+                    "hash" : "0xcd71afecf18c68473965101df3bee68f05e811bc3cc85263f2e873db0bab603e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0e28cf3f4db47f3b35650b9458b37fd2c6ef988619e9357c7aad99c2ca509bb4",
+                    "hash" : "0x0e28cf3f4db47f3b35650b9458b37fd2c6ef988619e9357c7aad99c2ca509bb4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002614e34f4600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016002556001600252",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_SuicideEnd.json
index c5f115af4..d286ff42c 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_SuicideEnd.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcode_11_SuicideEnd" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f13d84f79216159b8c1952beb0241a3fddabeecd458a1575d751fe3b95c44218",
+                    "hash" : "0xf13d84f79216159b8c1952beb0241a3fddabeecd458a1575d751fe3b95c44218",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f13d84f79216159b8c1952beb0241a3fddabeecd458a1575d751fe3b95c44218",
+                    "hash" : "0xf13d84f79216159b8c1952beb0241a3fddabeecd458a1575d751fe3b95c44218",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e35649fa1eea660604dcabe69e77842e8a2f22da1dfdd6dea4c69d397b659a89",
+                    "hash" : "0xe35649fa1eea660604dcabe69e77842e8a2f22da1dfdd6dea4c69d397b659a89",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "703f353348a2430256b3810b8e11fcf46575186df153666c0e2da48ccb9bcb05",
+                    "hash" : "0x703f353348a2430256b3810b8e11fcf46575186df153666c0e2da48ccb9bcb05",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f13d84f79216159b8c1952beb0241a3fddabeecd458a1575d751fe3b95c44218",
+                    "hash" : "0xf13d84f79216159b8c1952beb0241a3fddabeecd458a1575d751fe3b95c44218",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000261c350f4600155731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110.json
index b17111202..e9708440a 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecall_110" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1a0c0ff79c7f1f7f7e275740abb2a04be4a4e8bef522a96ddbb07591fbd04510",
+                    "hash" : "0x1a0c0ff79c7f1f7f7e275740abb2a04be4a4e8bef522a96ddbb07591fbd04510",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "1a0c0ff79c7f1f7f7e275740abb2a04be4a4e8bef522a96ddbb07591fbd04510",
+                    "hash" : "0x1a0c0ff79c7f1f7f7e275740abb2a04be4a4e8bef522a96ddbb07591fbd04510",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6d41af64bb9fb98da3c6d35833bbcf39ac155bc24f40f1dea53744fc6ce32f6f",
+                    "hash" : "0x6d41af64bb9fb98da3c6d35833bbcf39ac155bc24f40f1dea53744fc6ce32f6f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "34bc5671ba91c86c180a49383698b999d1e1f479d30329efa94cfd0e35448d47",
+                    "hash" : "0x34bc5671ba91c86c180a49383698b999d1e1f479d30329efa94cfd0e35448d47",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "1a0c0ff79c7f1f7f7e275740abb2a04be4a4e8bef522a96ddbb07591fbd04510",
+                    "hash" : "0x1a0c0ff79c7f1f7f7e275740abb2a04be4a4e8bef522a96ddbb07591fbd04510",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000162055730f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002620493e0f460015533600555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060017310000000000000000000000000000000000000036203d090f260025533600655",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGE.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGE.json
index b22865f37..bb6986dbd 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGE.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecall_110_OOGE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "942ff284bea2f09e71ed2cf10386123723970b326007af4100816600c6fd940b",
+                    "hash" : "0x942ff284bea2f09e71ed2cf10386123723970b326007af4100816600c6fd940b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "942ff284bea2f09e71ed2cf10386123723970b326007af4100816600c6fd940b",
+                    "hash" : "0x942ff284bea2f09e71ed2cf10386123723970b326007af4100816600c6fd940b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2179e2c822fec12f40fd3939cd1d1dde923e5463e69746602dbf007893158b57",
+                    "hash" : "0x2179e2c822fec12f40fd3939cd1d1dde923e5463e69746602dbf007893158b57",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6259572a4af0cbe466630c38041328c0a204eb18fe9819bfe68b326266e6c375",
+                    "hash" : "0x6259572a4af0cbe466630c38041328c0a204eb18fe9819bfe68b326266e6c375",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "942ff284bea2f09e71ed2cf10386123723970b326007af4100816600c6fd940b",
+                    "hash" : "0x942ff284bea2f09e71ed2cf10386123723970b326007af4100816600c6fd940b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMAfter.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMAfter.json
index 36609141a..a2e067fe7 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMAfter.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMAfter.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecall_110_OOGMAfter" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "19981474be0091e4bcf8c3ced4c9a2b9264ab6f76ccb3708560a5fa014f74677",
+                    "hash" : "0x19981474be0091e4bcf8c3ced4c9a2b9264ab6f76ccb3708560a5fa014f74677",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "19981474be0091e4bcf8c3ced4c9a2b9264ab6f76ccb3708560a5fa014f74677",
+                    "hash" : "0x19981474be0091e4bcf8c3ced4c9a2b9264ab6f76ccb3708560a5fa014f74677",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "7f80cbb5991fa0786b95a163abe66f6ed0b4e9a59ea334c8b9c849dfd8578cb4",
+                    "hash" : "0x7f80cbb5991fa0786b95a163abe66f6ed0b4e9a59ea334c8b9c849dfd8578cb4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9c301320a19121eac101086d4959324be54a0409be44ca96a9a6047bb76a74a7",
+                    "hash" : "0x9c301320a19121eac101086d4959324be54a0409be44ca96a9a6047bb76a74a7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "19981474be0091e4bcf8c3ced4c9a2b9264ab6f76ccb3708560a5fa014f74677",
+                    "hash" : "0x19981474be0091e4bcf8c3ced4c9a2b9264ab6f76ccb3708560a5fa014f74677",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c95f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMBefore.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMBefore.json
index b67b18d5a..4f1fe68aa 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMBefore.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMBefore.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecall_110_OOGMBefore" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "133ce682dd8a338a8cf768f9b504ff61b6434a4167414fdcca4be5cd24a8e54a",
+                    "hash" : "0x133ce682dd8a338a8cf768f9b504ff61b6434a4167414fdcca4be5cd24a8e54a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "133ce682dd8a338a8cf768f9b504ff61b6434a4167414fdcca4be5cd24a8e54a",
+                    "hash" : "0x133ce682dd8a338a8cf768f9b504ff61b6434a4167414fdcca4be5cd24a8e54a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "bb0998a3e9e4e118719757faba690a274adf1f0cf9f8a6e5533e6d11c0d1b27d",
+                    "hash" : "0xbb0998a3e9e4e118719757faba690a274adf1f0cf9f8a6e5533e6d11c0d1b27d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c6290af98244a3e14f3d37f222df9f51f92d8039f073830989f7fc9d8a889a29",
+                    "hash" : "0xc6290af98244a3e14f3d37f222df9f51f92d8039f073830989f7fc9d8a889a29",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "133ce682dd8a338a8cf768f9b504ff61b6434a4167414fdcca4be5cd24a8e54a",
+                    "hash" : "0x133ce682dd8a338a8cf768f9b504ff61b6434a4167414fdcca4be5cd24a8e54a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c94f4600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideEnd.json
index f2f2498f0..afed2c99f 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideEnd.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecall_110_SuicideEnd" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e58fadd9d9e01b4d0f1c140f336f324ceb72d8982ac435f94cd4dcdafc9a058c",
+                    "hash" : "0xe58fadd9d9e01b4d0f1c140f336f324ceb72d8982ac435f94cd4dcdafc9a058c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e58fadd9d9e01b4d0f1c140f336f324ceb72d8982ac435f94cd4dcdafc9a058c",
+                    "hash" : "0xe58fadd9d9e01b4d0f1c140f336f324ceb72d8982ac435f94cd4dcdafc9a058c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "1cfc452d676a580a2cc89ee8026c078aedf67e0d893b989372522c3b4c9ecea2",
+                    "hash" : "0x1cfc452d676a580a2cc89ee8026c078aedf67e0d893b989372522c3b4c9ecea2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "45afb1510d512c686b1e61b529e2881c6457a32aaf9671bddd5b7476f6067c2f",
+                    "hash" : "0x45afb1510d512c686b1e61b529e2881c6457a32aaf9671bddd5b7476f6067c2f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e58fadd9d9e01b4d0f1c140f336f324ceb72d8982ac435f94cd4dcdafc9a058c",
+                    "hash" : "0xe58fadd9d9e01b4d0f1c140f336f324ceb72d8982ac435f94cd4dcdafc9a058c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideMiddle.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideMiddle.json
index 9e57cf2d5..bb94a7d33 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideMiddle.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideMiddle.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecall_110_SuicideMiddle" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "0ac83d0265297066ead9f7343c498475dbb6c7915e3c4afdb9a4388659c78997",
+                    "hash" : "0x0af21ebddea0328af1e15f809f5f6e3401af37ed2501075300bebe479b006d49",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "0ac83d0265297066ead9f7343c498475dbb6c7915e3c4afdb9a4388659c78997",
+                    "hash" : "0x0af21ebddea0328af1e15f809f5f6e3401af37ed2501075300bebe479b006d49",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6e61b10987840f1a42a1770298f49fa3df14d946b32fd13dd1df1c617d437b34",
+                    "hash" : "0x687ad44bee4e1068abc98c35dff3917fa0dc8ff8ccf85658cb69dbaa8e1b972d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c30da7dab9f97cdb0e059acd99f185982c3eb4ec9408aa52dc0b0d0957999d87",
+                    "hash" : "0x7fda4cd60dc6ec236dd59307b889261919971ef3903191d463357779686d2eee",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0ac83d0265297066ead9f7343c498475dbb6c7915e3c4afdb9a4388659c78997",
+                    "hash" : "0x0af21ebddea0328af1e15f809f5f6e3401af37ed2501075300bebe479b006d49",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f2600255",
+                "code" : "0x731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_ABCB_RECURSIVE.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_ABCB_RECURSIVE.json
index 2b7222e16..7d919bfe5 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_ABCB_RECURSIVE.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecall_ABCB_RECURSIVE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0xb2d05e00",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "3bf4b5a1ec47523ada015f3fb3f5df83f08c7d4b6d4fd10a2caa59181b2c739d",
+                    "hash" : "0x3bf4b5a1ec47523ada015f3fb3f5df83f08c7d4b6d4fd10a2caa59181b2c739d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "3bf4b5a1ec47523ada015f3fb3f5df83f08c7d4b6d4fd10a2caa59181b2c739d",
+                    "hash" : "0x3bf4b5a1ec47523ada015f3fb3f5df83f08c7d4b6d4fd10a2caa59181b2c739d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "0d23c7ca2e96fb608ab0650af3db13403b67f997a43078d6e411cfa944fc1db3",
+                    "hash" : "0x0d23c7ca2e96fb608ab0650af3db13403b67f997a43078d6e411cfa944fc1db3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "cb895ea3655a33ff3d5704b44e275f66152b105844eb4f4996fb2b590e683c08",
+                    "hash" : "0xcb895ea3655a33ff3d5704b44e275f66152b105844eb4f4996fb2b590e683c08",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "3bf4b5a1ec47523ada015f3fb3f5df83f08c7d4b6d4fd10a2caa59181b2c739d",
+                    "hash" : "0x3bf4b5a1ec47523ada015f3fb3f5df83f08c7d4b6d4fd10a2caa59181b2c739d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000163017d7840f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002620f4240f4600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "0x01c9c380"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111.json
index ab04be282..bb7f96b06 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecallcode_111" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9ff3154dfe3d0c682720f4c835db942af1a2c55e25f61177f8ae49cdddd7f0ca",
+                    "hash" : "0x9ff3154dfe3d0c682720f4c835db942af1a2c55e25f61177f8ae49cdddd7f0ca",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9ff3154dfe3d0c682720f4c835db942af1a2c55e25f61177f8ae49cdddd7f0ca",
+                    "hash" : "0x9ff3154dfe3d0c682720f4c835db942af1a2c55e25f61177f8ae49cdddd7f0ca",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3c7c4a2c96e4a91fc49264d9bd842f882be122d42e4eb990c90a5f5f52750277",
+                    "hash" : "0x3c7c4a2c96e4a91fc49264d9bd842f882be122d42e4eb990c90a5f5f52750277",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "51f06fc9b202094c1778e51163b46bb39c104a49a88009ec1651ae1451cadf59",
+                    "hash" : "0x51f06fc9b202094c1778e51163b46bb39c104a49a88009ec1651ae1451cadf59",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9ff3154dfe3d0c682720f4c835db942af1a2c55e25f61177f8ae49cdddd7f0ca",
+                    "hash" : "0x9ff3154dfe3d0c682720f4c835db942af1a2c55e25f61177f8ae49cdddd7f0ca",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000162055730f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002620493e0f4600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060007310000000000000000000000000000000000000036203d090f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGE.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGE.json
index 0908f1ed3..c78ac38ba 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGE.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecallcode_111_OOGE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7f855d94b94b43220456d5492c6fb79531a820f6b83a2c24adfa3fd2d7676a1e",
+                    "hash" : "0x7f855d94b94b43220456d5492c6fb79531a820f6b83a2c24adfa3fd2d7676a1e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7f855d94b94b43220456d5492c6fb79531a820f6b83a2c24adfa3fd2d7676a1e",
+                    "hash" : "0x7f855d94b94b43220456d5492c6fb79531a820f6b83a2c24adfa3fd2d7676a1e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "267dd4b8573a2e7a012580cc949aa4972aad594a3c4a1cb193ea45d86bbe0cff",
+                    "hash" : "0x267dd4b8573a2e7a012580cc949aa4972aad594a3c4a1cb193ea45d86bbe0cff",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b1c13e1821d85f7aed07b1fb2883fd071f5c7b6d99766e40f7165d3b34e82969",
+                    "hash" : "0xb1c13e1821d85f7aed07b1fb2883fd071f5c7b6d99766e40f7165d3b34e82969",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7f855d94b94b43220456d5492c6fb79531a820f6b83a2c24adfa3fd2d7676a1e",
+                    "hash" : "0x7f855d94b94b43220456d5492c6fb79531a820f6b83a2c24adfa3fd2d7676a1e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619d3af4600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGMAfter.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGMAfter.json
index 9129a55e8..59e15e128 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGMAfter.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGMAfter.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecallcode_111_OOGMAfter" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "711948edc65c8b7d199a7731e6054d7e07d06c083eb98c473d3cde0e85488e5a",
+                    "hash" : "0x711948edc65c8b7d199a7731e6054d7e07d06c083eb98c473d3cde0e85488e5a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "711948edc65c8b7d199a7731e6054d7e07d06c083eb98c473d3cde0e85488e5a",
+                    "hash" : "0x711948edc65c8b7d199a7731e6054d7e07d06c083eb98c473d3cde0e85488e5a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2b024b21c2daf897cc6913b84049c8e13b8919bd596cb7041d771e8c44262849",
+                    "hash" : "0x2b024b21c2daf897cc6913b84049c8e13b8919bd596cb7041d771e8c44262849",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b53d71ec73b762655d97cbd7e1b208ae64409ae2cd3d38574dec49d07d20109f",
+                    "hash" : "0xb53d71ec73b762655d97cbd7e1b208ae64409ae2cd3d38574dec49d07d20109f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "711948edc65c8b7d199a7731e6054d7e07d06c083eb98c473d3cde0e85488e5a",
+                    "hash" : "0x711948edc65c8b7d199a7731e6054d7e07d06c083eb98c473d3cde0e85488e5a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaecf4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619ca4f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGMBefore.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGMBefore.json
index 0660cf049..136b388ff 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGMBefore.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGMBefore.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecallcode_111_OOGMBefore" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b4dbea16de17b59147fa94280092aad3126e017f4a453a065186300d2448c803",
+                    "hash" : "0xb4dbea16de17b59147fa94280092aad3126e017f4a453a065186300d2448c803",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b4dbea16de17b59147fa94280092aad3126e017f4a453a065186300d2448c803",
+                    "hash" : "0xb4dbea16de17b59147fa94280092aad3126e017f4a453a065186300d2448c803",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4e3ad257e8d352958cea3ec50c3ffe9eb8864cec4cfccc5d9d5fae441c0a9977",
+                    "hash" : "0x4e3ad257e8d352958cea3ec50c3ffe9eb8864cec4cfccc5d9d5fae441c0a9977",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3f299a1af6b8063deb96c41f54078ebb5a5e2f78a5913b9d73c7e2c2f8755f38",
+                    "hash" : "0x3f299a1af6b8063deb96c41f54078ebb5a5e2f78a5913b9d73c7e2c2f8755f38",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b4dbea16de17b59147fa94280092aad3126e017f4a453a065186300d2448c803",
+                    "hash" : "0xb4dbea16de17b59147fa94280092aad3126e017f4a453a065186300d2448c803",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f4600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016003526040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideEnd.json
index 4f69a9780..bdba49922 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideEnd.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecallcode_111_SuicideEnd" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e76229fb92f8543f5c0e2c4d9469e0464988b089922ee520f260bb259f1f9c59",
+                    "hash" : "0xe76229fb92f8543f5c0e2c4d9469e0464988b089922ee520f260bb259f1f9c59",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e76229fb92f8543f5c0e2c4d9469e0464988b089922ee520f260bb259f1f9c59",
+                    "hash" : "0xe76229fb92f8543f5c0e2c4d9469e0464988b089922ee520f260bb259f1f9c59",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5e680aba2dfacfc5b1b323c8b133d44d7912b2a16515fc424d95fd0293872037",
+                    "hash" : "0x5e680aba2dfacfc5b1b323c8b133d44d7912b2a16515fc424d95fd0293872037",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "17f9ea5c8509ce2260e9f3f47eb17e0a4cb9308979170b4b4b9fe1f704a6d3d0",
+                    "hash" : "0x17f9ea5c8509ce2260e9f3f47eb17e0a4cb9308979170b4b4b9fe1f704a6d3d0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e76229fb92f8543f5c0e2c4d9469e0464988b089922ee520f260bb259f1f9c59",
+                    "hash" : "0xe76229fb92f8543f5c0e2c4d9469e0464988b089922ee520f260bb259f1f9c59",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006001731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600273100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideMiddle.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideMiddle.json
index d530d8275..ee4cd010a 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideMiddle.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideMiddle.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecallcode_111_SuicideMiddle" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a5d6d30cb53233b4343558ebee2dfab50647e9ec6a9fa253f4184b5adca38437",
+                    "hash" : "0x0af21ebddea0328af1e15f809f5f6e3401af37ed2501075300bebe479b006d49",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a5d6d30cb53233b4343558ebee2dfab50647e9ec6a9fa253f4184b5adca38437",
+                    "hash" : "0x0af21ebddea0328af1e15f809f5f6e3401af37ed2501075300bebe479b006d49",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "faebb8b6b08761c893338f4f931adc2bdd7a7cfe98cc69d995204af17692a495",
+                    "hash" : "0x687ad44bee4e1068abc98c35dff3917fa0dc8ff8ccf85658cb69dbaa8e1b972d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "012bd47480194d80153637058b1a93dfbe426d0f53f24ce8460d0c4e2bc321d8",
+                    "hash" : "0x7fda4cd60dc6ec236dd59307b889261919971ef3903191d463357779686d2eee",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a5d6d30cb53233b4343558ebee2dfab50647e9ec6a9fa253f4184b5adca38437",
+                    "hash" : "0x0af21ebddea0328af1e15f809f5f6e3401af37ed2501075300bebe479b006d49",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff604060006040600073100000000000000000000000000000000000000361c350f4600255",
+                "code" : "0x731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_ABCB_RECURSIVE.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_ABCB_RECURSIVE.json
index e0680a6ea..1d8dbd1ad 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_ABCB_RECURSIVE.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecallcode_ABCB_RECURSIVE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0xb2d05e00",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7534562771847b5e3213d441c5b7eaf174fe4f238bf44b5893525f441e031284",
+                    "hash" : "0x7534562771847b5e3213d441c5b7eaf174fe4f238bf44b5893525f441e031284",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7534562771847b5e3213d441c5b7eaf174fe4f238bf44b5893525f441e031284",
+                    "hash" : "0x7534562771847b5e3213d441c5b7eaf174fe4f238bf44b5893525f441e031284",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "0829e05ae238200ab794bf1978f724286bceaf1a947662cf408ac5c65421157d",
+                    "hash" : "0x0829e05ae238200ab794bf1978f724286bceaf1a947662cf408ac5c65421157d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "8502b9c5e0f229cb9c9f5eeacc11b9f136428645edc6e0627ed08c0ab578ac6c",
+                    "hash" : "0x8502b9c5e0f229cb9c9f5eeacc11b9f136428645edc6e0627ed08c0ab578ac6c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7534562771847b5e3213d441c5b7eaf174fe4f238bf44b5893525f441e031284",
+                    "hash" : "0x7534562771847b5e3213d441c5b7eaf174fe4f238bf44b5893525f441e031284",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000163017d7840f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002620f4240f4600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060007310000000000000000000000000000000000000016207a120f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "0x01c9c380"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001.json
index 9f3296e89..66afa61d8 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001.json
@@ -1,17 +1,17 @@
 {
     "callcallcallcode_001" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "63dfeb3cb97f29a805576560ec08d8eaa0d133bd4859f7f1cf364de2b2c7037d",
+                    "hash" : "0x63dfeb3cb97f29a805576560ec08d8eaa0d133bd4859f7f1cf364de2b2c7037d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "63dfeb3cb97f29a805576560ec08d8eaa0d133bd4859f7f1cf364de2b2c7037d",
+                    "hash" : "0x63dfeb3cb97f29a805576560ec08d8eaa0d133bd4859f7f1cf364de2b2c7037d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "860ac808616122716432c90339aa2e248a683cc679df6a42825d580e8b35fc42",
+                    "hash" : "0x860ac808616122716432c90339aa2e248a683cc679df6a42825d580e8b35fc42",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "7a7c1a2fb7f850d9a6f55163e3df2bfa597528531ac5f273dd65046f9c622860",
+                    "hash" : "0x7a7c1a2fb7f850d9a6f55163e3df2bfa597528531ac5f273dd65046f9c622860",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "63dfeb3cb97f29a805576560ec08d8eaa0d133bd4859f7f1cf364de2b2c7037d",
+                    "hash" : "0x63dfeb3cb97f29a805576560ec08d8eaa0d133bd4859f7f1cf364de2b2c7037d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060007310000000000000000000000000000000000000036203d090f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGE.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGE.json
index 1d726d0f7..e48fc50d3 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGE.json
@@ -1,17 +1,17 @@
 {
     "callcallcallcode_001_OOGE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "cdfaffc38d55a43ee4aa17de7c69fb5694ed6300099a8c7c8aff51ff803cb54c",
+                    "hash" : "0xcdfaffc38d55a43ee4aa17de7c69fb5694ed6300099a8c7c8aff51ff803cb54c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "cdfaffc38d55a43ee4aa17de7c69fb5694ed6300099a8c7c8aff51ff803cb54c",
+                    "hash" : "0xcdfaffc38d55a43ee4aa17de7c69fb5694ed6300099a8c7c8aff51ff803cb54c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "65150f78111098a7367f7c02b438ef2a3fc92fc318641e55acecce6db3f0be14",
+                    "hash" : "0x65150f78111098a7367f7c02b438ef2a3fc92fc318641e55acecce6db3f0be14",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3ed5f4e9fca3f49c087360e52c64ec0773d93180e7e8c0d806687add21bbb4f0",
+                    "hash" : "0x3ed5f4e9fca3f49c087360e52c64ec0773d93180e7e8c0d806687add21bbb4f0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "cdfaffc38d55a43ee4aa17de7c69fb5694ed6300099a8c7c8aff51ff803cb54c",
+                    "hash" : "0xcdfaffc38d55a43ee4aa17de7c69fb5694ed6300099a8c7c8aff51ff803cb54c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGMAfter.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGMAfter.json
index ab81a3f53..35ab80635 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGMAfter.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGMAfter.json
@@ -1,17 +1,17 @@
 {
     "callcallcallcode_001_OOGMAfter" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f8bdb1563d3bfa59ad72beb2da61a648e252f9a626690a34720b4a570c4c53a2",
+                    "hash" : "0xf8bdb1563d3bfa59ad72beb2da61a648e252f9a626690a34720b4a570c4c53a2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f8bdb1563d3bfa59ad72beb2da61a648e252f9a626690a34720b4a570c4c53a2",
+                    "hash" : "0xf8bdb1563d3bfa59ad72beb2da61a648e252f9a626690a34720b4a570c4c53a2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3d6bf725e57e6ea3481ed50a8f0338c92858bdf33c36fdb336b5d1b1d3fdb646",
+                    "hash" : "0x3d6bf725e57e6ea3481ed50a8f0338c92858bdf33c36fdb336b5d1b1d3fdb646",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "59d69179aa4aaa0694c84e6c803e6d9fb3932568a197083bb0b7ac9ba1f01559",
+                    "hash" : "0x59d69179aa4aaa0694c84e6c803e6d9fb3932568a197083bb0b7ac9ba1f01559",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f8bdb1563d3bfa59ad72beb2da61a648e252f9a626690a34720b4a570c4c53a2",
+                    "hash" : "0xf8bdb1563d3bfa59ad72beb2da61a648e252f9a626690a34720b4a570c4c53a2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c95f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGMBefore.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGMBefore.json
index 5e61d3e3a..a3cb45aa1 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGMBefore.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGMBefore.json
@@ -1,17 +1,17 @@
 {
     "callcallcallcode_001_OOGMBefore" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9fced33b7f3a5e0cda69c0a1f740e9b9ed19ac28ad3ab688987097295b789dae",
+                    "hash" : "0x9fced33b7f3a5e0cda69c0a1f740e9b9ed19ac28ad3ab688987097295b789dae",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9fced33b7f3a5e0cda69c0a1f740e9b9ed19ac28ad3ab688987097295b789dae",
+                    "hash" : "0x9fced33b7f3a5e0cda69c0a1f740e9b9ed19ac28ad3ab688987097295b789dae",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "0ad5da491a6675898a0c114d18a8206f71478b5c24501a505ab13c8b18d98f44",
+                    "hash" : "0x0ad5da491a6675898a0c114d18a8206f71478b5c24501a505ab13c8b18d98f44",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "0ad5da491a6675898a0c114d18a8206f71478b5c24501a505ab13c8b18d98f44",
+                    "hash" : "0x0ad5da491a6675898a0c114d18a8206f71478b5c24501a505ab13c8b18d98f44",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9fced33b7f3a5e0cda69c0a1f740e9b9ed19ac28ad3ab688987097295b789dae",
+                    "hash" : "0x9fced33b7f3a5e0cda69c0a1f740e9b9ed19ac28ad3ab688987097295b789dae",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016003526040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideEnd.json
index 7a8212f30..634448972 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideEnd.json
@@ -1,17 +1,17 @@
 {
     "callcallcallcode_001_SuicideEnd" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1534f424be2db6a662c26563f80ede2d856bcb3624a889c345a1fab368228468",
+                    "hash" : "0x1534f424be2db6a662c26563f80ede2d856bcb3624a889c345a1fab368228468",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "1534f424be2db6a662c26563f80ede2d856bcb3624a889c345a1fab368228468",
+                    "hash" : "0x1534f424be2db6a662c26563f80ede2d856bcb3624a889c345a1fab368228468",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "fa77ad335655e22519b48bf6bd61d98695799e37c9cf6aa1023e442ae34642ab",
+                    "hash" : "0xfa77ad335655e22519b48bf6bd61d98695799e37c9cf6aa1023e442ae34642ab",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ab907abb189bf104eb0b057ce0e018fe2dc33179cfa437568008a4ada757b531",
+                    "hash" : "0xab907abb189bf104eb0b057ce0e018fe2dc33179cfa437568008a4ada757b531",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "1534f424be2db6a662c26563f80ede2d856bcb3624a889c345a1fab368228468",
+                    "hash" : "0x1534f424be2db6a662c26563f80ede2d856bcb3624a889c345a1fab368228468",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000361c350f4600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideMiddle.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideMiddle.json
index f13d2874b..91d6256f9 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideMiddle.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideMiddle.json
@@ -1,17 +1,17 @@
 {
     "callcallcallcode_001_SuicideMiddle" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d9620bfd8663f199f897de8e5ea7554639c40fb564940dfc8f0b2aa7a2a8a0e8",
+                    "hash" : "0xd9620bfd8663f199f897de8e5ea7554639c40fb564940dfc8f0b2aa7a2a8a0e8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d9620bfd8663f199f897de8e5ea7554639c40fb564940dfc8f0b2aa7a2a8a0e8",
+                    "hash" : "0xd9620bfd8663f199f897de8e5ea7554639c40fb564940dfc8f0b2aa7a2a8a0e8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "23f8f86852e3e4a2e279acb10d051dda77dcf6af0c37ce21c97d73ece5af9951",
+                    "hash" : "0x23f8f86852e3e4a2e279acb10d051dda77dcf6af0c37ce21c97d73ece5af9951",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "23f8f86852e3e4a2e279acb10d051dda77dcf6af0c37ce21c97d73ece5af9951",
+                    "hash" : "0x23f8f86852e3e4a2e279acb10d051dda77dcf6af0c37ce21c97d73ece5af9951",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d9620bfd8663f199f897de8e5ea7554639c40fb564940dfc8f0b2aa7a2a8a0e8",
+                    "hash" : "0xd9620bfd8663f199f897de8e5ea7554639c40fb564940dfc8f0b2aa7a2a8a0e8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff604060006040600073100000000000000000000000000000000000000361c350f4600255",
+                "code" : "0x731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_ABCB_RECURSIVE.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_ABCB_RECURSIVE.json
index cda6fa84c..25f0550e9 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_ABCB_RECURSIVE.json
@@ -1,17 +1,17 @@
 {
     "callcallcallcode_ABCB_RECURSIVE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0xb2d05e00",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c27d05512a5a4b84992bf299fb5c834c28dd0333321530e29932f6277f68f7b8",
+                    "hash" : "0xc27d05512a5a4b84992bf299fb5c834c28dd0333321530e29932f6277f68f7b8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c27d05512a5a4b84992bf299fb5c834c28dd0333321530e29932f6277f68f7b8",
+                    "hash" : "0xc27d05512a5a4b84992bf299fb5c834c28dd0333321530e29932f6277f68f7b8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5b5cfac5946c765d869e802b7482c191a8bf64151c7e1e08b673ca39e7ccfa22",
+                    "hash" : "0x5b5cfac5946c765d869e802b7482c191a8bf64151c7e1e08b673ca39e7ccfa22",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "762c0d51eead52e52ba3d4f91f7d8171c0c4e7cd790646efc3c1b4d211f26bbc",
+                    "hash" : "0x762c0d51eead52e52ba3d4f91f7d8171c0c4e7cd790646efc3c1b4d211f26bbc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c27d05512a5a4b84992bf299fb5c834c28dd0333321530e29932f6277f68f7b8",
+                    "hash" : "0xc27d05512a5a4b84992bf299fb5c834c28dd0333321530e29932f6277f68f7b8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060007310000000000000000000000000000000000000016207a120f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "0x01c9c380"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcode_01.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcode_01.json
index 68f70059a..9f5aa0a00 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcode_01.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcode_01.json
@@ -1,17 +1,17 @@
 {
     "callcallcode_01" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a819526ad66ad27126ecd20211deb2601c3991b8e71f024fe082e51e0160b817",
+                    "hash" : "0xa819526ad66ad27126ecd20211deb2601c3991b8e71f024fe082e51e0160b817",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a819526ad66ad27126ecd20211deb2601c3991b8e71f024fe082e51e0160b817",
+                    "hash" : "0xa819526ad66ad27126ecd20211deb2601c3991b8e71f024fe082e51e0160b817",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a1a1911a4eb684586df9ee38788a160da83fd60a17486bbc0f89de47c887b685",
+                    "hash" : "0xa1a1911a4eb684586df9ee38788a160da83fd60a17486bbc0f89de47c887b685",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a18dc967dd0b754fdd8563704ba3296e2e292861372d7a5fd37d792408b3bf9d",
+                    "hash" : "0xa18dc967dd0b754fdd8563704ba3296e2e292861372d7a5fd37d792408b3bf9d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a819526ad66ad27126ecd20211deb2601c3991b8e71f024fe082e51e0160b817",
+                    "hash" : "0xa819526ad66ad27126ecd20211deb2601c3991b8e71f024fe082e51e0160b817",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060007310000000000000000000000000000000000000026203d090f4600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160025533600455346007553060e6553260e8553660ec553860ee553a60f055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcode_01_OOGE.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcode_01_OOGE.json
index af3d98c52..23a267a2f 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcode_01_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcode_01_OOGE.json
@@ -1,17 +1,17 @@
 {
     "callcallcode_01_OOGE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f735212b3c05f40a30e49ec6644be56edadc3ca8300405191de66713b1a0a848",
+                    "hash" : "0xf735212b3c05f40a30e49ec6644be56edadc3ca8300405191de66713b1a0a848",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f735212b3c05f40a30e49ec6644be56edadc3ca8300405191de66713b1a0a848",
+                    "hash" : "0xf735212b3c05f40a30e49ec6644be56edadc3ca8300405191de66713b1a0a848",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "58bd8e5e0a2a10343a8aa198fcd4081e5baf2accea54fb6146da1589001dbda0",
+                    "hash" : "0x58bd8e5e0a2a10343a8aa198fcd4081e5baf2accea54fb6146da1589001dbda0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "2d785a5d6ef979e0832d69550bb76d87c26b11e77452955175166f5508ce44de",
+                    "hash" : "0x2d785a5d6ef979e0832d69550bb76d87c26b11e77452955175166f5508ce44de",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f735212b3c05f40a30e49ec6644be56edadc3ca8300405191de66713b1a0a848",
+                    "hash" : "0xf735212b3c05f40a30e49ec6644be56edadc3ca8300405191de66713b1a0a848",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002614e34f4600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016002556001600252",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcode_01_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcode_01_SuicideEnd.json
index 1965ede5e..e789eb8da 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcode_01_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcode_01_SuicideEnd.json
@@ -1,17 +1,17 @@
 {
     "callcallcode_01_SuicideEnd" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6f58a4741fbda67c55a345c1078f702db8e99193f6818b1c34f68dc235c4697e",
+                    "hash" : "0x6f58a4741fbda67c55a345c1078f702db8e99193f6818b1c34f68dc235c4697e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6f58a4741fbda67c55a345c1078f702db8e99193f6818b1c34f68dc235c4697e",
+                    "hash" : "0x6f58a4741fbda67c55a345c1078f702db8e99193f6818b1c34f68dc235c4697e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f95ab7327f9830d8a680b832843fd9244398f0684e5f53b2b13f381d61465796",
+                    "hash" : "0xf95ab7327f9830d8a680b832843fd9244398f0684e5f53b2b13f381d61465796",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9751e0f615a165be9d65bb11c5ca914053231f0657f182ae2c88dd71887b0292",
+                    "hash" : "0x9751e0f615a165be9d65bb11c5ca914053231f0657f182ae2c88dd71887b0292",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6f58a4741fbda67c55a345c1078f702db8e99193f6818b1c34f68dc235c4697e",
+                    "hash" : "0x6f58a4741fbda67c55a345c1078f702db8e99193f6818b1c34f68dc235c4697e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000261c350f4600155731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010.json
index 51e0bd743..a70f9a732 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010.json
@@ -1,17 +1,17 @@
 {
     "callcallcodecall_010" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "61f5de6f4a1d6c6a89bf557acc31ef7a4102a2b4eb68f9e9742f9d262976f40d",
+                    "hash" : "0x61f5de6f4a1d6c6a89bf557acc31ef7a4102a2b4eb68f9e9742f9d262976f40d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "61f5de6f4a1d6c6a89bf557acc31ef7a4102a2b4eb68f9e9742f9d262976f40d",
+                    "hash" : "0x61f5de6f4a1d6c6a89bf557acc31ef7a4102a2b4eb68f9e9742f9d262976f40d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "18da459a32ad5fe5d2d669798bb12ea8e83a4313420c8c03acbbb0785ad078d1",
+                    "hash" : "0x18da459a32ad5fe5d2d669798bb12ea8e83a4313420c8c03acbbb0785ad078d1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "1c44ef0912070c41f6911fc66e94c69d470c262788d10a7293db822da61e2e5a",
+                    "hash" : "0x1c44ef0912070c41f6911fc66e94c69d470c262788d10a7293db822da61e2e5a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "61f5de6f4a1d6c6a89bf557acc31ef7a4102a2b4eb68f9e9742f9d262976f40d",
+                    "hash" : "0x61f5de6f4a1d6c6a89bf557acc31ef7a4102a2b4eb68f9e9742f9d262976f40d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002620493e0f4600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060027310000000000000000000000000000000000000036203d090f160025533600555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGE.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGE.json
index 9fb3b5718..0ac2f7d89 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGE.json
@@ -1,17 +1,17 @@
 {
     "callcallcodecall_010_OOGE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "10853b1a73cad5f5a81e21460d352517ccb9fd4a87b71974a9757418a20c5d5f",
+                    "hash" : "0x10853b1a73cad5f5a81e21460d352517ccb9fd4a87b71974a9757418a20c5d5f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "10853b1a73cad5f5a81e21460d352517ccb9fd4a87b71974a9757418a20c5d5f",
+                    "hash" : "0x10853b1a73cad5f5a81e21460d352517ccb9fd4a87b71974a9757418a20c5d5f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "39075ac2b96734a2f5a36896563ec63ad13a2e0b3177634bc4e88e067a268caf",
+                    "hash" : "0x39075ac2b96734a2f5a36896563ec63ad13a2e0b3177634bc4e88e067a268caf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9f039f39d7db381048d2c7f421ba3dcbbccd3c5c9ec14545142cb189f2f3a699",
+                    "hash" : "0x9f039f39d7db381048d2c7f421ba3dcbbccd3c5c9ec14545142cb189f2f3a699",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "10853b1a73cad5f5a81e21460d352517ccb9fd4a87b71974a9757418a20c5d5f",
+                    "hash" : "0x10853b1a73cad5f5a81e21460d352517ccb9fd4a87b71974a9757418a20c5d5f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGMAfter.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGMAfter.json
index 64d92567c..4c24de1df 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGMAfter.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGMAfter.json
@@ -1,17 +1,17 @@
 {
     "callcallcodecall_010_OOGMAfter" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "25eb00ab4fb36d94c41162afd9e87daf94cc10f2ccc7bd6c3b8199092996c0fa",
+                    "hash" : "0x25eb00ab4fb36d94c41162afd9e87daf94cc10f2ccc7bd6c3b8199092996c0fa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "25eb00ab4fb36d94c41162afd9e87daf94cc10f2ccc7bd6c3b8199092996c0fa",
+                    "hash" : "0x25eb00ab4fb36d94c41162afd9e87daf94cc10f2ccc7bd6c3b8199092996c0fa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "60c4f8cfe444a136e9b4bd6dc4619484fbabe8dea905ee61b243f8e2568f9b42",
+                    "hash" : "0x60c4f8cfe444a136e9b4bd6dc4619484fbabe8dea905ee61b243f8e2568f9b42",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "60c4f8cfe444a136e9b4bd6dc4619484fbabe8dea905ee61b243f8e2568f9b42",
+                    "hash" : "0x60c4f8cfe444a136e9b4bd6dc4619484fbabe8dea905ee61b243f8e2568f9b42",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "25eb00ab4fb36d94c41162afd9e87daf94cc10f2ccc7bd6c3b8199092996c0fa",
+                    "hash" : "0x25eb00ab4fb36d94c41162afd9e87daf94cc10f2ccc7bd6c3b8199092996c0fa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e48f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGMBefore.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGMBefore.json
index a3e888fa3..c2cdfaa2d 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGMBefore.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGMBefore.json
@@ -1,17 +1,17 @@
 {
     "callcallcodecall_010_OOGMBefore" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "52834244609f998d9947ae2b1835e3c9ea06b00e0d9305b4d23270ac898b40b4",
+                    "hash" : "0x52834244609f998d9947ae2b1835e3c9ea06b00e0d9305b4d23270ac898b40b4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "52834244609f998d9947ae2b1835e3c9ea06b00e0d9305b4d23270ac898b40b4",
+                    "hash" : "0x52834244609f998d9947ae2b1835e3c9ea06b00e0d9305b4d23270ac898b40b4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "08d2ffd31983c5a8cc055ee62f802c0b6108a0d6788aba50a13af6fd421df914",
+                    "hash" : "0x08d2ffd31983c5a8cc055ee62f802c0b6108a0d6788aba50a13af6fd421df914",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "7fd4f5d1ebcdc93d418e041de75384830ef611cf282bc351966f8857f70f81b8",
+                    "hash" : "0x7fd4f5d1ebcdc93d418e041de75384830ef611cf282bc351966f8857f70f81b8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "52834244609f998d9947ae2b1835e3c9ea06b00e0d9305b4d23270ac898b40b4",
+                    "hash" : "0x52834244609f998d9947ae2b1835e3c9ea06b00e0d9305b4d23270ac898b40b4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f4600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideEnd.json
index 6ad35a7d3..6d53f394d 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideEnd.json
@@ -1,17 +1,17 @@
 {
     "callcallcodecall_010_SuicideEnd" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "5d36e3deca887b7e689729a6ac5defd43e1f3090a438db45ecf1ad9931be0baa",
+                    "hash" : "0x5d36e3deca887b7e689729a6ac5defd43e1f3090a438db45ecf1ad9931be0baa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "5d36e3deca887b7e689729a6ac5defd43e1f3090a438db45ecf1ad9931be0baa",
+                    "hash" : "0x5d36e3deca887b7e689729a6ac5defd43e1f3090a438db45ecf1ad9931be0baa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e06200e6ce7ae99be8a4d0b6df78b1d148674a285b87feb917793dfb11f816a6",
+                    "hash" : "0xe06200e6ce7ae99be8a4d0b6df78b1d148674a285b87feb917793dfb11f816a6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "888b18fb69500436a74fa0ebc90624960521700689f7831030741c7c9794986c",
+                    "hash" : "0x888b18fb69500436a74fa0ebc90624960521700689f7831030741c7c9794986c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "5d36e3deca887b7e689729a6ac5defd43e1f3090a438db45ecf1ad9931be0baa",
+                    "hash" : "0x5d36e3deca887b7e689729a6ac5defd43e1f3090a438db45ecf1ad9931be0baa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f1600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideMiddle.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideMiddle.json
index 82967edc6..1da7a2436 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideMiddle.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideMiddle.json
@@ -1,17 +1,17 @@
 {
     "callcallcodecall_010_SuicideMiddle" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "ecb9faa9ad20b292ad2dfcb10b31129a5a3d21b410e310c9163c75754c929ae2",
+                    "hash" : "0xef2ded777fb69c06cd9f42c413a1e48b2503667cb7165bf8848c975ae4131b68",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "ecb9faa9ad20b292ad2dfcb10b31129a5a3d21b410e310c9163c75754c929ae2",
+                    "hash" : "0xef2ded777fb69c06cd9f42c413a1e48b2503667cb7165bf8848c975ae4131b68",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "dc71708f3053dad1a8da01056d3fc180ebe5264df116d47d8a5c93c4c0044c16",
+                    "hash" : "0x0288af047e1bb7b1e1ea10edda37040684b22b05a1e3e38291537beab4d31ac6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3cbe1ccd82f9818da35baf7e8ae5a0f7657e96e3650362b19d38fb99f49f79e8",
+                    "hash" : "0xc776b132e512dfb5464a47a06edaa49676a72cc3d707ee365ace6843f57a4609",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "ecb9faa9ad20b292ad2dfcb10b31129a5a3d21b410e310c9163c75754c929ae2",
+                    "hash" : "0xef2ded777fb69c06cd9f42c413a1e48b2503667cb7165bf8848c975ae4131b68",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f1600255",
+                "code" : "0x731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_ABCB_RECURSIVE.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_ABCB_RECURSIVE.json
index 20033d55b..c22522b4f 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_ABCB_RECURSIVE.json
@@ -1,17 +1,17 @@
 {
     "callcallcodecall_ABCB_RECURSIVE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0xb2d05e00",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e603e736b2478aff19fe9c113e4fdca7d5ed961015b595e5489a963c449ec96d",
+                    "hash" : "0xe603e736b2478aff19fe9c113e4fdca7d5ed961015b595e5489a963c449ec96d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e603e736b2478aff19fe9c113e4fdca7d5ed961015b595e5489a963c449ec96d",
+                    "hash" : "0xe603e736b2478aff19fe9c113e4fdca7d5ed961015b595e5489a963c449ec96d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "bdb6c983fad4693b8f9ef27f7a91bedeb33020ee10a4419de32280cda60d2308",
+                    "hash" : "0xbdb6c983fad4693b8f9ef27f7a91bedeb33020ee10a4419de32280cda60d2308",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b33718f9ef9b057d00eeb35b94c5998bf59c8faa3cc0343b732a7d037e8e3e11",
+                    "hash" : "0xb33718f9ef9b057d00eeb35b94c5998bf59c8faa3cc0343b732a7d037e8e3e11",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e603e736b2478aff19fe9c113e4fdca7d5ed961015b595e5489a963c449ec96d",
+                    "hash" : "0xe603e736b2478aff19fe9c113e4fdca7d5ed961015b595e5489a963c449ec96d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002620f4240f4600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "0x01c9c380"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011.json
index b348a4b0e..285850777 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011.json
@@ -1,17 +1,17 @@
 {
     "callcallcodecallcode_011" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "85c03d931c3f5077955845ef94d8f4adeeb04d0a0ebc4e8323cb9ef8891a600a",
+                    "hash" : "0x85c03d931c3f5077955845ef94d8f4adeeb04d0a0ebc4e8323cb9ef8891a600a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "85c03d931c3f5077955845ef94d8f4adeeb04d0a0ebc4e8323cb9ef8891a600a",
+                    "hash" : "0x85c03d931c3f5077955845ef94d8f4adeeb04d0a0ebc4e8323cb9ef8891a600a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "ba6ef1b69820a7ad8995c4e63c6041d9cb7e757ef25aac97394ad02388f04bd4",
+                    "hash" : "0xba6ef1b69820a7ad8995c4e63c6041d9cb7e757ef25aac97394ad02388f04bd4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "13ca8e995f548f339ea686f3e5915454936c78c06a32637f9b19c30afab93cd2",
+                    "hash" : "0x13ca8e995f548f339ea686f3e5915454936c78c06a32637f9b19c30afab93cd2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "85c03d931c3f5077955845ef94d8f4adeeb04d0a0ebc4e8323cb9ef8891a600a",
+                    "hash" : "0x85c03d931c3f5077955845ef94d8f4adeeb04d0a0ebc4e8323cb9ef8891a600a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002620493e0f4600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060007310000000000000000000000000000000000000036203d090f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGE.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGE.json
index c120b5245..67dc2344b 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGE.json
@@ -1,17 +1,17 @@
 {
     "callcallcodecallcode_011_OOGE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1ea792061c27067d2bdce78e7d8ff18758c568268300832bf393a7626eedf4a1",
+                    "hash" : "0x1ea792061c27067d2bdce78e7d8ff18758c568268300832bf393a7626eedf4a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "1ea792061c27067d2bdce78e7d8ff18758c568268300832bf393a7626eedf4a1",
+                    "hash" : "0x1ea792061c27067d2bdce78e7d8ff18758c568268300832bf393a7626eedf4a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3a2c894b5ff321d4aded923d0bf5c001e32bcb59a14573dace4e62a3a0adac84",
+                    "hash" : "0x3a2c894b5ff321d4aded923d0bf5c001e32bcb59a14573dace4e62a3a0adac84",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "7927f6a33fbcf1038594c4e4c2ebf251ad384f96d9a415264f5ad8a8addea455",
+                    "hash" : "0x7927f6a33fbcf1038594c4e4c2ebf251ad384f96d9a415264f5ad8a8addea455",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "1ea792061c27067d2bdce78e7d8ff18758c568268300832bf393a7626eedf4a1",
+                    "hash" : "0x1ea792061c27067d2bdce78e7d8ff18758c568268300832bf393a7626eedf4a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGMAfter.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGMAfter.json
index 1d5f0ff45..2b508c456 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGMAfter.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGMAfter.json
@@ -1,17 +1,17 @@
 {
     "callcallcodecallcode_011_OOGMAfter" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "dd118bf6242fb4b338d4e7296394fd9b163a073146a4dea27799249382b2ccb1",
+                    "hash" : "0xdd118bf6242fb4b338d4e7296394fd9b163a073146a4dea27799249382b2ccb1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "dd118bf6242fb4b338d4e7296394fd9b163a073146a4dea27799249382b2ccb1",
+                    "hash" : "0xdd118bf6242fb4b338d4e7296394fd9b163a073146a4dea27799249382b2ccb1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "953f39215417f53317d23e5a28ff959337d00e9f1507b5c1617499d6b518613f",
+                    "hash" : "0x953f39215417f53317d23e5a28ff959337d00e9f1507b5c1617499d6b518613f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "953f39215417f53317d23e5a28ff959337d00e9f1507b5c1617499d6b518613f",
+                    "hash" : "0x953f39215417f53317d23e5a28ff959337d00e9f1507b5c1617499d6b518613f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "dd118bf6242fb4b338d4e7296394fd9b163a073146a4dea27799249382b2ccb1",
+                    "hash" : "0xdd118bf6242fb4b338d4e7296394fd9b163a073146a4dea27799249382b2ccb1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaecf1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGMBefore.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGMBefore.json
index 9128fc80a..47ff3f6bb 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGMBefore.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGMBefore.json
@@ -1,17 +1,17 @@
 {
     "callcallcodecallcode_011_OOGMBefore" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6af01ac747656fe7a05d5a259f623988075b9d891259fe5d786599d38abc8726",
+                    "hash" : "0x6af01ac747656fe7a05d5a259f623988075b9d891259fe5d786599d38abc8726",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6af01ac747656fe7a05d5a259f623988075b9d891259fe5d786599d38abc8726",
+                    "hash" : "0x6af01ac747656fe7a05d5a259f623988075b9d891259fe5d786599d38abc8726",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "bb6c7b0f5226add8fd9ed68a88fdb017f600c3d2ee4458e34f72056d0f5b41cd",
+                    "hash" : "0xbb6c7b0f5226add8fd9ed68a88fdb017f600c3d2ee4458e34f72056d0f5b41cd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3f1c7273386c298f5392261a497d7556caa3329f90f938005f9ea59f2a9dfcc2",
+                    "hash" : "0x3f1c7273386c298f5392261a497d7556caa3329f90f938005f9ea59f2a9dfcc2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6af01ac747656fe7a05d5a259f623988075b9d891259fe5d786599d38abc8726",
+                    "hash" : "0x6af01ac747656fe7a05d5a259f623988075b9d891259fe5d786599d38abc8726",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f4600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016003526040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideEnd.json
index 77b1be7c9..5e4a51a70 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideEnd.json
@@ -1,17 +1,17 @@
 {
     "callcallcodecallcode_011_SuicideEnd" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "0145b68510b90b05b3b63a6697919fdfd9b241a631b51dfd6667896ee28bac67",
+                    "hash" : "0x0145b68510b90b05b3b63a6697919fdfd9b241a631b51dfd6667896ee28bac67",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "0145b68510b90b05b3b63a6697919fdfd9b241a631b51dfd6667896ee28bac67",
+                    "hash" : "0x0145b68510b90b05b3b63a6697919fdfd9b241a631b51dfd6667896ee28bac67",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "8078b41dcef7f0ca4654ea4612274e0307ee6b78224aa1c2d4ab002956304281",
+                    "hash" : "0x8078b41dcef7f0ca4654ea4612274e0307ee6b78224aa1c2d4ab002956304281",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f2b42a2ee391f7845a214c1f2a6c77ccfacdef2cb8eb81407a4c52ca75d897c8",
+                    "hash" : "0xf2b42a2ee391f7845a214c1f2a6c77ccfacdef2cb8eb81407a4c52ca75d897c8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0145b68510b90b05b3b63a6697919fdfd9b241a631b51dfd6667896ee28bac67",
+                    "hash" : "0x0145b68510b90b05b3b63a6697919fdfd9b241a631b51dfd6667896ee28bac67",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000361c350f4600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideMiddle.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideMiddle.json
index 1ba6f5df8..ec74018e3 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideMiddle.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideMiddle.json
@@ -1,17 +1,17 @@
 {
     "callcallcodecallcode_011_SuicideMiddle" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "60fc1a843b129664a36e5c5275396f2874c08622f3558bae2ddb4c8d4d99cafb",
+                    "hash" : "0xef2ded777fb69c06cd9f42c413a1e48b2503667cb7165bf8848c975ae4131b68",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "60fc1a843b129664a36e5c5275396f2874c08622f3558bae2ddb4c8d4d99cafb",
+                    "hash" : "0xef2ded777fb69c06cd9f42c413a1e48b2503667cb7165bf8848c975ae4131b68",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e7898b1b480c55c7234472a7b54c36df823ca224538c28e53e2a8bcd2af50ac3",
+                    "hash" : "0x0288af047e1bb7b1e1ea10edda37040684b22b05a1e3e38291537beab4d31ac6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "1b3f52b1bf5ca594592a4cc9fbbce1b09620f5523bc8aafe8b985d541758cc52",
+                    "hash" : "0xc776b132e512dfb5464a47a06edaa49676a72cc3d707ee365ace6843f57a4609",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "60fc1a843b129664a36e5c5275396f2874c08622f3558bae2ddb4c8d4d99cafb",
+                    "hash" : "0xef2ded777fb69c06cd9f42c413a1e48b2503667cb7165bf8848c975ae4131b68",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff604060006040600073100000000000000000000000000000000000000361c350f4600255",
+                "code" : "0x731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_ABCB_RECURSIVE.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_ABCB_RECURSIVE.json
index f5da18dde..18b0c067b 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_ABCB_RECURSIVE.json
@@ -1,17 +1,17 @@
 {
     "callcallcodecallcode_ABCB_RECURSIVE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0xb2d05e00",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1bdb315f1b62639188fb3c2c654d43b6364dd8320f2d2f782537ae1d75b69f3a",
+                    "hash" : "0x1bdb315f1b62639188fb3c2c654d43b6364dd8320f2d2f782537ae1d75b69f3a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "1bdb315f1b62639188fb3c2c654d43b6364dd8320f2d2f782537ae1d75b69f3a",
+                    "hash" : "0x1bdb315f1b62639188fb3c2c654d43b6364dd8320f2d2f782537ae1d75b69f3a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "553dc493aee58271db97e8548de28ce210118dcc2ea5cb0e8817e11692843c91",
+                    "hash" : "0x553dc493aee58271db97e8548de28ce210118dcc2ea5cb0e8817e11692843c91",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "71190006f0b807a2903a9eeef286858dde45dc9601578f3cd4d16c2f1d468e48",
+                    "hash" : "0x71190006f0b807a2903a9eeef286858dde45dc9601578f3cd4d16c2f1d468e48",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "1bdb315f1b62639188fb3c2c654d43b6364dd8320f2d2f782537ae1d75b69f3a",
+                    "hash" : "0x1bdb315f1b62639188fb3c2c654d43b6364dd8320f2d2f782537ae1d75b69f3a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002620f4240f4600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060007310000000000000000000000000000000000000016207a120f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "0x01c9c380"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecall_10.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecall_10.json
index 933068d0c..7fd5914d7 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecall_10.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecall_10.json
@@ -1,17 +1,17 @@
 {
     "callcodecall_10" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "dc6bb994c348a1f1b201d7f9cc73d05fa388c874bdb660a622fdd97e69beeaf9",
+                    "hash" : "0xdc6bb994c348a1f1b201d7f9cc73d05fa388c874bdb660a622fdd97e69beeaf9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "dc6bb994c348a1f1b201d7f9cc73d05fa388c874bdb660a622fdd97e69beeaf9",
+                    "hash" : "0xdc6bb994c348a1f1b201d7f9cc73d05fa388c874bdb660a622fdd97e69beeaf9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "42ebad2ea8c83e4e7487ee8fbd8596a659787db7e254e4b6b19b297102e3a9f0",
+                    "hash" : "0x42ebad2ea8c83e4e7487ee8fbd8596a659787db7e254e4b6b19b297102e3a9f0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "11e907470a071cc8ed741079998b534218bcf64bf8eaff0bf30e75e08c475e9c",
+                    "hash" : "0x11e907470a071cc8ed741079998b534218bcf64bf8eaff0bf30e75e08c475e9c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "dc6bb994c348a1f1b201d7f9cc73d05fa388c874bdb660a622fdd97e69beeaf9",
+                    "hash" : "0xdc6bb994c348a1f1b201d7f9cc73d05fa388c874bdb660a622fdd97e69beeaf9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000162055730f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060017310000000000000000000000000000000000000026203d090f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160025533600455346007553060e6553260e8553660ec553860ee553a60f055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecall_10_OOGE.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecall_10_OOGE.json
index cc00990fb..da1c7f6a7 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecall_10_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecall_10_OOGE.json
@@ -1,17 +1,17 @@
 {
     "callcodecall_10_OOGE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d8dab02b1b06bb27af0e543afb99418fe7fd649ef4427dfc455c7d3a47cd5d63",
+                    "hash" : "0xd8dab02b1b06bb27af0e543afb99418fe7fd649ef4427dfc455c7d3a47cd5d63",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d8dab02b1b06bb27af0e543afb99418fe7fd649ef4427dfc455c7d3a47cd5d63",
+                    "hash" : "0xd8dab02b1b06bb27af0e543afb99418fe7fd649ef4427dfc455c7d3a47cd5d63",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "27f21273e3c30026be11401fea844845410f6c5ee717ddb6ff72763bf472c10b",
+                    "hash" : "0x27f21273e3c30026be11401fea844845410f6c5ee717ddb6ff72763bf472c10b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "959160347b671918c4a4ec0c9eaea0928221bd063b775a32b215b3f2077ff4e7",
+                    "hash" : "0x959160347b671918c4a4ec0c9eaea0928221bd063b775a32b215b3f2077ff4e7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d8dab02b1b06bb27af0e543afb99418fe7fd649ef4427dfc455c7d3a47cd5d63",
+                    "hash" : "0xd8dab02b1b06bb27af0e543afb99418fe7fd649ef4427dfc455c7d3a47cd5d63",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016002556001600252",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecall_10_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecall_10_SuicideEnd.json
index 5ef2af463..62b4eff32 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecall_10_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecall_10_SuicideEnd.json
@@ -1,17 +1,17 @@
 {
     "callcodecall_10_SuicideEnd" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "009814dfa849443dad38895eed5ea659402323c415d6300a1a17d61fa461bf0a",
+                    "hash" : "0x009814dfa849443dad38895eed5ea659402323c415d6300a1a17d61fa461bf0a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "009814dfa849443dad38895eed5ea659402323c415d6300a1a17d61fa461bf0a",
+                    "hash" : "0x009814dfa849443dad38895eed5ea659402323c415d6300a1a17d61fa461bf0a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "862825790db9c97d965a56199cf335583d15f15eb79714d664f6a38b5c0823f3",
+                    "hash" : "0x862825790db9c97d965a56199cf335583d15f15eb79714d664f6a38b5c0823f3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4ecbb5c54ea61600a16049c95caea71f3542b2bf48f9260cb8d5526b34eb32c5",
+                    "hash" : "0x4ecbb5c54ea61600a16049c95caea71f3542b2bf48f9260cb8d5526b34eb32c5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "009814dfa849443dad38895eed5ea659402323c415d6300a1a17d61fa461bf0a",
+                    "hash" : "0x009814dfa849443dad38895eed5ea659402323c415d6300a1a17d61fa461bf0a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000261c350f1600155731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100.json
index b09703b44..22421c585 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcall_100" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "dac6f0f3c94347378cae2101d22b87b2c34cc88bfd84082aa8efe16dc3d24a20",
+                    "hash" : "0xdac6f0f3c94347378cae2101d22b87b2c34cc88bfd84082aa8efe16dc3d24a20",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "dac6f0f3c94347378cae2101d22b87b2c34cc88bfd84082aa8efe16dc3d24a20",
+                    "hash" : "0xdac6f0f3c94347378cae2101d22b87b2c34cc88bfd84082aa8efe16dc3d24a20",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "7bdd25aff444fec6b4e24b7cb10ed1fbc8d8de8bfdafdc291fcf860cf790ff9e",
+                    "hash" : "0x7bdd25aff444fec6b4e24b7cb10ed1fbc8d8de8bfdafdc291fcf860cf790ff9e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "91e03f033209ebaab3452c315004575c99c8344298b060aaa02b0573b3658dd4",
+                    "hash" : "0x91e03f033209ebaab3452c315004575c99c8344298b060aaa02b0573b3658dd4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "dac6f0f3c94347378cae2101d22b87b2c34cc88bfd84082aa8efe16dc3d24a20",
+                    "hash" : "0xdac6f0f3c94347378cae2101d22b87b2c34cc88bfd84082aa8efe16dc3d24a20",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000162055730f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006001731000000000000000000000000000000000000002620493e0f160015533600555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060027310000000000000000000000000000000000000036203d090f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGE.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGE.json
index c41f7fd01..ff429ea89 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGE.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcall_100_OOGE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "47eabe756b689cbc9059a8887d3e68374f01efb1fa7ede6230a3b02d4387a25d",
+                    "hash" : "0x47eabe756b689cbc9059a8887d3e68374f01efb1fa7ede6230a3b02d4387a25d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "47eabe756b689cbc9059a8887d3e68374f01efb1fa7ede6230a3b02d4387a25d",
+                    "hash" : "0x47eabe756b689cbc9059a8887d3e68374f01efb1fa7ede6230a3b02d4387a25d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5ce9fac023698c5e84f821f8f29391aae92d8d9b09c2463e2407e508e41a814a",
+                    "hash" : "0x5ce9fac023698c5e84f821f8f29391aae92d8d9b09c2463e2407e508e41a814a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f96c63546af60b45af65062e78d27662a4a5d16a8474de15d2177a37c0a5543c",
+                    "hash" : "0xf96c63546af60b45af65062e78d27662a4a5d16a8474de15d2177a37c0a5543c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "47eabe756b689cbc9059a8887d3e68374f01efb1fa7ede6230a3b02d4387a25d",
+                    "hash" : "0x47eabe756b689cbc9059a8887d3e68374f01efb1fa7ede6230a3b02d4387a25d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGMAfter.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGMAfter.json
index f58610d05..209552852 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGMAfter.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGMAfter.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcall_100_OOGMAfter" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a50cb0d18f5a8f36f9db0aa1bdf1c77f149dd4e941b7d4cc5e5710a78f3f0b56",
+                    "hash" : "0xa50cb0d18f5a8f36f9db0aa1bdf1c77f149dd4e941b7d4cc5e5710a78f3f0b56",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a50cb0d18f5a8f36f9db0aa1bdf1c77f149dd4e941b7d4cc5e5710a78f3f0b56",
+                    "hash" : "0xa50cb0d18f5a8f36f9db0aa1bdf1c77f149dd4e941b7d4cc5e5710a78f3f0b56",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "46dd20e8074230b6e3dc9d29cea3d5b5aeabc6032c31d751130053cb15cb917f",
+                    "hash" : "0x46dd20e8074230b6e3dc9d29cea3d5b5aeabc6032c31d751130053cb15cb917f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "d6eff2dc4e89f3ba043d1c75f6e19070f941a1c617f3d4a81c2d22faf2c8f395",
+                    "hash" : "0xd6eff2dc4e89f3ba043d1c75f6e19070f941a1c617f3d4a81c2d22faf2c8f395",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a50cb0d18f5a8f36f9db0aa1bdf1c77f149dd4e941b7d4cc5e5710a78f3f0b56",
+                    "hash" : "0xa50cb0d18f5a8f36f9db0aa1bdf1c77f149dd4e941b7d4cc5e5710a78f3f0b56",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGMBefore.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGMBefore.json
index ecb02a0f1..1536325bf 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGMBefore.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGMBefore.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcall_100_OOGMBefore" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1f16f1d619b0ae40d7567b36ecd3e40120ec827138d95448fb3ab70ae09d7750",
+                    "hash" : "0x1f16f1d619b0ae40d7567b36ecd3e40120ec827138d95448fb3ab70ae09d7750",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "1f16f1d619b0ae40d7567b36ecd3e40120ec827138d95448fb3ab70ae09d7750",
+                    "hash" : "0x1f16f1d619b0ae40d7567b36ecd3e40120ec827138d95448fb3ab70ae09d7750",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "73cabd721338079ff25a73d252530a8273e3017f76fb88926d56d9f71788a52a",
+                    "hash" : "0x73cabd721338079ff25a73d252530a8273e3017f76fb88926d56d9f71788a52a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "38a2f97a93932ee353182a749b8ced8f720ce2f956bfd94031374a8d0c1e0220",
+                    "hash" : "0x38a2f97a93932ee353182a749b8ced8f720ce2f956bfd94031374a8d0c1e0220",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "1f16f1d619b0ae40d7567b36ecd3e40120ec827138d95448fb3ab70ae09d7750",
+                    "hash" : "0x1f16f1d619b0ae40d7567b36ecd3e40120ec827138d95448fb3ab70ae09d7750",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideEnd.json
index eeee8414a..1623a4769 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideEnd.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcall_100_SuicideEnd" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "18f41d43d843148837b34e206d699dd98a617ca5fe9c1b16338e92dff9e070ed",
+                    "hash" : "0x18f41d43d843148837b34e206d699dd98a617ca5fe9c1b16338e92dff9e070ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "18f41d43d843148837b34e206d699dd98a617ca5fe9c1b16338e92dff9e070ed",
+                    "hash" : "0x18f41d43d843148837b34e206d699dd98a617ca5fe9c1b16338e92dff9e070ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "d2700cb3cd66c3ec7d542e3fe0319012fa4426b30b5b3f657eb8df5d92f02041",
+                    "hash" : "0xd2700cb3cd66c3ec7d542e3fe0319012fa4426b30b5b3f657eb8df5d92f02041",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ae1b1c8768f8cbc5827e1fdaa4ea5e037b2d48aac3594cf9854ab34800e10d13",
+                    "hash" : "0xae1b1c8768f8cbc5827e1fdaa4ea5e037b2d48aac3594cf9854ab34800e10d13",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "18f41d43d843148837b34e206d699dd98a617ca5fe9c1b16338e92dff9e070ed",
+                    "hash" : "0x18f41d43d843148837b34e206d699dd98a617ca5fe9c1b16338e92dff9e070ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f1600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideMiddle.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideMiddle.json
index 24fed0c82..87e558d0f 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideMiddle.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideMiddle.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcall_100_SuicideMiddle" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "3601e32b0855ed38b9679700d83cac7cb09832d0635631cc03bc32d47062ac6e",
+                    "hash" : "0x3601e32b0855ed38b9679700d83cac7cb09832d0635631cc03bc32d47062ac6e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "3601e32b0855ed38b9679700d83cac7cb09832d0635631cc03bc32d47062ac6e",
+                    "hash" : "0x3601e32b0855ed38b9679700d83cac7cb09832d0635631cc03bc32d47062ac6e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f55823095b8726eebc3d02fc3647f1c51f3bcb1256a71efb13cf0a95a7a20220",
+                    "hash" : "0x612498d13bc5820996076cadd7ab7bfae2710fce59fc1873bbb64d3d0bf6cb81",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "29414a1701f21d34113676a009ddb109b3e79dcf9fd26dbfe7e16e04f4d805f6",
+                    "hash" : "0x29414a1701f21d34113676a009ddb109b3e79dcf9fd26dbfe7e16e04f4d805f6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "3601e32b0855ed38b9679700d83cac7cb09832d0635631cc03bc32d47062ac6e",
+                    "hash" : "0x3601e32b0855ed38b9679700d83cac7cb09832d0635631cc03bc32d47062ac6e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f1600255",
+                "code" : "0x731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_ABCB_RECURSIVE.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_ABCB_RECURSIVE.json
index a9a2de24e..50e7834bc 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_ABCB_RECURSIVE.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcall_ABCB_RECURSIVE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0xb2d05e00",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "0e7650f4ce186b6f5ecc28b7100df3cf692cdcddde128d71f53fa9a1f333a14d",
+                    "hash" : "0x0e7650f4ce186b6f5ecc28b7100df3cf692cdcddde128d71f53fa9a1f333a14d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "0e7650f4ce186b6f5ecc28b7100df3cf692cdcddde128d71f53fa9a1f333a14d",
+                    "hash" : "0x0e7650f4ce186b6f5ecc28b7100df3cf692cdcddde128d71f53fa9a1f333a14d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f089a77cbe8f12bc917714a45976827bf35f24d096e2c9e605b8f506b3ada038",
+                    "hash" : "0xf089a77cbe8f12bc917714a45976827bf35f24d096e2c9e605b8f506b3ada038",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "56ef374913f7efb50d7859ed06448c08638560f881b3ed2a6ee8de4688aa1850",
+                    "hash" : "0x56ef374913f7efb50d7859ed06448c08638560f881b3ed2a6ee8de4688aa1850",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0e7650f4ce186b6f5ecc28b7100df3cf692cdcddde128d71f53fa9a1f333a14d",
+                    "hash" : "0x0e7650f4ce186b6f5ecc28b7100df3cf692cdcddde128d71f53fa9a1f333a14d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000163017d7840f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "0x01c9c380"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101.json
index ee939c299..15437db92 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcallcode_101" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "84e0417a096444285414996a7385278ecd74564c3e24043887a25c1e4371d9e8",
+                    "hash" : "0x84e0417a096444285414996a7385278ecd74564c3e24043887a25c1e4371d9e8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "84e0417a096444285414996a7385278ecd74564c3e24043887a25c1e4371d9e8",
+                    "hash" : "0x84e0417a096444285414996a7385278ecd74564c3e24043887a25c1e4371d9e8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "cbac6874f08a763e0b27e00000eb33fbc51796ed88b51d479251dac7dd3546f8",
+                    "hash" : "0xcbac6874f08a763e0b27e00000eb33fbc51796ed88b51d479251dac7dd3546f8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "0061db75543976053f51e37e6fa1b6b80bc2e4ad282986ed5831aa87cb731bac",
+                    "hash" : "0x0061db75543976053f51e37e6fa1b6b80bc2e4ad282986ed5831aa87cb731bac",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "84e0417a096444285414996a7385278ecd74564c3e24043887a25c1e4371d9e8",
+                    "hash" : "0x84e0417a096444285414996a7385278ecd74564c3e24043887a25c1e4371d9e8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000162055730f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006001731000000000000000000000000000000000000002620493e0f160015533600555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060007310000000000000000000000000000000000000036203d090f460025533600655",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGE.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGE.json
index c2dd093bd..f9f4759d6 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGE.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcallcode_101_OOGE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "8262d21dc9c0f751d67237db7159ebf3ccd07c77fc6c92fe7d9365027ae0e473",
+                    "hash" : "0x8262d21dc9c0f751d67237db7159ebf3ccd07c77fc6c92fe7d9365027ae0e473",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "8262d21dc9c0f751d67237db7159ebf3ccd07c77fc6c92fe7d9365027ae0e473",
+                    "hash" : "0x8262d21dc9c0f751d67237db7159ebf3ccd07c77fc6c92fe7d9365027ae0e473",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "635e3a5e0295f9e3c6b0f80a4592bcdf06f4bde9650cd0841fbddc4ea72145f1",
+                    "hash" : "0x635e3a5e0295f9e3c6b0f80a4592bcdf06f4bde9650cd0841fbddc4ea72145f1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "2bbdcae6cdff17f4116267db2a308ad9d94736aabd402683a6c2d37d61401a5e",
+                    "hash" : "0x2bbdcae6cdff17f4116267db2a308ad9d94736aabd402683a6c2d37d61401a5e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "8262d21dc9c0f751d67237db7159ebf3ccd07c77fc6c92fe7d9365027ae0e473",
+                    "hash" : "0x8262d21dc9c0f751d67237db7159ebf3ccd07c77fc6c92fe7d9365027ae0e473",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGMAfter.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGMAfter.json
index 963bb60a1..7003ebc83 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGMAfter.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGMAfter.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcallcode_101_OOGMAfter" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "58639a1a71f4da2f6795c2a3c4dbcac89c34e9b9aeebd669d1f5868615a93208",
+                    "hash" : "0x58639a1a71f4da2f6795c2a3c4dbcac89c34e9b9aeebd669d1f5868615a93208",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "58639a1a71f4da2f6795c2a3c4dbcac89c34e9b9aeebd669d1f5868615a93208",
+                    "hash" : "0x58639a1a71f4da2f6795c2a3c4dbcac89c34e9b9aeebd669d1f5868615a93208",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "32d1c8975997225104e8de7199b9e8ce62ba0565858d7061c949cb14f2acf6d2",
+                    "hash" : "0x32d1c8975997225104e8de7199b9e8ce62ba0565858d7061c949cb14f2acf6d2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "84f98a6f88dfc72446020065f3e1b40263570f9ab2fa17d80a47a1c5594d9bfe",
+                    "hash" : "0x84f98a6f88dfc72446020065f3e1b40263570f9ab2fa17d80a47a1c5594d9bfe",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "58639a1a71f4da2f6795c2a3c4dbcac89c34e9b9aeebd669d1f5868615a93208",
+                    "hash" : "0x58639a1a71f4da2f6795c2a3c4dbcac89c34e9b9aeebd669d1f5868615a93208",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGMBefore.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGMBefore.json
index 1811a13f4..a502c0d46 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGMBefore.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGMBefore.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcallcode_101_OOGMBefore" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f868bf241e2af9337a419243cde48f8cb37c75ffda08fc6c0200bd1d0505bbe8",
+                    "hash" : "0xf868bf241e2af9337a419243cde48f8cb37c75ffda08fc6c0200bd1d0505bbe8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f868bf241e2af9337a419243cde48f8cb37c75ffda08fc6c0200bd1d0505bbe8",
+                    "hash" : "0xf868bf241e2af9337a419243cde48f8cb37c75ffda08fc6c0200bd1d0505bbe8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2f81f1b963019fd02ddd56ed06b52c33fa843cb58aa1adbd646c8d2f7bcb7106",
+                    "hash" : "0x2f81f1b963019fd02ddd56ed06b52c33fa843cb58aa1adbd646c8d2f7bcb7106",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "d1bafc562d19ab61bbc395f6d0deb46a112d47b3db101028534a742991d2d6c1",
+                    "hash" : "0xd1bafc562d19ab61bbc395f6d0deb46a112d47b3db101028534a742991d2d6c1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f868bf241e2af9337a419243cde48f8cb37c75ffda08fc6c0200bd1d0505bbe8",
+                    "hash" : "0xf868bf241e2af9337a419243cde48f8cb37c75ffda08fc6c0200bd1d0505bbe8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016003526040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideEnd.json
index aaf87d608..b770cbea2 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideEnd.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcallcode_101_SuicideEnd" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "19842c2b19c4fb203040249b06332db65c99268f3ddc7d6e82f38e454748b8ea",
+                    "hash" : "0x19842c2b19c4fb203040249b06332db65c99268f3ddc7d6e82f38e454748b8ea",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "19842c2b19c4fb203040249b06332db65c99268f3ddc7d6e82f38e454748b8ea",
+                    "hash" : "0x19842c2b19c4fb203040249b06332db65c99268f3ddc7d6e82f38e454748b8ea",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6dd3a887a94b67aeac2d7110f726391116b73ebcef975ff479cbdd3d539cb85d",
+                    "hash" : "0x6dd3a887a94b67aeac2d7110f726391116b73ebcef975ff479cbdd3d539cb85d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "92f876a0a5e43612fdbe68b794440c67036d453c82b4aac3c34a05638c310b29",
+                    "hash" : "0x92f876a0a5e43612fdbe68b794440c67036d453c82b4aac3c34a05638c310b29",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "19842c2b19c4fb203040249b06332db65c99268f3ddc7d6e82f38e454748b8ea",
+                    "hash" : "0x19842c2b19c4fb203040249b06332db65c99268f3ddc7d6e82f38e454748b8ea",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000361c350f4600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideMiddle.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideMiddle.json
index 9c2b4f343..89f305771 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideMiddle.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideMiddle.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcallcode_101_SuicideMiddle" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "3601e32b0855ed38b9679700d83cac7cb09832d0635631cc03bc32d47062ac6e",
+                    "hash" : "0x3601e32b0855ed38b9679700d83cac7cb09832d0635631cc03bc32d47062ac6e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "3601e32b0855ed38b9679700d83cac7cb09832d0635631cc03bc32d47062ac6e",
+                    "hash" : "0x3601e32b0855ed38b9679700d83cac7cb09832d0635631cc03bc32d47062ac6e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "fadef933596e3c85e7650b5770775d74c0947534524bfc77b00ea562f5d397e9",
+                    "hash" : "0x612498d13bc5820996076cadd7ab7bfae2710fce59fc1873bbb64d3d0bf6cb81",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "29414a1701f21d34113676a009ddb109b3e79dcf9fd26dbfe7e16e04f4d805f6",
+                    "hash" : "0x29414a1701f21d34113676a009ddb109b3e79dcf9fd26dbfe7e16e04f4d805f6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "3601e32b0855ed38b9679700d83cac7cb09832d0635631cc03bc32d47062ac6e",
+                    "hash" : "0x3601e32b0855ed38b9679700d83cac7cb09832d0635631cc03bc32d47062ac6e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff604060006040600073100000000000000000000000000000000000000361c350f4600255",
+                "code" : "0x731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_ABCB_RECURSIVE.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_ABCB_RECURSIVE.json
index c649d655a..4b7777ff3 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_ABCB_RECURSIVE.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcallcode_ABCB_RECURSIVE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0xb2d05e00",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "71c439b813cdc088f1b111212d1862f9ded98e3a0b46a6c1b1d0b83e8a174f65",
+                    "hash" : "0x71c439b813cdc088f1b111212d1862f9ded98e3a0b46a6c1b1d0b83e8a174f65",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "71c439b813cdc088f1b111212d1862f9ded98e3a0b46a6c1b1d0b83e8a174f65",
+                    "hash" : "0x71c439b813cdc088f1b111212d1862f9ded98e3a0b46a6c1b1d0b83e8a174f65",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "0df655acb97fbdd90d4031457df1361b1229dd1ba9a8b911d542940cfea2c50f",
+                    "hash" : "0x0df655acb97fbdd90d4031457df1361b1229dd1ba9a8b911d542940cfea2c50f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "853de8403a99df851fad888e421c9f6273207ce44812b729eca18df1ecb7a6f4",
+                    "hash" : "0x853de8403a99df851fad888e421c9f6273207ce44812b729eca18df1ecb7a6f4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "71c439b813cdc088f1b111212d1862f9ded98e3a0b46a6c1b1d0b83e8a174f65",
+                    "hash" : "0x71c439b813cdc088f1b111212d1862f9ded98e3a0b46a6c1b1d0b83e8a174f65",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000163017d7840f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060007310000000000000000000000000000000000000016207a120f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "0x01c9c380"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcode_11.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcode_11.json
index ce43ac293..dc1d192ae 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcode_11.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcode_11.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcode_11" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a9c2c4521a7cbcb04884cfe7b256c01f603fc0717b414db3d144aba1b4d08c38",
+                    "hash" : "0xa9c2c4521a7cbcb04884cfe7b256c01f603fc0717b414db3d144aba1b4d08c38",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a9c2c4521a7cbcb04884cfe7b256c01f603fc0717b414db3d144aba1b4d08c38",
+                    "hash" : "0xa9c2c4521a7cbcb04884cfe7b256c01f603fc0717b414db3d144aba1b4d08c38",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "73b4d10c1d600113d411bc5cec3f3df067d296a1fb38fe8f30bca653efd05344",
+                    "hash" : "0x73b4d10c1d600113d411bc5cec3f3df067d296a1fb38fe8f30bca653efd05344",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5ca41b785c1d76fe896c544593e65d994af17f27e036a040cf4b5564e446c38c",
+                    "hash" : "0x5ca41b785c1d76fe896c544593e65d994af17f27e036a040cf4b5564e446c38c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a9c2c4521a7cbcb04884cfe7b256c01f603fc0717b414db3d144aba1b4d08c38",
+                    "hash" : "0xa9c2c4521a7cbcb04884cfe7b256c01f603fc0717b414db3d144aba1b4d08c38",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000162055730f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060007310000000000000000000000000000000000000026203d090f4600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160025533600455346007553060e6553260e8553660ec553860ee553a60f055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcode_11_OOGE.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcode_11_OOGE.json
index 18f0833a5..7000eb4de 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcode_11_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcode_11_OOGE.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcode_11_OOGE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "0e28cf3f4db47f3b35650b9458b37fd2c6ef988619e9357c7aad99c2ca509bb4",
+                    "hash" : "0x0e28cf3f4db47f3b35650b9458b37fd2c6ef988619e9357c7aad99c2ca509bb4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "0e28cf3f4db47f3b35650b9458b37fd2c6ef988619e9357c7aad99c2ca509bb4",
+                    "hash" : "0x0e28cf3f4db47f3b35650b9458b37fd2c6ef988619e9357c7aad99c2ca509bb4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "096698b31d54f0040cd099ba66b817a9f1ffc5a5bafa28ffa59a3d758923547a",
+                    "hash" : "0x096698b31d54f0040cd099ba66b817a9f1ffc5a5bafa28ffa59a3d758923547a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "cd71afecf18c68473965101df3bee68f05e811bc3cc85263f2e873db0bab603e",
+                    "hash" : "0xcd71afecf18c68473965101df3bee68f05e811bc3cc85263f2e873db0bab603e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0e28cf3f4db47f3b35650b9458b37fd2c6ef988619e9357c7aad99c2ca509bb4",
+                    "hash" : "0x0e28cf3f4db47f3b35650b9458b37fd2c6ef988619e9357c7aad99c2ca509bb4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002614e34f4600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016002556001600252",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcode_11_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcode_11_SuicideEnd.json
index c5f115af4..d286ff42c 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcode_11_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcode_11_SuicideEnd.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcode_11_SuicideEnd" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f13d84f79216159b8c1952beb0241a3fddabeecd458a1575d751fe3b95c44218",
+                    "hash" : "0xf13d84f79216159b8c1952beb0241a3fddabeecd458a1575d751fe3b95c44218",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f13d84f79216159b8c1952beb0241a3fddabeecd458a1575d751fe3b95c44218",
+                    "hash" : "0xf13d84f79216159b8c1952beb0241a3fddabeecd458a1575d751fe3b95c44218",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e35649fa1eea660604dcabe69e77842e8a2f22da1dfdd6dea4c69d397b659a89",
+                    "hash" : "0xe35649fa1eea660604dcabe69e77842e8a2f22da1dfdd6dea4c69d397b659a89",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "703f353348a2430256b3810b8e11fcf46575186df153666c0e2da48ccb9bcb05",
+                    "hash" : "0x703f353348a2430256b3810b8e11fcf46575186df153666c0e2da48ccb9bcb05",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f13d84f79216159b8c1952beb0241a3fddabeecd458a1575d751fe3b95c44218",
+                    "hash" : "0xf13d84f79216159b8c1952beb0241a3fddabeecd458a1575d751fe3b95c44218",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000261c350f4600155731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110.json
index 266220511..795b805cb 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecall_110" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c0f335bb1b78fc64d0db454d07518af0f87027e14c85372181c2c85612cbcca8",
+                    "hash" : "0xc0f335bb1b78fc64d0db454d07518af0f87027e14c85372181c2c85612cbcca8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c0f335bb1b78fc64d0db454d07518af0f87027e14c85372181c2c85612cbcca8",
+                    "hash" : "0xc0f335bb1b78fc64d0db454d07518af0f87027e14c85372181c2c85612cbcca8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "acadae7fe7e428799359cf9a0006ed57b20e2e232be44f7818c1398aeaa63cda",
+                    "hash" : "0xacadae7fe7e428799359cf9a0006ed57b20e2e232be44f7818c1398aeaa63cda",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "164de5a4a5debc40231b22c380a1e787402abe0f72d34c02a685a6939f9c53e4",
+                    "hash" : "0x164de5a4a5debc40231b22c380a1e787402abe0f72d34c02a685a6939f9c53e4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c0f335bb1b78fc64d0db454d07518af0f87027e14c85372181c2c85612cbcca8",
+                    "hash" : "0xc0f335bb1b78fc64d0db454d07518af0f87027e14c85372181c2c85612cbcca8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000162055730f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002620493e0f460015533600555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060017310000000000000000000000000000000000000036203d090f160025533600655",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGE.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGE.json
index 70e63470b..4c281c885 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGE.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecall_110_OOGE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f13e18d94988480e465c7f5ee1b4261b945fbffc27854fff1207a4f00342ed7c",
+                    "hash" : "0xf13e18d94988480e465c7f5ee1b4261b945fbffc27854fff1207a4f00342ed7c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f13e18d94988480e465c7f5ee1b4261b945fbffc27854fff1207a4f00342ed7c",
+                    "hash" : "0xf13e18d94988480e465c7f5ee1b4261b945fbffc27854fff1207a4f00342ed7c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "fa54b7fd7af78f7da9b95d81f5f9e0ac9ff3324964422f740473c13e8677f646",
+                    "hash" : "0xfa54b7fd7af78f7da9b95d81f5f9e0ac9ff3324964422f740473c13e8677f646",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "21e5930ebfd524403afa629e910aa6d34dcbce2c97fe20fa2ca6f3e4ed895ee8",
+                    "hash" : "0x21e5930ebfd524403afa629e910aa6d34dcbce2c97fe20fa2ca6f3e4ed895ee8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f13e18d94988480e465c7f5ee1b4261b945fbffc27854fff1207a4f00342ed7c",
+                    "hash" : "0xf13e18d94988480e465c7f5ee1b4261b945fbffc27854fff1207a4f00342ed7c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGMAfter.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGMAfter.json
index 325ecbd53..13870bbf8 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGMAfter.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGMAfter.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecall_110_OOGMAfter" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "62010bbb8d95a6c25afbaa0ede857cd283cac73a00a420261a3ec0169a5bd5b4",
+                    "hash" : "0x62010bbb8d95a6c25afbaa0ede857cd283cac73a00a420261a3ec0169a5bd5b4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "62010bbb8d95a6c25afbaa0ede857cd283cac73a00a420261a3ec0169a5bd5b4",
+                    "hash" : "0x62010bbb8d95a6c25afbaa0ede857cd283cac73a00a420261a3ec0169a5bd5b4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "138c60f195439626897fb8dadf9cfe47c646ad81c58e574189074f237c6ae056",
+                    "hash" : "0x138c60f195439626897fb8dadf9cfe47c646ad81c58e574189074f237c6ae056",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ad940b40dea79c3e416dae92a5713a44612a519ad5dc4e9d71268c0155fc847c",
+                    "hash" : "0xad940b40dea79c3e416dae92a5713a44612a519ad5dc4e9d71268c0155fc847c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "62010bbb8d95a6c25afbaa0ede857cd283cac73a00a420261a3ec0169a5bd5b4",
+                    "hash" : "0x62010bbb8d95a6c25afbaa0ede857cd283cac73a00a420261a3ec0169a5bd5b4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGMBefore.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGMBefore.json
index 2446b7b3e..95daac8fd 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGMBefore.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGMBefore.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecall_110_OOGMBefore" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b725b12b3fc3f862ba15daec86fe94f444d651fb98a9215dc2143954cf855e86",
+                    "hash" : "0xb725b12b3fc3f862ba15daec86fe94f444d651fb98a9215dc2143954cf855e86",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b725b12b3fc3f862ba15daec86fe94f444d651fb98a9215dc2143954cf855e86",
+                    "hash" : "0xb725b12b3fc3f862ba15daec86fe94f444d651fb98a9215dc2143954cf855e86",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4625fecbe8d5a034506c096cc90e2d97d271a5f9f0a11d278026c53c74b96d19",
+                    "hash" : "0x4625fecbe8d5a034506c096cc90e2d97d271a5f9f0a11d278026c53c74b96d19",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "bda9eb076173298a99c962e931e0711d1c30250732311f2d5066d9ee46bedb22",
+                    "hash" : "0xbda9eb076173298a99c962e931e0711d1c30250732311f2d5066d9ee46bedb22",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b725b12b3fc3f862ba15daec86fe94f444d651fb98a9215dc2143954cf855e86",
+                    "hash" : "0xb725b12b3fc3f862ba15daec86fe94f444d651fb98a9215dc2143954cf855e86",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f4600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideEnd.json
index 2bee9e185..daeb4f834 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideEnd.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecall_110_SuicideEnd" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6a31c55e60f7feb3f60dba0f8dca02b95b85ccd49dbdd85e6feca95392ba5221",
+                    "hash" : "0x6a31c55e60f7feb3f60dba0f8dca02b95b85ccd49dbdd85e6feca95392ba5221",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6a31c55e60f7feb3f60dba0f8dca02b95b85ccd49dbdd85e6feca95392ba5221",
+                    "hash" : "0x6a31c55e60f7feb3f60dba0f8dca02b95b85ccd49dbdd85e6feca95392ba5221",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b15e870c9fa7c6befd413d0e4ed2ec19b94175ccf0467edba6f91fdef8a3b86f",
+                    "hash" : "0xb15e870c9fa7c6befd413d0e4ed2ec19b94175ccf0467edba6f91fdef8a3b86f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6c3acc4ef20b7afcdbfe25c329659464e1602eb606a15a6d4b84e17bf3cec1dd",
+                    "hash" : "0x6c3acc4ef20b7afcdbfe25c329659464e1602eb606a15a6d4b84e17bf3cec1dd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6a31c55e60f7feb3f60dba0f8dca02b95b85ccd49dbdd85e6feca95392ba5221",
+                    "hash" : "0x6a31c55e60f7feb3f60dba0f8dca02b95b85ccd49dbdd85e6feca95392ba5221",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f1600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideMiddle.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideMiddle.json
index c904b8e62..bb94a7d33 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideMiddle.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideMiddle.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecall_110_SuicideMiddle" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a20708583ff0f165cb0d2e2de983afd4734d1156e21a7b68d479c469dc6e8130",
+                    "hash" : "0x0af21ebddea0328af1e15f809f5f6e3401af37ed2501075300bebe479b006d49",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a20708583ff0f165cb0d2e2de983afd4734d1156e21a7b68d479c469dc6e8130",
+                    "hash" : "0x0af21ebddea0328af1e15f809f5f6e3401af37ed2501075300bebe479b006d49",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a6ed37e005bb9c3c0eddb4229072e623ea2f55d7d49aa5da952b7cd8a3968a88",
+                    "hash" : "0x687ad44bee4e1068abc98c35dff3917fa0dc8ff8ccf85658cb69dbaa8e1b972d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c48d2366a631fc98c5c2800e7de58c9fdc59beb780be642ad79c749aad71437a",
+                    "hash" : "0x7fda4cd60dc6ec236dd59307b889261919971ef3903191d463357779686d2eee",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a20708583ff0f165cb0d2e2de983afd4734d1156e21a7b68d479c469dc6e8130",
+                    "hash" : "0x0af21ebddea0328af1e15f809f5f6e3401af37ed2501075300bebe479b006d49",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f1600255",
+                "code" : "0x731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_ABCB_RECURSIVE.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_ABCB_RECURSIVE.json
index e99b7784b..72201f65a 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_ABCB_RECURSIVE.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecall_ABCB_RECURSIVE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0xb2d05e00",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "97f1edcdfea93c670158755cbd53cc111e737cf892bbc78510ff20c9fea8cf1e",
+                    "hash" : "0x97f1edcdfea93c670158755cbd53cc111e737cf892bbc78510ff20c9fea8cf1e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "97f1edcdfea93c670158755cbd53cc111e737cf892bbc78510ff20c9fea8cf1e",
+                    "hash" : "0x97f1edcdfea93c670158755cbd53cc111e737cf892bbc78510ff20c9fea8cf1e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "eaf36e0227183784833409de2e2b5e88ec9ad34e3f56a2c5ce12aef7dbd41d9e",
+                    "hash" : "0xeaf36e0227183784833409de2e2b5e88ec9ad34e3f56a2c5ce12aef7dbd41d9e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "96594d6ef8a2bb38ed384dea3c898cab3e2bfc0499ada76dbf0f213427172e9e",
+                    "hash" : "0x96594d6ef8a2bb38ed384dea3c898cab3e2bfc0499ada76dbf0f213427172e9e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "97f1edcdfea93c670158755cbd53cc111e737cf892bbc78510ff20c9fea8cf1e",
+                    "hash" : "0x97f1edcdfea93c670158755cbd53cc111e737cf892bbc78510ff20c9fea8cf1e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000163017d7840f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002620f4240f4600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "0x01c9c380"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111.json
index 3cd5d0732..3f66f0159 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecallcode_111" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "869a98c314bc25e3bf2d4d3f8b576565913f95eed2a9ff80700431af2bbe209e",
+                    "hash" : "0x869a98c314bc25e3bf2d4d3f8b576565913f95eed2a9ff80700431af2bbe209e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "869a98c314bc25e3bf2d4d3f8b576565913f95eed2a9ff80700431af2bbe209e",
+                    "hash" : "0x869a98c314bc25e3bf2d4d3f8b576565913f95eed2a9ff80700431af2bbe209e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "c7f9afc1eedbe922848181dc4804a4f38e3caf92bb1d629b8dc5ce4ecd2f2ab3",
+                    "hash" : "0xc7f9afc1eedbe922848181dc4804a4f38e3caf92bb1d629b8dc5ce4ecd2f2ab3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b10bd06603fe9088c4c6972e911bac01ff45d82c13ffdc9e0b68a06876fc9ccc",
+                    "hash" : "0xb10bd06603fe9088c4c6972e911bac01ff45d82c13ffdc9e0b68a06876fc9ccc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "869a98c314bc25e3bf2d4d3f8b576565913f95eed2a9ff80700431af2bbe209e",
+                    "hash" : "0x869a98c314bc25e3bf2d4d3f8b576565913f95eed2a9ff80700431af2bbe209e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000162055730f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002620493e0f4600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060007310000000000000000000000000000000000000036203d090f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGE.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGE.json
index 624e8657a..c48bec24e 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGE.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecallcode_111_OOGE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "ec005918210b0e6927b59a05397a92e4fcaae057575cb6dc29c39a5adc8c385a",
+                    "hash" : "0xec005918210b0e6927b59a05397a92e4fcaae057575cb6dc29c39a5adc8c385a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "ec005918210b0e6927b59a05397a92e4fcaae057575cb6dc29c39a5adc8c385a",
+                    "hash" : "0xec005918210b0e6927b59a05397a92e4fcaae057575cb6dc29c39a5adc8c385a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "73d851e02f75a740bfeb2a2aa7699d8449fcc4a5870b6a83c4521dd980749f25",
+                    "hash" : "0x73d851e02f75a740bfeb2a2aa7699d8449fcc4a5870b6a83c4521dd980749f25",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "51a9c1e504660a3963b82f1deef6cf5f46723d8374f13642c4ca736ad094a946",
+                    "hash" : "0x51a9c1e504660a3963b82f1deef6cf5f46723d8374f13642c4ca736ad094a946",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "ec005918210b0e6927b59a05397a92e4fcaae057575cb6dc29c39a5adc8c385a",
+                    "hash" : "0xec005918210b0e6927b59a05397a92e4fcaae057575cb6dc29c39a5adc8c385a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x60016003556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGMAfter.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGMAfter.json
index ed109e3ec..1bc9e3fe7 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGMAfter.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGMAfter.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecallcode_111_OOGMAfter" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "011fa4e27c42d447b72696d3aa37e5c1594c5a0228c2703270fc76b48b2ee39b",
+                    "hash" : "0x011fa4e27c42d447b72696d3aa37e5c1594c5a0228c2703270fc76b48b2ee39b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "011fa4e27c42d447b72696d3aa37e5c1594c5a0228c2703270fc76b48b2ee39b",
+                    "hash" : "0x011fa4e27c42d447b72696d3aa37e5c1594c5a0228c2703270fc76b48b2ee39b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "89be528276a8183204498a5272ed515fa790cee710ef54d679657bd45159b59b",
+                    "hash" : "0x89be528276a8183204498a5272ed515fa790cee710ef54d679657bd45159b59b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "0550d64d8201900071745405c166cde9253bbc201a9031b932c76f4d5f496ddc",
+                    "hash" : "0x0550d64d8201900071745405c166cde9253bbc201a9031b932c76f4d5f496ddc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "011fa4e27c42d447b72696d3aa37e5c1594c5a0228c2703270fc76b48b2ee39b",
+                    "hash" : "0x011fa4e27c42d447b72696d3aa37e5c1594c5a0228c2703270fc76b48b2ee39b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaecf4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGMBefore.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGMBefore.json
index 0660cf049..136b388ff 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGMBefore.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGMBefore.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecallcode_111_OOGMBefore" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b4dbea16de17b59147fa94280092aad3126e017f4a453a065186300d2448c803",
+                    "hash" : "0xb4dbea16de17b59147fa94280092aad3126e017f4a453a065186300d2448c803",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b4dbea16de17b59147fa94280092aad3126e017f4a453a065186300d2448c803",
+                    "hash" : "0xb4dbea16de17b59147fa94280092aad3126e017f4a453a065186300d2448c803",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4e3ad257e8d352958cea3ec50c3ffe9eb8864cec4cfccc5d9d5fae441c0a9977",
+                    "hash" : "0x4e3ad257e8d352958cea3ec50c3ffe9eb8864cec4cfccc5d9d5fae441c0a9977",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3f299a1af6b8063deb96c41f54078ebb5a5e2f78a5913b9d73c7e2c2f8755f38",
+                    "hash" : "0x3f299a1af6b8063deb96c41f54078ebb5a5e2f78a5913b9d73c7e2c2f8755f38",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b4dbea16de17b59147fa94280092aad3126e017f4a453a065186300d2448c803",
+                    "hash" : "0xb4dbea16de17b59147fa94280092aad3126e017f4a453a065186300d2448c803",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f4600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016003526040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideEnd.json
index 126564a82..39e3c797a 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideEnd.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecallcode_111_SuicideEnd" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9864a50ab338548bf3a7d0a839fb494f344034f011673774ca7230dccd38ccd8",
+                    "hash" : "0x9864a50ab338548bf3a7d0a839fb494f344034f011673774ca7230dccd38ccd8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9864a50ab338548bf3a7d0a839fb494f344034f011673774ca7230dccd38ccd8",
+                    "hash" : "0x9864a50ab338548bf3a7d0a839fb494f344034f011673774ca7230dccd38ccd8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "7cdc002673f5a04d1896f78c6c910249ec5ec95d2b2c72d69c13558830acb369",
+                    "hash" : "0x7cdc002673f5a04d1896f78c6c910249ec5ec95d2b2c72d69c13558830acb369",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "23059d8c10d91e710f1c1f7e22704af4fab5274394c646cad2522e917c2576c3",
+                    "hash" : "0x23059d8c10d91e710f1c1f7e22704af4fab5274394c646cad2522e917c2576c3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9864a50ab338548bf3a7d0a839fb494f344034f011673774ca7230dccd38ccd8",
+                    "hash" : "0x9864a50ab338548bf3a7d0a839fb494f344034f011673774ca7230dccd38ccd8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000361c350f4600255731000000000000000000000000000000000000001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideMiddle.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideMiddle.json
index d530d8275..ee4cd010a 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideMiddle.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideMiddle.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecallcode_111_SuicideMiddle" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a5d6d30cb53233b4343558ebee2dfab50647e9ec6a9fa253f4184b5adca38437",
+                    "hash" : "0x0af21ebddea0328af1e15f809f5f6e3401af37ed2501075300bebe479b006d49",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a5d6d30cb53233b4343558ebee2dfab50647e9ec6a9fa253f4184b5adca38437",
+                    "hash" : "0x0af21ebddea0328af1e15f809f5f6e3401af37ed2501075300bebe479b006d49",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "faebb8b6b08761c893338f4f931adc2bdd7a7cfe98cc69d995204af17692a495",
+                    "hash" : "0x687ad44bee4e1068abc98c35dff3917fa0dc8ff8ccf85658cb69dbaa8e1b972d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "012bd47480194d80153637058b1a93dfbe426d0f53f24ce8460d0c4e2bc321d8",
+                    "hash" : "0x7fda4cd60dc6ec236dd59307b889261919971ef3903191d463357779686d2eee",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a5d6d30cb53233b4343558ebee2dfab50647e9ec6a9fa253f4184b5adca38437",
+                    "hash" : "0x0af21ebddea0328af1e15f809f5f6e3401af37ed2501075300bebe479b006d49",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff604060006040600073100000000000000000000000000000000000000361c350f4600255",
+                "code" : "0x731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_ABCB_RECURSIVE.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_ABCB_RECURSIVE.json
index e0680a6ea..1d8dbd1ad 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_ABCB_RECURSIVE.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecallcode_ABCB_RECURSIVE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0xb2d05e00",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7534562771847b5e3213d441c5b7eaf174fe4f238bf44b5893525f441e031284",
+                    "hash" : "0x7534562771847b5e3213d441c5b7eaf174fe4f238bf44b5893525f441e031284",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7534562771847b5e3213d441c5b7eaf174fe4f238bf44b5893525f441e031284",
+                    "hash" : "0x7534562771847b5e3213d441c5b7eaf174fe4f238bf44b5893525f441e031284",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "0829e05ae238200ab794bf1978f724286bceaf1a947662cf408ac5c65421157d",
+                    "hash" : "0x0829e05ae238200ab794bf1978f724286bceaf1a947662cf408ac5c65421157d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "8502b9c5e0f229cb9c9f5eeacc11b9f136428645edc6e0627ed08c0ab578ac6c",
+                    "hash" : "0x8502b9c5e0f229cb9c9f5eeacc11b9f136428645edc6e0627ed08c0ab578ac6c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7534562771847b5e3213d441c5b7eaf174fe4f238bf44b5893525f441e031284",
+                    "hash" : "0x7534562771847b5e3213d441c5b7eaf174fe4f238bf44b5893525f441e031284",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000163017d7840f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002620f4240f4600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02540be400",
                 "code" : "0x60406000604060007310000000000000000000000000000000000000016207a120f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "30000000"
+                "0x01c9c380"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/Call1024BalanceTooLow.json b/GeneralStateTests/stChangedEIP150/Call1024BalanceTooLow.json
index fccf4ac4a..edce391e4 100644
--- a/GeneralStateTests/stChangedEIP150/Call1024BalanceTooLow.json
+++ b/GeneralStateTests/stChangedEIP150/Call1024BalanceTooLow.json
@@ -1,17 +1,17 @@
 {
     "Call1024BalanceTooLow" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x28d138",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "aaead1065382a87e86f895d97eb30e29a9fbc52341b6991ee0a6892345a36e73",
+                    "hash" : "0xaaead1065382a87e86f895d97eb30e29a9fbc52341b6991ee0a6892345a36e73",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "aaead1065382a87e86f895d97eb30e29a9fbc52341b6991ee0a6892345a36e73",
+                    "hash" : "0xaaead1065382a87e86f895d97eb30e29a9fbc52341b6991ee0a6892345a36e73",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "95039d2266cf043d284b35099fd1eaeb9343465e37cf97db82b86af218a992dd",
+                    "hash" : "0x95039d2266cf043d284b35099fd1eaeb9343465e37cf97db82b86af218a992dd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "95039d2266cf043d284b35099fd1eaeb9343465e37cf97db82b86af218a992dd",
+                    "hash" : "0x95039d2266cf043d284b35099fd1eaeb9343465e37cf97db82b86af218a992dd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "aaead1065382a87e86f895d97eb30e29a9fbc52341b6991ee0a6892345a36e73",
+                    "hash" : "0xaaead1065382a87e86f895d97eb30e29a9fbc52341b6991ee0a6892345a36e73",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0400",
                 "code" : "0x600160005401600055600060006000600060005473bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff1600155",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "17592186099592"
+                "0x10000000d788"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/Call1024PreCalls.json b/GeneralStateTests/stChangedEIP150/Call1024PreCalls.json
index 0248ca29d..cedca4087 100644
--- a/GeneralStateTests/stChangedEIP150/Call1024PreCalls.json
+++ b/GeneralStateTests/stChangedEIP150/Call1024PreCalls.json
@@ -1,17 +1,17 @@
 {
     "Call1024PreCalls" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "34c0da29bceb7ce1061ce30b71df471f7f667f87b3f013d6e838a5691ddc6255",
+                    "hash" : "0x34c0da29bceb7ce1061ce30b71df471f7f667f87b3f013d6e838a5691ddc6255",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "34c0da29bceb7ce1061ce30b71df471f7f667f87b3f013d6e838a5691ddc6255",
+                    "hash" : "0x34c0da29bceb7ce1061ce30b71df471f7f667f87b3f013d6e838a5691ddc6255",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f602f8357f3f9231189f843971ff00681946cc6ce3415c9479a50589b9fbaffc",
+                    "hash" : "0xf602f8357f3f9231189f843971ff00681946cc6ce3415c9479a50589b9fbaffc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f602f8357f3f9231189f843971ff00681946cc6ce3415c9479a50589b9fbaffc",
+                    "hash" : "0xf602f8357f3f9231189f843971ff00681946cc6ce3415c9479a50589b9fbaffc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "34c0da29bceb7ce1061ce30b71df471f7f667f87b3f013d6e838a5691ddc6255",
+                    "hash" : "0x34c0da29bceb7ce1061ce30b71df471f7f667f87b3f013d6e838a5691ddc6255",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0fffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x07e8",
                 "code" : "0x6000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16002556000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16003556001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff1600155",
                 "nonce" : "0x00",
@@ -92,10 +92,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/Callcode1024BalanceTooLow.json b/GeneralStateTests/stChangedEIP150/Callcode1024BalanceTooLow.json
index 8f76f1d4e..b88a12d3f 100644
--- a/GeneralStateTests/stChangedEIP150/Callcode1024BalanceTooLow.json
+++ b/GeneralStateTests/stChangedEIP150/Callcode1024BalanceTooLow.json
@@ -1,17 +1,17 @@
 {
     "Callcode1024BalanceTooLow" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "cd7b0f52aa9ac64427a044dc051e761cbd67e5abe9a79c15c63062ed6f5e45eb",
+                    "hash" : "0xcd7b0f52aa9ac64427a044dc051e761cbd67e5abe9a79c15c63062ed6f5e45eb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "cd7b0f52aa9ac64427a044dc051e761cbd67e5abe9a79c15c63062ed6f5e45eb",
+                    "hash" : "0xcd7b0f52aa9ac64427a044dc051e761cbd67e5abe9a79c15c63062ed6f5e45eb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "963d1b4a5f3d2ccf85ae1c43dc3c7540b60a540d09ef403d1b2a58db4c224401",
+                    "hash" : "0x963d1b4a5f3d2ccf85ae1c43dc3c7540b60a540d09ef403d1b2a58db4c224401",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "963d1b4a5f3d2ccf85ae1c43dc3c7540b60a540d09ef403d1b2a58db4c224401",
+                    "hash" : "0x963d1b4a5f3d2ccf85ae1c43dc3c7540b60a540d09ef403d1b2a58db4c224401",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "cd7b0f52aa9ac64427a044dc051e761cbd67e5abe9a79c15c63062ed6f5e45eb",
+                    "hash" : "0xcd7b0f52aa9ac64427a044dc051e761cbd67e5abe9a79c15c63062ed6f5e45eb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0400",
                 "code" : "0x600160005401600055600060006000600060005473bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff2600155",
                 "nonce" : "0x00",
@@ -92,10 +92,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_1.json b/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_1.json
index e48278d90..4b07e61ef 100644
--- a/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_1.json
+++ b/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_1.json
@@ -1,17 +1,17 @@
 {
     "callcall_00_OOGE_1" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "33bb0456eb22ddeb54adf46f74d79d465efa4a577efa67a29aab5c67640123cc",
+                    "hash" : "0x33bb0456eb22ddeb54adf46f74d79d465efa4a577efa67a29aab5c67640123cc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "33bb0456eb22ddeb54adf46f74d79d465efa4a577efa67a29aab5c67640123cc",
+                    "hash" : "0x33bb0456eb22ddeb54adf46f74d79d465efa4a577efa67a29aab5c67640123cc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "defca738f9a2ae3474a4035fadd06340c827fb753aa8285c2f39446b0210cdfe",
+                    "hash" : "0xdefca738f9a2ae3474a4035fadd06340c827fb753aa8285c2f39446b0210cdfe",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "defca738f9a2ae3474a4035fadd06340c827fb753aa8285c2f39446b0210cdfe",
+                    "hash" : "0xdefca738f9a2ae3474a4035fadd06340c827fb753aa8285c2f39446b0210cdfe",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "33bb0456eb22ddeb54adf46f74d79d465efa4a577efa67a29aab5c67640123cc",
+                    "hash" : "0x33bb0456eb22ddeb54adf46f74d79d465efa4a577efa67a29aab5c67640123cc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006001731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160025534600555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "180066"
+                "0x02bf62"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_2.json b/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_2.json
index 86f273923..f597d83a2 100644
--- a/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_2.json
+++ b/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_2.json
@@ -1,17 +1,17 @@
 {
     "callcall_00_OOGE_2" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "33bb0456eb22ddeb54adf46f74d79d465efa4a577efa67a29aab5c67640123cc",
+                    "hash" : "0x33bb0456eb22ddeb54adf46f74d79d465efa4a577efa67a29aab5c67640123cc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "33bb0456eb22ddeb54adf46f74d79d465efa4a577efa67a29aab5c67640123cc",
+                    "hash" : "0x33bb0456eb22ddeb54adf46f74d79d465efa4a577efa67a29aab5c67640123cc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "41fa034882c906ca932f8218b784af202dee537413a6f342d083257609f77efa",
+                    "hash" : "0x41fa034882c906ca932f8218b784af202dee537413a6f342d083257609f77efa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "41fa034882c906ca932f8218b784af202dee537413a6f342d083257609f77efa",
+                    "hash" : "0x41fa034882c906ca932f8218b784af202dee537413a6f342d083257609f77efa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "33bb0456eb22ddeb54adf46f74d79d465efa4a577efa67a29aab5c67640123cc",
+                    "hash" : "0x33bb0456eb22ddeb54adf46f74d79d465efa4a577efa67a29aab5c67640123cc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006001731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160025534600555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "150066"
+                "0x024a32"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_valueTransfer.json b/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_valueTransfer.json
index f7a475e10..c49e47f02 100644
--- a/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_valueTransfer.json
+++ b/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_valueTransfer.json
@@ -1,17 +1,17 @@
 {
     "callcall_00_OOGE_valueTransfer" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "fbfab140075c759ed020052405b4a2369d5c42cc185569f9427b1744b353214e",
+                    "hash" : "0xfbfab140075c759ed020052405b4a2369d5c42cc185569f9427b1744b353214e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "fbfab140075c759ed020052405b4a2369d5c42cc185569f9427b1744b353214e",
+                    "hash" : "0xfbfab140075c759ed020052405b4a2369d5c42cc185569f9427b1744b353214e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "d571f2018d13b8898f61434841ec3bd1380bf3720cd9d916580cf0bf04aa793d",
+                    "hash" : "0xd571f2018d13b8898f61434841ec3bd1380bf3720cd9d916580cf0bf04aa793d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "d571f2018d13b8898f61434841ec3bd1380bf3720cd9d916580cf0bf04aa793d",
+                    "hash" : "0xd571f2018d13b8898f61434841ec3bd1380bf3720cd9d916580cf0bf04aa793d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "fbfab140075c759ed020052405b4a2369d5c42cc185569f9427b1744b353214e",
+                    "hash" : "0xfbfab140075c759ed020052405b4a2369d5c42cc185569f9427b1744b353214e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006014731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000600a73100000000000000000000000000000000000000261c350f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016002556001600252",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/callcallcall_000_OOGMAfter.json b/GeneralStateTests/stChangedEIP150/callcallcall_000_OOGMAfter.json
index 5a79b5974..c374db29b 100644
--- a/GeneralStateTests/stChangedEIP150/callcallcall_000_OOGMAfter.json
+++ b/GeneralStateTests/stChangedEIP150/callcallcall_000_OOGMAfter.json
@@ -1,17 +1,17 @@
 {
     "callcallcall_000_OOGMAfter" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "eaa75d5c02ffb6835ea792d976c4944bc11f4e27a85227c8cf73ee14c451ff46",
+                    "hash" : "0xeaa75d5c02ffb6835ea792d976c4944bc11f4e27a85227c8cf73ee14c451ff46",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "eaa75d5c02ffb6835ea792d976c4944bc11f4e27a85227c8cf73ee14c451ff46",
+                    "hash" : "0xeaa75d5c02ffb6835ea792d976c4944bc11f4e27a85227c8cf73ee14c451ff46",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a767a97d79ec39107df9149cc68b1199fcdc3fd89a41193dd5c280eeb56ddc42",
+                    "hash" : "0xa767a97d79ec39107df9149cc68b1199fcdc3fd89a41193dd5c280eeb56ddc42",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a767a97d79ec39107df9149cc68b1199fcdc3fd89a41193dd5c280eeb56ddc42",
+                    "hash" : "0xa767a97d79ec39107df9149cc68b1199fcdc3fd89a41193dd5c280eeb56ddc42",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "eaa75d5c02ffb6835ea792d976c4944bc11f4e27a85227c8cf73ee14c451ff46",
+                    "hash" : "0xeaa75d5c02ffb6835ea792d976c4944bc11f4e27a85227c8cf73ee14c451ff46",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_1.json b/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_1.json
index 6aef226ca..b52865f9d 100644
--- a/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_1.json
+++ b/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_1.json
@@ -1,17 +1,17 @@
 {
     "callcallcallcode_001_OOGMAfter_1" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a17df9238a8f84b1d45abbf2608ef80e5dcd07de0c8dd2bbcf98ca21db99753c",
+                    "hash" : "0xa17df9238a8f84b1d45abbf2608ef80e5dcd07de0c8dd2bbcf98ca21db99753c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a17df9238a8f84b1d45abbf2608ef80e5dcd07de0c8dd2bbcf98ca21db99753c",
+                    "hash" : "0xa17df9238a8f84b1d45abbf2608ef80e5dcd07de0c8dd2bbcf98ca21db99753c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "59f3975264b93f4097b183f9ed5dfda26667e2feb0ef6c0938dd9f49e97fdbdc",
+                    "hash" : "0x59f3975264b93f4097b183f9ed5dfda26667e2feb0ef6c0938dd9f49e97fdbdc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ef211f7b041d3ef77a8575136a6364fd7ec5975ec2fedac3668d61ed1d9ff93e",
+                    "hash" : "0xef211f7b041d3ef77a8575136a6364fd7ec5975ec2fedac3668d61ed1d9ff93e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a17df9238a8f84b1d45abbf2608ef80e5dcd07de0c8dd2bbcf98ca21db99753c",
+                    "hash" : "0xa17df9238a8f84b1d45abbf2608ef80e5dcd07de0c8dd2bbcf98ca21db99753c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf7f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c89f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_2.json b/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_2.json
index 2a3444a28..36de7a9a0 100644
--- a/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_2.json
+++ b/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_2.json
@@ -1,17 +1,17 @@
 {
     "callcallcallcode_001_OOGMAfter_2" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f8bdb1563d3bfa59ad72beb2da61a648e252f9a626690a34720b4a570c4c53a2",
+                    "hash" : "0xf8bdb1563d3bfa59ad72beb2da61a648e252f9a626690a34720b4a570c4c53a2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f8bdb1563d3bfa59ad72beb2da61a648e252f9a626690a34720b4a570c4c53a2",
+                    "hash" : "0xf8bdb1563d3bfa59ad72beb2da61a648e252f9a626690a34720b4a570c4c53a2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3d6bf725e57e6ea3481ed50a8f0338c92858bdf33c36fdb336b5d1b1d3fdb646",
+                    "hash" : "0x3d6bf725e57e6ea3481ed50a8f0338c92858bdf33c36fdb336b5d1b1d3fdb646",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "59d69179aa4aaa0694c84e6c803e6d9fb3932568a197083bb0b7ac9ba1f01559",
+                    "hash" : "0x59d69179aa4aaa0694c84e6c803e6d9fb3932568a197083bb0b7ac9ba1f01559",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f8bdb1563d3bfa59ad72beb2da61a648e252f9a626690a34720b4a570c4c53a2",
+                    "hash" : "0xf8bdb1563d3bfa59ad72beb2da61a648e252f9a626690a34720b4a570c4c53a2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c95f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_3.json b/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_3.json
index 34408d7b9..0c88bff92 100644
--- a/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_3.json
+++ b/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_3.json
@@ -1,17 +1,17 @@
 {
     "callcallcallcode_001_OOGMAfter_3" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "85024ce7f661d120051f7221c36fa705e32eb6e5f0a1df3de2452b6dd3f0f488",
+                    "hash" : "0x85024ce7f661d120051f7221c36fa705e32eb6e5f0a1df3de2452b6dd3f0f488",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "85024ce7f661d120051f7221c36fa705e32eb6e5f0a1df3de2452b6dd3f0f488",
+                    "hash" : "0x85024ce7f661d120051f7221c36fa705e32eb6e5f0a1df3de2452b6dd3f0f488",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "ed050e8941d0530b3fab2fe1307f8b8ebed135ad216d2aa8f52c2d83f22399b0",
+                    "hash" : "0xed050e8941d0530b3fab2fe1307f8b8ebed135ad216d2aa8f52c2d83f22399b0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ed050e8941d0530b3fab2fe1307f8b8ebed135ad216d2aa8f52c2d83f22399b0",
+                    "hash" : "0xed050e8941d0530b3fab2fe1307f8b8ebed135ad216d2aa8f52c2d83f22399b0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "85024ce7f661d120051f7221c36fa705e32eb6e5f0a1df3de2452b6dd3f0f488",
+                    "hash" : "0x85024ce7f661d120051f7221c36fa705e32eb6e5f0a1df3de2452b6dd3f0f488",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_1.json b/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_1.json
index 3330dc31c..2811dcc93 100644
--- a/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_1.json
+++ b/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_1.json
@@ -1,17 +1,17 @@
 {
     "callcallcodecall_010_OOGMAfter_1" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "de101ef70f3ec3b41bfbc894ed9af86d9f1e28b95d30fba017aeb5f5fbda601b",
+                    "hash" : "0xde101ef70f3ec3b41bfbc894ed9af86d9f1e28b95d30fba017aeb5f5fbda601b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "de101ef70f3ec3b41bfbc894ed9af86d9f1e28b95d30fba017aeb5f5fbda601b",
+                    "hash" : "0xde101ef70f3ec3b41bfbc894ed9af86d9f1e28b95d30fba017aeb5f5fbda601b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "dd76ee8ba39a7071c313c6482b98e2db641023bf18a796e77cf2eb4758a18549",
+                    "hash" : "0xdd76ee8ba39a7071c313c6482b98e2db641023bf18a796e77cf2eb4758a18549",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "dd76ee8ba39a7071c313c6482b98e2db641023bf18a796e77cf2eb4758a18549",
+                    "hash" : "0xdd76ee8ba39a7071c313c6482b98e2db641023bf18a796e77cf2eb4758a18549",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "de101ef70f3ec3b41bfbc894ed9af86d9f1e28b95d30fba017aeb5f5fbda601b",
+                    "hash" : "0xde101ef70f3ec3b41bfbc894ed9af86d9f1e28b95d30fba017aeb5f5fbda601b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf7f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c8df46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_2.json b/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_2.json
index 5ab3eb341..f733c8c29 100644
--- a/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_2.json
+++ b/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_2.json
@@ -1,17 +1,17 @@
 {
     "callcallcodecall_010_OOGMAfter_2" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "25eb00ab4fb36d94c41162afd9e87daf94cc10f2ccc7bd6c3b8199092996c0fa",
+                    "hash" : "0x25eb00ab4fb36d94c41162afd9e87daf94cc10f2ccc7bd6c3b8199092996c0fa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "25eb00ab4fb36d94c41162afd9e87daf94cc10f2ccc7bd6c3b8199092996c0fa",
+                    "hash" : "0x25eb00ab4fb36d94c41162afd9e87daf94cc10f2ccc7bd6c3b8199092996c0fa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "60c4f8cfe444a136e9b4bd6dc4619484fbabe8dea905ee61b243f8e2568f9b42",
+                    "hash" : "0x60c4f8cfe444a136e9b4bd6dc4619484fbabe8dea905ee61b243f8e2568f9b42",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "60c4f8cfe444a136e9b4bd6dc4619484fbabe8dea905ee61b243f8e2568f9b42",
+                    "hash" : "0x60c4f8cfe444a136e9b4bd6dc4619484fbabe8dea905ee61b243f8e2568f9b42",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "25eb00ab4fb36d94c41162afd9e87daf94cc10f2ccc7bd6c3b8199092996c0fa",
+                    "hash" : "0x25eb00ab4fb36d94c41162afd9e87daf94cc10f2ccc7bd6c3b8199092996c0fa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e48f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_3.json b/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_3.json
index 6dea03eaa..93427e897 100644
--- a/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_3.json
+++ b/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_3.json
@@ -1,17 +1,17 @@
 {
     "callcallcodecall_010_OOGMAfter_3" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "0e2b3eba8b61eda5f874976573a954510a2097f039564011eb11bb356a52eee2",
+                    "hash" : "0x0e2b3eba8b61eda5f874976573a954510a2097f039564011eb11bb356a52eee2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "0e2b3eba8b61eda5f874976573a954510a2097f039564011eb11bb356a52eee2",
+                    "hash" : "0x0e2b3eba8b61eda5f874976573a954510a2097f039564011eb11bb356a52eee2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "c41a25808023d223b1dc3f3914c233a901168605f5f02a9f15c5fadce6044462",
+                    "hash" : "0xc41a25808023d223b1dc3f3914c233a901168605f5f02a9f15c5fadce6044462",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c41a25808023d223b1dc3f3914c233a901168605f5f02a9f15c5fadce6044462",
+                    "hash" : "0xc41a25808023d223b1dc3f3914c233a901168605f5f02a9f15c5fadce6044462",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0e2b3eba8b61eda5f874976573a954510a2097f039564011eb11bb356a52eee2",
+                    "hash" : "0x0e2b3eba8b61eda5f874976573a954510a2097f039564011eb11bb356a52eee2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_1.json b/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_1.json
index 67dee9983..ff56a9d01 100644
--- a/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_1.json
+++ b/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_1.json
@@ -1,17 +1,17 @@
 {
     "callcallcodecallcode_011_OOGMAfter_1" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "dd118bf6242fb4b338d4e7296394fd9b163a073146a4dea27799249382b2ccb1",
+                    "hash" : "0xdd118bf6242fb4b338d4e7296394fd9b163a073146a4dea27799249382b2ccb1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "dd118bf6242fb4b338d4e7296394fd9b163a073146a4dea27799249382b2ccb1",
+                    "hash" : "0xdd118bf6242fb4b338d4e7296394fd9b163a073146a4dea27799249382b2ccb1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "953f39215417f53317d23e5a28ff959337d00e9f1507b5c1617499d6b518613f",
+                    "hash" : "0x953f39215417f53317d23e5a28ff959337d00e9f1507b5c1617499d6b518613f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "953f39215417f53317d23e5a28ff959337d00e9f1507b5c1617499d6b518613f",
+                    "hash" : "0x953f39215417f53317d23e5a28ff959337d00e9f1507b5c1617499d6b518613f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "dd118bf6242fb4b338d4e7296394fd9b163a073146a4dea27799249382b2ccb1",
+                    "hash" : "0xdd118bf6242fb4b338d4e7296394fd9b163a073146a4dea27799249382b2ccb1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaecf1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_2.json b/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_2.json
index 4d7345ed1..96f1f834c 100644
--- a/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_2.json
+++ b/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_2.json
@@ -1,17 +1,17 @@
 {
     "callcallcodecallcode_011_OOGMAfter_2" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b1ae24b7ad575830405dcb5f29c2aeaa71ad90828970a9a729542de6a3d35daa",
+                    "hash" : "0xb1ae24b7ad575830405dcb5f29c2aeaa71ad90828970a9a729542de6a3d35daa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b1ae24b7ad575830405dcb5f29c2aeaa71ad90828970a9a729542de6a3d35daa",
+                    "hash" : "0xb1ae24b7ad575830405dcb5f29c2aeaa71ad90828970a9a729542de6a3d35daa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "cd6b0d134a9ebf655f0e1f76cb2d6c8c66a36c478867d3abbb00d7655dbf0911",
+                    "hash" : "0xcd6b0d134a9ebf655f0e1f76cb2d6c8c66a36c478867d3abbb00d7655dbf0911",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "cd6b0d134a9ebf655f0e1f76cb2d6c8c66a36c478867d3abbb00d7655dbf0911",
+                    "hash" : "0xcd6b0d134a9ebf655f0e1f76cb2d6c8c66a36c478867d3abbb00d7655dbf0911",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b1ae24b7ad575830405dcb5f29c2aeaa71ad90828970a9a729542de6a3d35daa",
+                    "hash" : "0xb1ae24b7ad575830405dcb5f29c2aeaa71ad90828970a9a729542de6a3d35daa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_1.json b/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_1.json
index a2a8bd998..ec096e9eb 100644
--- a/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_1.json
+++ b/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_1.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcall_100_OOGMAfter_1" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "af584519416197f347328bd8c334df83e892e6821fa77a6409e17acc7f07c875",
+                    "hash" : "0xaf584519416197f347328bd8c334df83e892e6821fa77a6409e17acc7f07c875",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "af584519416197f347328bd8c334df83e892e6821fa77a6409e17acc7f07c875",
+                    "hash" : "0xaf584519416197f347328bd8c334df83e892e6821fa77a6409e17acc7f07c875",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b62569cbaffe068e783d4870d965fa783b0dd7d06bded6838715228457cb3262",
+                    "hash" : "0xb62569cbaffe068e783d4870d965fa783b0dd7d06bded6838715228457cb3262",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "aae346ca92f96acc0d6b144e16bf1690ff1c32d06bf5e595f6f23f3366925abd",
+                    "hash" : "0xaae346ca92f96acc0d6b144e16bf1690ff1c32d06bf5e595f6f23f3366925abd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "af584519416197f347328bd8c334df83e892e6821fa77a6409e17acc7f07c875",
+                    "hash" : "0xaf584519416197f347328bd8c334df83e892e6821fa77a6409e17acc7f07c875",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c95f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_2.json b/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_2.json
index d964d0450..139d0bd6e 100644
--- a/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_2.json
+++ b/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_2.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcall_100_OOGMAfter_2" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a50cb0d18f5a8f36f9db0aa1bdf1c77f149dd4e941b7d4cc5e5710a78f3f0b56",
+                    "hash" : "0xa50cb0d18f5a8f36f9db0aa1bdf1c77f149dd4e941b7d4cc5e5710a78f3f0b56",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a50cb0d18f5a8f36f9db0aa1bdf1c77f149dd4e941b7d4cc5e5710a78f3f0b56",
+                    "hash" : "0xa50cb0d18f5a8f36f9db0aa1bdf1c77f149dd4e941b7d4cc5e5710a78f3f0b56",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "46dd20e8074230b6e3dc9d29cea3d5b5aeabc6032c31d751130053cb15cb917f",
+                    "hash" : "0x46dd20e8074230b6e3dc9d29cea3d5b5aeabc6032c31d751130053cb15cb917f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "d6eff2dc4e89f3ba043d1c75f6e19070f941a1c617f3d4a81c2d22faf2c8f395",
+                    "hash" : "0xd6eff2dc4e89f3ba043d1c75f6e19070f941a1c617f3d4a81c2d22faf2c8f395",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a50cb0d18f5a8f36f9db0aa1bdf1c77f149dd4e941b7d4cc5e5710a78f3f0b56",
+                    "hash" : "0xa50cb0d18f5a8f36f9db0aa1bdf1c77f149dd4e941b7d4cc5e5710a78f3f0b56",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_3.json b/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_3.json
index 7a6db09c7..ed6eda97d 100644
--- a/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_3.json
+++ b/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_3.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcall_100_OOGMAfter_3" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1ccdddfee7c5341f862e77e4b217b4ab98be631d8dd5c81a328b57efcb2f00ef",
+                    "hash" : "0x1ccdddfee7c5341f862e77e4b217b4ab98be631d8dd5c81a328b57efcb2f00ef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "1ccdddfee7c5341f862e77e4b217b4ab98be631d8dd5c81a328b57efcb2f00ef",
+                    "hash" : "0x1ccdddfee7c5341f862e77e4b217b4ab98be631d8dd5c81a328b57efcb2f00ef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "278c6d69454c759028bab28462a540d7f0d8affdf3be9ab83ad873942f4d7169",
+                    "hash" : "0x278c6d69454c759028bab28462a540d7f0d8affdf3be9ab83ad873942f4d7169",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "278c6d69454c759028bab28462a540d7f0d8affdf3be9ab83ad873942f4d7169",
+                    "hash" : "0x278c6d69454c759028bab28462a540d7f0d8affdf3be9ab83ad873942f4d7169",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "1ccdddfee7c5341f862e77e4b217b4ab98be631d8dd5c81a328b57efcb2f00ef",
+                    "hash" : "0x1ccdddfee7c5341f862e77e4b217b4ab98be631d8dd5c81a328b57efcb2f00ef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_1.json b/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_1.json
index a10b64c5f..8b9138b4e 100644
--- a/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_1.json
+++ b/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_1.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcallcode_101_OOGMAfter_1" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9cea071166a4152be65f70641dad45a5281bb3166af3b879a1f81c1f30cd03dd",
+                    "hash" : "0x9cea071166a4152be65f70641dad45a5281bb3166af3b879a1f81c1f30cd03dd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9cea071166a4152be65f70641dad45a5281bb3166af3b879a1f81c1f30cd03dd",
+                    "hash" : "0x9cea071166a4152be65f70641dad45a5281bb3166af3b879a1f81c1f30cd03dd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9dadc649bd108ae1326e1f7d8a113435e18e38fa2e345ebbe8e3b6c57d17c0b6",
+                    "hash" : "0x9dadc649bd108ae1326e1f7d8a113435e18e38fa2e345ebbe8e3b6c57d17c0b6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9dadc649bd108ae1326e1f7d8a113435e18e38fa2e345ebbe8e3b6c57d17c0b6",
+                    "hash" : "0x9dadc649bd108ae1326e1f7d8a113435e18e38fa2e345ebbe8e3b6c57d17c0b6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9cea071166a4152be65f70641dad45a5281bb3166af3b879a1f81c1f30cd03dd",
+                    "hash" : "0x9cea071166a4152be65f70641dad45a5281bb3166af3b879a1f81c1f30cd03dd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_2.json b/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_2.json
index 2e030decf..27148623b 100644
--- a/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_2.json
+++ b/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_2.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcallcode_101_OOGMAfter_2" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "72789093fd286d124a94068c11cb5189564e50490626464d2d3aab6ec7049aac",
+                    "hash" : "0x72789093fd286d124a94068c11cb5189564e50490626464d2d3aab6ec7049aac",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "72789093fd286d124a94068c11cb5189564e50490626464d2d3aab6ec7049aac",
+                    "hash" : "0x72789093fd286d124a94068c11cb5189564e50490626464d2d3aab6ec7049aac",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6d479eeebd4394d608e4c0773568b4b397afc1528e762283fe0e412f9dd4cd61",
+                    "hash" : "0x6d479eeebd4394d608e4c0773568b4b397afc1528e762283fe0e412f9dd4cd61",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e992a79fb556b4ffabc16a460d25f8201d477ff4bccf72b91d505b74e5084069",
+                    "hash" : "0xe992a79fb556b4ffabc16a460d25f8201d477ff4bccf72b91d505b74e5084069",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "72789093fd286d124a94068c11cb5189564e50490626464d2d3aab6ec7049aac",
+                    "hash" : "0x72789093fd286d124a94068c11cb5189564e50490626464d2d3aab6ec7049aac",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c95f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_3.json b/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_3.json
index d54797042..5e2872201 100644
--- a/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_3.json
+++ b/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_3.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcallcode_101_OOGMAfter_3" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "58639a1a71f4da2f6795c2a3c4dbcac89c34e9b9aeebd669d1f5868615a93208",
+                    "hash" : "0x58639a1a71f4da2f6795c2a3c4dbcac89c34e9b9aeebd669d1f5868615a93208",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "58639a1a71f4da2f6795c2a3c4dbcac89c34e9b9aeebd669d1f5868615a93208",
+                    "hash" : "0x58639a1a71f4da2f6795c2a3c4dbcac89c34e9b9aeebd669d1f5868615a93208",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "32d1c8975997225104e8de7199b9e8ce62ba0565858d7061c949cb14f2acf6d2",
+                    "hash" : "0x32d1c8975997225104e8de7199b9e8ce62ba0565858d7061c949cb14f2acf6d2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "84f98a6f88dfc72446020065f3e1b40263570f9ab2fa17d80a47a1c5594d9bfe",
+                    "hash" : "0x84f98a6f88dfc72446020065f3e1b40263570f9ab2fa17d80a47a1c5594d9bfe",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "58639a1a71f4da2f6795c2a3c4dbcac89c34e9b9aeebd669d1f5868615a93208",
+                    "hash" : "0x58639a1a71f4da2f6795c2a3c4dbcac89c34e9b9aeebd669d1f5868615a93208",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_1.json b/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_1.json
index 7f9fe2108..c8ebe8082 100644
--- a/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_1.json
+++ b/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_1.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecall_110_OOGMAfter_1" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "19981474be0091e4bcf8c3ced4c9a2b9264ab6f76ccb3708560a5fa014f74677",
+                    "hash" : "0x19981474be0091e4bcf8c3ced4c9a2b9264ab6f76ccb3708560a5fa014f74677",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "19981474be0091e4bcf8c3ced4c9a2b9264ab6f76ccb3708560a5fa014f74677",
+                    "hash" : "0x19981474be0091e4bcf8c3ced4c9a2b9264ab6f76ccb3708560a5fa014f74677",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "7f80cbb5991fa0786b95a163abe66f6ed0b4e9a59ea334c8b9c849dfd8578cb4",
+                    "hash" : "0x7f80cbb5991fa0786b95a163abe66f6ed0b4e9a59ea334c8b9c849dfd8578cb4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9c301320a19121eac101086d4959324be54a0409be44ca96a9a6047bb76a74a7",
+                    "hash" : "0x9c301320a19121eac101086d4959324be54a0409be44ca96a9a6047bb76a74a7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "19981474be0091e4bcf8c3ced4c9a2b9264ab6f76ccb3708560a5fa014f74677",
+                    "hash" : "0x19981474be0091e4bcf8c3ced4c9a2b9264ab6f76ccb3708560a5fa014f74677",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c95f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_2.json b/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_2.json
index 7ec71464f..f91707311 100644
--- a/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_2.json
+++ b/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_2.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecall_110_OOGMAfter_2" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "62010bbb8d95a6c25afbaa0ede857cd283cac73a00a420261a3ec0169a5bd5b4",
+                    "hash" : "0x62010bbb8d95a6c25afbaa0ede857cd283cac73a00a420261a3ec0169a5bd5b4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "62010bbb8d95a6c25afbaa0ede857cd283cac73a00a420261a3ec0169a5bd5b4",
+                    "hash" : "0x62010bbb8d95a6c25afbaa0ede857cd283cac73a00a420261a3ec0169a5bd5b4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "138c60f195439626897fb8dadf9cfe47c646ad81c58e574189074f237c6ae056",
+                    "hash" : "0x138c60f195439626897fb8dadf9cfe47c646ad81c58e574189074f237c6ae056",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ad940b40dea79c3e416dae92a5713a44612a519ad5dc4e9d71268c0155fc847c",
+                    "hash" : "0xad940b40dea79c3e416dae92a5713a44612a519ad5dc4e9d71268c0155fc847c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "62010bbb8d95a6c25afbaa0ede857cd283cac73a00a420261a3ec0169a5bd5b4",
+                    "hash" : "0x62010bbb8d95a6c25afbaa0ede857cd283cac73a00a420261a3ec0169a5bd5b4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_3.json b/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_3.json
index 29930e8c8..8f5553848 100644
--- a/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_3.json
+++ b/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_3.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecall_110_OOGMAfter_3" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "36fee991ca568d9360f7aea3e69b13c04ed83efa13dd71b91b7bb3b9d41e345b",
+                    "hash" : "0x36fee991ca568d9360f7aea3e69b13c04ed83efa13dd71b91b7bb3b9d41e345b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "36fee991ca568d9360f7aea3e69b13c04ed83efa13dd71b91b7bb3b9d41e345b",
+                    "hash" : "0x36fee991ca568d9360f7aea3e69b13c04ed83efa13dd71b91b7bb3b9d41e345b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "961d5c285a8e9cfd352cd1a30ff61cc7afe45d8474265fc2b63c6c9c67296b90",
+                    "hash" : "0x961d5c285a8e9cfd352cd1a30ff61cc7afe45d8474265fc2b63c6c9c67296b90",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "961d5c285a8e9cfd352cd1a30ff61cc7afe45d8474265fc2b63c6c9c67296b90",
+                    "hash" : "0x961d5c285a8e9cfd352cd1a30ff61cc7afe45d8474265fc2b63c6c9c67296b90",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "36fee991ca568d9360f7aea3e69b13c04ed83efa13dd71b91b7bb3b9d41e345b",
+                    "hash" : "0x36fee991ca568d9360f7aea3e69b13c04ed83efa13dd71b91b7bb3b9d41e345b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter.json b/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter.json
index 97ae3fbbc..9496e79bb 100644
--- a/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter.json
+++ b/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecallcode_111_OOGMAfter" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "2f6ccfc9fda43ebb03e01bc68951ec9bf51f62a9c5cf1ed708701f343df4eee4",
+                    "hash" : "0x2f6ccfc9fda43ebb03e01bc68951ec9bf51f62a9c5cf1ed708701f343df4eee4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "2f6ccfc9fda43ebb03e01bc68951ec9bf51f62a9c5cf1ed708701f343df4eee4",
+                    "hash" : "0x2f6ccfc9fda43ebb03e01bc68951ec9bf51f62a9c5cf1ed708701f343df4eee4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6b91bfc795dca3991ec5721c8ea8a823e6dd446688e27285d8d0500bba8ab56c",
+                    "hash" : "0x6b91bfc795dca3991ec5721c8ea8a823e6dd446688e27285d8d0500bba8ab56c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6b91bfc795dca3991ec5721c8ea8a823e6dd446688e27285d8d0500bba8ab56c",
+                    "hash" : "0x6b91bfc795dca3991ec5721c8ea8a823e6dd446688e27285d8d0500bba8ab56c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "2f6ccfc9fda43ebb03e01bc68951ec9bf51f62a9c5cf1ed708701f343df4eee4",
+                    "hash" : "0x2f6ccfc9fda43ebb03e01bc68951ec9bf51f62a9c5cf1ed708701f343df4eee4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_1.json b/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_1.json
index 120bd8258..6f24804e8 100644
--- a/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_1.json
+++ b/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_1.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecallcode_111_OOGMAfter_1" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1b7fea7d4d78014c3e60b9a5f7c93a6588cfbf841bf82a6dae077a662a20e2df",
+                    "hash" : "0x1b7fea7d4d78014c3e60b9a5f7c93a6588cfbf841bf82a6dae077a662a20e2df",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "1b7fea7d4d78014c3e60b9a5f7c93a6588cfbf841bf82a6dae077a662a20e2df",
+                    "hash" : "0x1b7fea7d4d78014c3e60b9a5f7c93a6588cfbf841bf82a6dae077a662a20e2df",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a4e4b368d67023020c45ebf2a58f6e357d6d2a9b74191722a0ef6ecea030a9ec",
+                    "hash" : "0xa4e4b368d67023020c45ebf2a58f6e357d6d2a9b74191722a0ef6ecea030a9ec",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "fb7d9040e9e5916420948b71d1a123ab257038690f6998aa29bcc2de613c26b8",
+                    "hash" : "0xfb7d9040e9e5916420948b71d1a123ab257038690f6998aa29bcc2de613c26b8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "1b7fea7d4d78014c3e60b9a5f7c93a6588cfbf841bf82a6dae077a662a20e2df",
+                    "hash" : "0x1b7fea7d4d78014c3e60b9a5f7c93a6588cfbf841bf82a6dae077a662a20e2df",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaecf4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619ca4f46001555a600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_2.json b/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_2.json
index 64c671c2d..158db6ccf 100644
--- a/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_2.json
+++ b/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_2.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecallcode_111_OOGMAfter_2" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "711948edc65c8b7d199a7731e6054d7e07d06c083eb98c473d3cde0e85488e5a",
+                    "hash" : "0x711948edc65c8b7d199a7731e6054d7e07d06c083eb98c473d3cde0e85488e5a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "711948edc65c8b7d199a7731e6054d7e07d06c083eb98c473d3cde0e85488e5a",
+                    "hash" : "0x711948edc65c8b7d199a7731e6054d7e07d06c083eb98c473d3cde0e85488e5a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2b024b21c2daf897cc6913b84049c8e13b8919bd596cb7041d771e8c44262849",
+                    "hash" : "0x2b024b21c2daf897cc6913b84049c8e13b8919bd596cb7041d771e8c44262849",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b53d71ec73b762655d97cbd7e1b208ae64409ae2cd3d38574dec49d07d20109f",
+                    "hash" : "0xb53d71ec73b762655d97cbd7e1b208ae64409ae2cd3d38574dec49d07d20109f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "711948edc65c8b7d199a7731e6054d7e07d06c083eb98c473d3cde0e85488e5a",
+                    "hash" : "0x711948edc65c8b7d199a7731e6054d7e07d06c083eb98c473d3cde0e85488e5a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaecf4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619ca4f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_3.json b/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_3.json
index e7ef04af3..e28433482 100644
--- a/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_3.json
+++ b/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_3.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecallcode_111_OOGMAfter_3" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "011fa4e27c42d447b72696d3aa37e5c1594c5a0228c2703270fc76b48b2ee39b",
+                    "hash" : "0x011fa4e27c42d447b72696d3aa37e5c1594c5a0228c2703270fc76b48b2ee39b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "011fa4e27c42d447b72696d3aa37e5c1594c5a0228c2703270fc76b48b2ee39b",
+                    "hash" : "0x011fa4e27c42d447b72696d3aa37e5c1594c5a0228c2703270fc76b48b2ee39b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "89be528276a8183204498a5272ed515fa790cee710ef54d679657bd45159b59b",
+                    "hash" : "0x89be528276a8183204498a5272ed515fa790cee710ef54d679657bd45159b59b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "0550d64d8201900071745405c166cde9253bbc201a9031b932c76f4d5f496ddc",
+                    "hash" : "0x0550d64d8201900071745405c166cde9253bbc201a9031b932c76f4d5f496ddc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "011fa4e27c42d447b72696d3aa37e5c1594c5a0228c2703270fc76b48b2ee39b",
+                    "hash" : "0x011fa4e27c42d447b72696d3aa37e5c1594c5a0228c2703270fc76b48b2ee39b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaecf4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided.json b/GeneralStateTests/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided.json
index f52244e29..9114f0cec 100644
--- a/GeneralStateTests/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided.json
+++ b/GeneralStateTests/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided.json
@@ -1,17 +1,17 @@
 {
     "contractCreationMakeCallThatAskMoreGasThenTransactionProvided" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "28986b1dd2a8b774b9c931b43a146f60686ed1fd6073f59f6ce678a27eb9ff7a",
+                    "hash" : "0x28986b1dd2a8b774b9c931b43a146f60686ed1fd6073f59f6ce678a27eb9ff7a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "8b1de25de155bec2239c83319199bd3b822b0bfbf7cbb6a23ac39ef11538f018",
+                    "hash" : "0x8b1de25de155bec2239c83319199bd3b822b0bfbf7cbb6a23ac39ef11538f018",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2960c7ae0990124a74d14254b302f847bdac3c0f0d6e438d93114ab442c54bf1",
+                    "hash" : "0x2960c7ae0990124a74d14254b302f847bdac3c0f0d6e438d93114ab442c54bf1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "af7b43e1b2c6afeca739391b312df5262af05dd64b6d0716d26d8d66816c8278",
+                    "hash" : "0xaf7b43e1b2c6afeca739391b312df5262af05dd64b6d0716d26d8d66816c8278",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "8b1de25de155bec2239c83319199bd3b822b0bfbf7cbb6a23ac39ef11538f018",
+                    "hash" : "0x8b1de25de155bec2239c83319199bd3b822b0bfbf7cbb6a23ac39ef11538f018",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0186a0",
                 "code" : "0x6001600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x10c8e0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161c350f1",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 "0x6040600060406000600073100000000000000000000000000000000000000161c350f1"
             ],
             "gasLimit" : [
-                "96000"
+                "0x017700"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                ""
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/createInitFail_OOGduringInit.json b/GeneralStateTests/stChangedEIP150/createInitFail_OOGduringInit.json
index 891bd3faa..e842aeede 100644
--- a/GeneralStateTests/stChangedEIP150/createInitFail_OOGduringInit.json
+++ b/GeneralStateTests/stChangedEIP150/createInitFail_OOGduringInit.json
@@ -1,17 +1,17 @@
 {
     "createInitFail_OOGduringInit" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "97f22c8456ec99501c3eb4f86927b26c6aa50f658a5939fdc20234f1d376a6e0",
+                    "hash" : "0x97f22c8456ec99501c3eb4f86927b26c6aa50f658a5939fdc20234f1d376a6e0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "97f22c8456ec99501c3eb4f86927b26c6aa50f658a5939fdc20234f1d376a6e0",
+                    "hash" : "0x97f22c8456ec99501c3eb4f86927b26c6aa50f658a5939fdc20234f1d376a6e0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "297303455494578a5176177ff1b9db0b0a516255a3d062fb960bbc99e60d8eb5",
+                    "hash" : "0x297303455494578a5176177ff1b9db0b0a516255a3d062fb960bbc99e60d8eb5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "297303455494578a5176177ff1b9db0b0a516255a3d062fb960bbc99e60d8eb5",
+                    "hash" : "0x297303455494578a5176177ff1b9db0b0a516255a3d062fb960bbc99e60d8eb5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "97f22c8456ec99501c3eb4f86927b26c6aa50f658a5939fdc20234f1d376a6e0",
+                    "hash" : "0x97f22c8456ec99501c3eb4f86927b26c6aa50f658a5939fdc20234f1d376a6e0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x605a600053600160006001f0ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "53021"
+                "0xcf1d"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stCodeSizeLimit/codesizeOOGInvalidSize.json b/GeneralStateTests/stCodeSizeLimit/codesizeOOGInvalidSize.json
index 156acf2d1..960c8b24f 100644
--- a/GeneralStateTests/stCodeSizeLimit/codesizeOOGInvalidSize.json
+++ b/GeneralStateTests/stCodeSizeLimit/codesizeOOGInvalidSize.json
@@ -1,17 +1,17 @@
 {
     "codesizeOOGInvalidSize" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x01312d00",
             "currentNumber" : "0x1388",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f4a92bf13d856a56cf6c8116417600dce83d0a8f3d13953424dbacb1baa2a3fe",
+                    "hash" : "0xf4a92bf13d856a56cf6c8116417600dce83d0a8f3d13953424dbacb1baa2a3fe",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f4a92bf13d856a56cf6c8116417600dce83d0a8f3d13953424dbacb1baa2a3fe",
+                    "hash" : "0xf4a92bf13d856a56cf6c8116417600dce83d0a8f3d13953424dbacb1baa2a3fe",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5ecc2d76e1e33d08da794adfc95249b1b7edd85b164598fab13306b2471ec1d4",
+                    "hash" : "0x5ecc2d76e1e33d08da794adfc95249b1b7edd85b164598fab13306b2471ec1d4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "7a4cf6e89654deb5c906223784e50161be0fb8bfb5e851eebdc810362f812e79",
+                    "hash" : "0x7a4cf6e89654deb5c906223784e50161be0fb8bfb5e851eebdc810362f812e79",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f4a92bf13d856a56cf6c8116417600dce83d0a8f3d13953424dbacb1baa2a3fe",
+                    "hash" : "0xf4a92bf13d856a56cf6c8116417600dce83d0a8f3d13953424dbacb1baa2a3fe",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -74,14 +74,14 @@
                 "0x606060405261600d806100126000396000f36060604052361561007f576000357c010000000000000000000000000000000000000000000000000000000090048063a3b9f3e514610084578063b50345b614610098578063d4f639ea146100ac578063d9bb316f146100c0578063e0afb8bd146100d4578063e22a5d5b146100e8578063f983c0fa146100fc5761007f565b610002565b34610002576100966004805050610110565b005b34610002576100aa60048050506110b6565b005b34610002576100be600480505061205c565b005b34610002576100d26004805050613002565b005b34610002576100e66004805050613fa8565b005b34610002576100fa60048050506140c1565b005b346100025761010e6004805050615067565b005b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b600073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000311905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b5056"
             ],
             "gasLimit" : [
-                "15000000"
+                "0xe4e1c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stCodeSizeLimit/codesizeValid.json b/GeneralStateTests/stCodeSizeLimit/codesizeValid.json
index 32c542653..af4132965 100644
--- a/GeneralStateTests/stCodeSizeLimit/codesizeValid.json
+++ b/GeneralStateTests/stCodeSizeLimit/codesizeValid.json
@@ -1,17 +1,17 @@
 {
     "codesizeValid" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x01312d00",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6322ef095d21e84a502f9b8f57dcfb33098cd0744b3b732ed2143a0b42386655",
+                    "hash" : "0x6322ef095d21e84a502f9b8f57dcfb33098cd0744b3b732ed2143a0b42386655",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "5de745f7ceaf31700c6ace69b00b6ac7586270a0d09455ef48529080cfc1cedc",
+                    "hash" : "0x5de745f7ceaf31700c6ace69b00b6ac7586270a0d09455ef48529080cfc1cedc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "781aca177d6e578a2b902e08207e79c89db94bd1d2138d53687b652586eb8a45",
+                    "hash" : "0x781aca177d6e578a2b902e08207e79c89db94bd1d2138d53687b652586eb8a45",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6322ef095d21e84a502f9b8f57dcfb33098cd0744b3b732ed2143a0b42386655",
+                    "hash" : "0x6322ef095d21e84a502f9b8f57dcfb33098cd0744b3b732ed2143a0b42386655",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "5de745f7ceaf31700c6ace69b00b6ac7586270a0d09455ef48529080cfc1cedc",
+                    "hash" : "0x5de745f7ceaf31700c6ace69b00b6ac7586270a0d09455ef48529080cfc1cedc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -74,14 +74,14 @@
                 "0x6060604052615ed5806100126000396000f360606040523615610074576000357c010000000000000000000000000000000000000000000000000000000090048063a3b9f3e514610079578063b50345b61461008d578063d4f639ea146100a1578063d9bb316f146100b5578063e22a5d5b146100c9578063f983c0fa146100dd57610074565b610002565b346100025761008b60048050506100f1565b005b346100025761009f6004805050611097565b005b34610002576100b3600480505061203d565b005b34610002576100c76004805050612fe3565b005b34610002576100db6004805050613f89565b005b34610002576100ef6004805050614f2f565b005b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b50565b6000731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000019050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000002905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000390508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000049050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000005905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000690508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000079050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000008905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000000990508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000000109050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000101905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010290508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001039050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000104905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010590508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001069050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000107905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010890508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001099050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000110905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020190508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002029050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000203905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020490508050731000000000000000000000000000000000000205905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000206905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020790508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002089050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000209905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000021090508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003019050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000302905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030390508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003049050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000305905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030690508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003079050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000308905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000030990508050731000000000000000000000000000000000000310905080507310000000000000000000000000000000000003109050805073100000000000000000000000000000000000000190508050731000000000000000000000000000000000000001905080507310000000000000000000000000000000000000029050805073100000000000000000000000000000000000000290508050731000000000000000000000000000000000000003905080507310000000000000000000000000000000000000039050805073100000000000000000000000000000000000000490508050731000000000000000000000000000000000000004905080507310000000000000000000000000000000000000059050805073100000000000000000000000000000000000000590508050731000000000000000000000000000000000000006905080507310000000000000000000000000000000000000069050805073100000000000000000000000000000000000000790508050731000000000000000000000000000000000000007905080507310000000000000000000000000000000000000089050805073100000000000000000000000000000000000000890508050731000000000000000000000000000000000000009905080507310000000000000000000000000000000000000099050805073100000000000000000000000000000000000001090508050731000000000000000000000000000000000000010905080507310000000000000000000000000000000000001019050805073100000000000000000000000000000000000010190508050731000000000000000000000000000000000000102905080507310000000000000000000000000000000000001029050805073100000000000000000000000000000000000010390508050731000000000000000000000000000000000000103905080507310000000000000000000000000000000000001049050805073100000000000000000000000000000000000010490508050731000000000000000000000000000000000000105905080507310000000000000000000000000000000000001059050805073100000000000000000000000000000000000010690508050731000000000000000000000000000000000000106905080507310000000000000000000000000000000000001079050805073100000000000000000000000000000000000010790508050731000000000000000000000000000000000000108905080507310000000000000000000000000000000000001089050805073100000000000000000000000000000000000010990508050731000000000000000000000000000000000000109905080507310000000000000000000000000000000000001109050805073100000000000000000000000000000000000011090508050731000000000000000000000000000000000000201905080507310000000000000000000000000000000000002019050805073100000000000000000000000000000000000020290508050731000000000000000000000000000000000000202905080507310000000000000000000000000000000000002039050805073100000000000000000000000000000000000020390508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002049050805073100000000000000000000000000000000000020590508050731000000000000000000000000000000000000204905080507310000000000000000000000000000000000002069050805073100000000000000000000000000000000000020690508050731000000000000000000000000000000000000207905080507310000000000000000000000000000000000002079050805073100000000000000000000000000000000000020890508050731000000000000000000000000000000000000208905080507310000000000000000000000000000000000002099050805073100000000000000000000000000000000000020990508050731000000000000000000000000000000000000210905080507310000000000000000000000000000000000002109050805073100000000000000000000000000000000000030190508050731000000000000000000000000000000000000301905080507310000000000000000000000000000000000003029050805073100000000000000000000000000000000000030290508050731000000000000000000000000000000000000303905080507310000000000000000000000000000000000003039050805073100000000000000000000000000000000000030490508050731000000000000000000000000000000000000304905080507310000000000000000000000000000000000003059050805073100000000000000000000000000000000000030590508050731000000000000000000000000000000000000306905080507310000000000000000000000000000000000003069050805073100000000000000000000000000000000000030790508050731000000000000000000000000000000000000307905080507310000000000000000000000000000000000003089050805073100000000000000000000000000000000000030890508050731000000000000000000000000000000000000309905080507310000000000000000000000000000000000003099050805073100000000000000000000000000000000000031090508050731000000000000000000000000000000000000310905080505b5056"
             ],
             "gasLimit" : [
-                "15000000"
+                "0xe4e1c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stCreateTest/CREATE_AcreateB_BSuicide_BStore.json b/GeneralStateTests/stCreateTest/CREATE_AcreateB_BSuicide_BStore.json
index 111faffcd..f3dbe26f9 100644
--- a/GeneralStateTests/stCreateTest/CREATE_AcreateB_BSuicide_BStore.json
+++ b/GeneralStateTests/stCreateTest/CREATE_AcreateB_BSuicide_BStore.json
@@ -1,17 +1,17 @@
 {
     "CREATE_AcreateB_BSuicide_BStore" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d4753925482b62ec7ad7fc3bddff66de44a3a7cd83e3cdba0cd8b6fa73f814b9",
+                    "hash" : "0xd4753925482b62ec7ad7fc3bddff66de44a3a7cd83e3cdba0cd8b6fa73f814b9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e2cd6426cb1f1056e3499789297ae9c15323adaac4bf86a28929eb3ebe26fe67",
+                    "hash" : "0xe2cd6426cb1f1056e3499789297ae9c15323adaac4bf86a28929eb3ebe26fe67",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "cb20c3bae000723d5ebaf98ff88ff867c7a017644c44c647533ecdb13a40baec",
+                    "hash" : "0xcb20c3bae000723d5ebaf98ff88ff867c7a017644c44c647533ecdb13a40baec",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "cb20c3bae000723d5ebaf98ff88ff867c7a017644c44c647533ecdb13a40baec",
+                    "hash" : "0xcb20c3bae000723d5ebaf98ff88ff867c7a017644c44c647533ecdb13a40baec",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e2cd6426cb1f1056e3499789297ae9c15323adaac4bf86a28929eb3ebe26fe67",
+                    "hash" : "0xe2cd6426cb1f1056e3499789297ae9c15323adaac4bf86a28929eb3ebe26fe67",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
                 "code" : "0x60606040526000357c010000000000000000000000000000000000000000000000000000000090048063c04062261461003c57610037565b610002565b346100025761004e6004805050610050565b005b600060405160c9806101d3833901809050604051809103906000f080156100025790508073ffffffffffffffffffffffffffffffffffffffff166369bda7aa604051817c0100000000000000000000000000000000000000000000000000000000028152600401809050600060405180830381600087803b156100025760325a03f115610002575050508073ffffffffffffffffffffffffffffffffffffffff16633ac6dff3604051817c0100000000000000000000000000000000000000000000000000000000028152600401809050600060405180830381600087803b156100025760325a03f115610002575050508073ffffffffffffffffffffffffffffffffffffffff16636f118b2b600060405160200152604051817c0100000000000000000000000000000000000000000000000000000000028152600401809050602060405180830381600087803b156100025760325a03f115610002575050506040518051906020015060016000508190555060016000600050819055505b5056606060405260b98060106000396000f360606040526000357c0100000000000000000000000000000000000000000000000000000000900480633ac6dff314604d57806369bda7aa14605e5780636f118b2b14606f576049565b6002565b34600257605c60048050506094565b005b34600257606d600480505060a2565b005b34600257607e600480505060a8565b6040518082815260200191505060405180910390f35b600c6000600050819055505b565b6011ff5b565b6000600060005054905060b6565b9056",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 "0xc0406226"
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit.json b/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit.json
index 5ef72182f..80f4093fc 100644
--- a/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit.json
+++ b/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit.json
@@ -1,17 +1,17 @@
 {
     "CREATE_ContractSuicideDuringInit" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f5351ae35a94adcc18f2c1a7146c9104063025540cf13f0bb9e1a70bae6c8b8e",
+                    "hash" : "0xf5351ae35a94adcc18f2c1a7146c9104063025540cf13f0bb9e1a70bae6c8b8e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f5351ae35a94adcc18f2c1a7146c9104063025540cf13f0bb9e1a70bae6c8b8e",
+                    "hash" : "0xf5351ae35a94adcc18f2c1a7146c9104063025540cf13f0bb9e1a70bae6c8b8e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f333a603e17f77ee796862f7866bba49c697f704dcd4b42c12f496849d18c466",
+                    "hash" : "0xf333a603e17f77ee796862f7866bba49c697f704dcd4b42c12f496849d18c466",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "7663f589c5be87be629223cdc3dba8feebabdd3d3a66978cc994481d9ab8185d",
+                    "hash" : "0x7663f589c5be87be629223cdc3dba8feebabdd3d3a66978cc994481d9ab8185d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f5351ae35a94adcc18f2c1a7146c9104063025540cf13f0bb9e1a70bae6c8b8e",
+                    "hash" : "0xf5351ae35a94adcc18f2c1a7146c9104063025540cf13f0bb9e1a70bae6c8b8e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,14 +61,14 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x600c600155",
                 "nonce" : "0x00",
@@ -81,14 +81,14 @@
                 "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1506d64600c6000556000526005601bf360005273c94f5374fce5edbc8e2a8697c15331677e6ebf0bff"
             ],
             "gasLimit" : [
-                "150000"
+                "0x0249f0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_ThenStoreThenReturn.json b/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_ThenStoreThenReturn.json
index 11a9d0428..4980f2150 100644
--- a/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_ThenStoreThenReturn.json
+++ b/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_ThenStoreThenReturn.json
@@ -1,17 +1,17 @@
 {
     "CREATE_ContractSuicideDuringInit_ThenStoreThenReturn" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b595384d7a1d0a1da23f6922efd8fe572594738d52fd73d01911cab6d0c7f5c1",
+                    "hash" : "0xb595384d7a1d0a1da23f6922efd8fe572594738d52fd73d01911cab6d0c7f5c1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b595384d7a1d0a1da23f6922efd8fe572594738d52fd73d01911cab6d0c7f5c1",
+                    "hash" : "0xb595384d7a1d0a1da23f6922efd8fe572594738d52fd73d01911cab6d0c7f5c1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "78fa6f579e8822277b1d808d4fd1aba99be3a9e6ebbe9d850fa5956f996c54f5",
+                    "hash" : "0x78fa6f579e8822277b1d808d4fd1aba99be3a9e6ebbe9d850fa5956f996c54f5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "cd847e15911f01978a16197eea0c4a9610bacdd08ea1d9d3cf17eb2f2f6b2440",
+                    "hash" : "0xcd847e15911f01978a16197eea0c4a9610bacdd08ea1d9d3cf17eb2f2f6b2440",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b595384d7a1d0a1da23f6922efd8fe572594738d52fd73d01911cab6d0c7f5c1",
+                    "hash" : "0xb595384d7a1d0a1da23f6922efd8fe572594738d52fd73d01911cab6d0c7f5c1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x600c600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x600c600155",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1506d64600c6000556000526005601bf360005273d94f5374fce5edbc8e2a8697c15331677e6ebf0bff6000600060006000600073d94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f150600b600055600e6012f3"
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_WithValue.json b/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_WithValue.json
index a66cd5b9e..ef1485a60 100644
--- a/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_WithValue.json
+++ b/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_WithValue.json
@@ -1,17 +1,17 @@
 {
     "CREATE_ContractSuicideDuringInit_WithValue" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "01a15e87137e1d98fbd54a8848b1fa9af1d6ef167cb44676cf8eedf32760e916",
+                    "hash" : "0x01a15e87137e1d98fbd54a8848b1fa9af1d6ef167cb44676cf8eedf32760e916",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "01a15e87137e1d98fbd54a8848b1fa9af1d6ef167cb44676cf8eedf32760e916",
+                    "hash" : "0x01a15e87137e1d98fbd54a8848b1fa9af1d6ef167cb44676cf8eedf32760e916",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "96315472f25e8d8de55427dbff149b38266f4bd3089be65f9535ebf3a173a930",
+                    "hash" : "0x96315472f25e8d8de55427dbff149b38266f4bd3089be65f9535ebf3a173a930",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "53b23926c5e12f4869f749070ff00caa71b17ea05153e6223673689c7d15cb5b",
+                    "hash" : "0x53b23926c5e12f4869f749070ff00caa71b17ea05153e6223673689c7d15cb5b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "01a15e87137e1d98fbd54a8848b1fa9af1d6ef167cb44676cf8eedf32760e916",
+                    "hash" : "0x01a15e87137e1d98fbd54a8848b1fa9af1d6ef167cb44676cf8eedf32760e916",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,14 +61,14 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x600c600155",
                 "nonce" : "0x00",
@@ -81,14 +81,14 @@
                 "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1506d64600c6000556000526005601bf360005273c94f5374fce5edbc8e2a8697c15331677e6ebf0bff"
             ],
             "gasLimit" : [
-                "150000"
+                "0x0249f0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueToItself.json b/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueToItself.json
index 03d4a298e..083d5efd9 100644
--- a/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueToItself.json
+++ b/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueToItself.json
@@ -1,17 +1,17 @@
 {
     "CREATE_ContractSuicideDuringInit_WithValueToItself" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a138dc955ed2b1ca44c49922bdfbead3432895236dfec4bfd66396e44f2f1229",
+                    "hash" : "0xa138dc955ed2b1ca44c49922bdfbead3432895236dfec4bfd66396e44f2f1229",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a138dc955ed2b1ca44c49922bdfbead3432895236dfec4bfd66396e44f2f1229",
+                    "hash" : "0xa138dc955ed2b1ca44c49922bdfbead3432895236dfec4bfd66396e44f2f1229",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "d64663da328381d656a93fe6be26d5e3b2ec79d62020d79dcbe09748d084fb41",
+                    "hash" : "0xd64663da328381d656a93fe6be26d5e3b2ec79d62020d79dcbe09748d084fb41",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a287629b270c19f511e554e3737c0a3db3ef1cb2d9b172fe93c690e8f6d6eab7",
+                    "hash" : "0xa287629b270c19f511e554e3737c0a3db3ef1cb2d9b172fe93c690e8f6d6eab7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a138dc955ed2b1ca44c49922bdfbead3432895236dfec4bfd66396e44f2f1229",
+                    "hash" : "0xa138dc955ed2b1ca44c49922bdfbead3432895236dfec4bfd66396e44f2f1229",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,14 +61,14 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x600c600155",
                 "nonce" : "0x00",
@@ -81,14 +81,14 @@
                 "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1506d64600c6000556000526005601bf3600052736295ee1b4f6dd65047762f924ecd367c17eabf8fff"
             ],
             "gasLimit" : [
-                "150000"
+                "0x0249f0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stCreateTest/CREATE_EContractCreateEContractInInit_Tr.json b/GeneralStateTests/stCreateTest/CREATE_EContractCreateEContractInInit_Tr.json
index 05e487741..f51433a7f 100644
--- a/GeneralStateTests/stCreateTest/CREATE_EContractCreateEContractInInit_Tr.json
+++ b/GeneralStateTests/stCreateTest/CREATE_EContractCreateEContractInInit_Tr.json
@@ -1,17 +1,17 @@
 {
     "CREATE_EContractCreateEContractInInit_Tr" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a53c16ef764e59942826a272cb0c2a22cf857019299de8ba689ea99622b96e96",
+                    "hash" : "0xa53c16ef764e59942826a272cb0c2a22cf857019299de8ba689ea99622b96e96",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "008b89d8adaea6f4f0fb50436a903b21ceecff1cc4cd96e77e87a73641815c7f",
+                    "hash" : "0x008b89d8adaea6f4f0fb50436a903b21ceecff1cc4cd96e77e87a73641815c7f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6a3caa9a78c30fa01e1b6dd5c0fe614d05a3c783655d83a0d4d24242c77e4c7d",
+                    "hash" : "0x6a3caa9a78c30fa01e1b6dd5c0fe614d05a3c783655d83a0d4d24242c77e4c7d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "83a8d130edbb4e577e083be49413b90f513f2a9da710706bbd6f99f35874e366",
+                    "hash" : "0x83a8d130edbb4e577e083be49413b90f513f2a9da710706bbd6f99f35874e366",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "008b89d8adaea6f4f0fb50436a903b21ceecff1cc4cd96e77e87a73641815c7f",
+                    "hash" : "0x008b89d8adaea6f4f0fb50436a903b21ceecff1cc4cd96e77e87a73641815c7f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,14 +61,14 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
                 "code" : "0x600c600155",
                 "nonce" : "0x00",
@@ -81,14 +81,14 @@
                 "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f150602060006000f0"
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCreateTest/CREATE_EContractCreateNEContractInInitOOG_Tr.json b/GeneralStateTests/stCreateTest/CREATE_EContractCreateNEContractInInitOOG_Tr.json
index 3dbde582e..ab25f2e6d 100644
--- a/GeneralStateTests/stCreateTest/CREATE_EContractCreateNEContractInInitOOG_Tr.json
+++ b/GeneralStateTests/stCreateTest/CREATE_EContractCreateNEContractInInitOOG_Tr.json
@@ -1,74 +1,114 @@
 {
     "CREATE_EContractCreateNEContractInInitOOG_Tr" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "79636e75640ef283fed3222de13e8771ed5c47b474630aa9a120a9b2b45d86d4",
+                    "hash" : "0x79636e75640ef283fed3222de13e8771ed5c47b474630aa9a120a9b2b45d86d4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     }
+                },
+                {
+                    "hash" : "0xde57d3e6c712a43c036e67e52f47b97db2526acb3a7f86ef47342b9cdb567ae8",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    }
                 }
             ],
             "EIP158" : [
                 {
-                    "hash" : "d63b15ea67d73a31e74acd8df318571c176aff36c564266a6731b7fcb589bb99",
+                    "hash" : "0xd63b15ea67d73a31e74acd8df318571c176aff36c564266a6731b7fcb589bb99",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     }
+                },
+                {
+                    "hash" : "0xde57d3e6c712a43c036e67e52f47b97db2526acb3a7f86ef47342b9cdb567ae8",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    }
                 }
             ],
             "Frontier" : [
                 {
-                    "hash" : "31615cdaada9cfc5f00dcbfaee0844dc2faf4bbd8fafe6de377de1a5beccffd7",
+                    "hash" : "0x31615cdaada9cfc5f00dcbfaee0844dc2faf4bbd8fafe6de377de1a5beccffd7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     }
+                },
+                {
+                    "hash" : "0xde57d3e6c712a43c036e67e52f47b97db2526acb3a7f86ef47342b9cdb567ae8",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    }
                 }
             ],
             "Homestead" : [
                 {
-                    "hash" : "614c26d1539f1de71127ba0184bae3aac2ab10d3ace6fbb3c7b2eec3466314b4",
+                    "hash" : "0x614c26d1539f1de71127ba0184bae3aac2ab10d3ace6fbb3c7b2eec3466314b4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     }
+                },
+                {
+                    "hash" : "0xde57d3e6c712a43c036e67e52f47b97db2526acb3a7f86ef47342b9cdb567ae8",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    }
                 }
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d63b15ea67d73a31e74acd8df318571c176aff36c564266a6731b7fcb589bb99",
+                    "hash" : "0xd63b15ea67d73a31e74acd8df318571c176aff36c564266a6731b7fcb589bb99",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     }
+                },
+                {
+                    "hash" : "0xde57d3e6c712a43c036e67e52f47b97db2526acb3a7f86ef47342b9cdb567ae8",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    }
                 }
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
                 "code" : "0x600c600155",
                 "nonce" : "0x00",
@@ -81,14 +121,15 @@
                 "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1506d64600c6000556000526005601bf3600052600e60126000f0"
             ],
             "gasLimit" : [
-                "160000"
+                "0x027100",
+                "0xea60"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCreateTest/CREATE_EContractCreateNEContractInInit_Tr.json b/GeneralStateTests/stCreateTest/CREATE_EContractCreateNEContractInInit_Tr.json
index ab0ab13de..acf64ec01 100644
--- a/GeneralStateTests/stCreateTest/CREATE_EContractCreateNEContractInInit_Tr.json
+++ b/GeneralStateTests/stCreateTest/CREATE_EContractCreateNEContractInInit_Tr.json
@@ -1,17 +1,17 @@
 {
     "CREATE_EContractCreateNEContractInInit_Tr" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "79636e75640ef283fed3222de13e8771ed5c47b474630aa9a120a9b2b45d86d4",
+                    "hash" : "0x79636e75640ef283fed3222de13e8771ed5c47b474630aa9a120a9b2b45d86d4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d63b15ea67d73a31e74acd8df318571c176aff36c564266a6731b7fcb589bb99",
+                    "hash" : "0xd63b15ea67d73a31e74acd8df318571c176aff36c564266a6731b7fcb589bb99",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "31615cdaada9cfc5f00dcbfaee0844dc2faf4bbd8fafe6de377de1a5beccffd7",
+                    "hash" : "0x31615cdaada9cfc5f00dcbfaee0844dc2faf4bbd8fafe6de377de1a5beccffd7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "614c26d1539f1de71127ba0184bae3aac2ab10d3ace6fbb3c7b2eec3466314b4",
+                    "hash" : "0x614c26d1539f1de71127ba0184bae3aac2ab10d3ace6fbb3c7b2eec3466314b4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d63b15ea67d73a31e74acd8df318571c176aff36c564266a6731b7fcb589bb99",
+                    "hash" : "0xd63b15ea67d73a31e74acd8df318571c176aff36c564266a6731b7fcb589bb99",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,14 +61,14 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
                 "code" : "0x600c600155",
                 "nonce" : "0x00",
@@ -81,14 +81,14 @@
                 "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1506d64600c6000556000526005601bf3600052600e60126000f0"
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCreateTest/CREATE_EContract_ThenCALLToNonExistentAcc.json b/GeneralStateTests/stCreateTest/CREATE_EContract_ThenCALLToNonExistentAcc.json
index 0159200ce..f4b879e55 100644
--- a/GeneralStateTests/stCreateTest/CREATE_EContract_ThenCALLToNonExistentAcc.json
+++ b/GeneralStateTests/stCreateTest/CREATE_EContract_ThenCALLToNonExistentAcc.json
@@ -1,17 +1,17 @@
 {
     "CREATE_EContract_ThenCALLToNonExistentAcc" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "96e22cad6add90b24312de855deb754fdd95e9a703b37db2dfe50bfb4c24a6db",
+                    "hash" : "0x96e22cad6add90b24312de855deb754fdd95e9a703b37db2dfe50bfb4c24a6db",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "3fe65b80e475f6dd5cbba1dc5ab1c48192190b5152dec14d585a2dda3b8cb09c",
+                    "hash" : "0x3fe65b80e475f6dd5cbba1dc5ab1c48192190b5152dec14d585a2dda3b8cb09c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "414473e2b5ccbb95bfc9d02ca0e01da229de28551c4f95979c3f37d46ba075a6",
+                    "hash" : "0x414473e2b5ccbb95bfc9d02ca0e01da229de28551c4f95979c3f37d46ba075a6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "414473e2b5ccbb95bfc9d02ca0e01da229de28551c4f95979c3f37d46ba075a6",
+                    "hash" : "0x414473e2b5ccbb95bfc9d02ca0e01da229de28551c4f95979c3f37d46ba075a6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "3fe65b80e475f6dd5cbba1dc5ab1c48192190b5152dec14d585a2dda3b8cb09c",
+                    "hash" : "0x3fe65b80e475f6dd5cbba1dc5ab1c48192190b5152dec14d585a2dda3b8cb09c",
                     "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" : "0x5a600055602060006000f06001555a6002556000600060006000600073e1ecf98489fa9ed60a664fc4998db699cfa39d4061ea60f16003555a606455",
                 "nonce" : "0x00",
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCreateTest/CREATE_EmptyContract.json b/GeneralStateTests/stCreateTest/CREATE_EmptyContract.json
index 0df5a71b4..bcb28e4bf 100644
--- a/GeneralStateTests/stCreateTest/CREATE_EmptyContract.json
+++ b/GeneralStateTests/stCreateTest/CREATE_EmptyContract.json
@@ -1,17 +1,17 @@
 {
     "CREATE_EmptyContract" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "ccb5dd1bdab508758d44e650ebf8eb21e79f58d0a20b0fe7d4f102dc3b5104d7",
+                    "hash" : "0xccb5dd1bdab508758d44e650ebf8eb21e79f58d0a20b0fe7d4f102dc3b5104d7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "308525f16a2448ccfd5e19ad719a7da2791e36860391b6400e1a9550abdfd281",
+                    "hash" : "0x308525f16a2448ccfd5e19ad719a7da2791e36860391b6400e1a9550abdfd281",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "ccb5dd1bdab508758d44e650ebf8eb21e79f58d0a20b0fe7d4f102dc3b5104d7",
+                    "hash" : "0xccb5dd1bdab508758d44e650ebf8eb21e79f58d0a20b0fe7d4f102dc3b5104d7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ccb5dd1bdab508758d44e650ebf8eb21e79f58d0a20b0fe7d4f102dc3b5104d7",
+                    "hash" : "0xccb5dd1bdab508758d44e650ebf8eb21e79f58d0a20b0fe7d4f102dc3b5104d7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "308525f16a2448ccfd5e19ad719a7da2791e36860391b6400e1a9550abdfd281",
+                    "hash" : "0x308525f16a2448ccfd5e19ad719a7da2791e36860391b6400e1a9550abdfd281",
                     "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" : "0x5a600055602060006000f06001555a606455",
                 "nonce" : "0x00",
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCreateTest/CREATE_EmptyContractAndCallIt_0wei.json b/GeneralStateTests/stCreateTest/CREATE_EmptyContractAndCallIt_0wei.json
index b726768c1..e91f770d1 100644
--- a/GeneralStateTests/stCreateTest/CREATE_EmptyContractAndCallIt_0wei.json
+++ b/GeneralStateTests/stCreateTest/CREATE_EmptyContractAndCallIt_0wei.json
@@ -1,17 +1,17 @@
 {
     "CREATE_EmptyContractAndCallIt_0wei" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9d9b0f4d83b4cc9d694f684b3c5e02ce331296f6de2ca235676789b1fe08efae",
+                    "hash" : "0x9d9b0f4d83b4cc9d694f684b3c5e02ce331296f6de2ca235676789b1fe08efae",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "19d6310e52c8d20f7f4fc424c5b48de170aaf5687712d75530d68ee079457234",
+                    "hash" : "0x19d6310e52c8d20f7f4fc424c5b48de170aaf5687712d75530d68ee079457234",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "c2f8f38782b85d584ac54b4bcd1f3fb47abdcdb89d866651d89c0f92e4cf7734",
+                    "hash" : "0xc2f8f38782b85d584ac54b4bcd1f3fb47abdcdb89d866651d89c0f92e4cf7734",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c2f8f38782b85d584ac54b4bcd1f3fb47abdcdb89d866651d89c0f92e4cf7734",
+                    "hash" : "0xc2f8f38782b85d584ac54b4bcd1f3fb47abdcdb89d866651d89c0f92e4cf7734",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "19d6310e52c8d20f7f4fc424c5b48de170aaf5687712d75530d68ee079457234",
+                    "hash" : "0x19d6310e52c8d20f7f4fc424c5b48de170aaf5687712d75530d68ee079457234",
                     "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" : "0x5a600055602060006000f06001555a6002556000600060006000600060015461ea60f16003555a606455",
                 "nonce" : "0x00",
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCreateTest/CREATE_EmptyContractAndCallIt_1wei.json b/GeneralStateTests/stCreateTest/CREATE_EmptyContractAndCallIt_1wei.json
index 16892d239..cfeea9c63 100644
--- a/GeneralStateTests/stCreateTest/CREATE_EmptyContractAndCallIt_1wei.json
+++ b/GeneralStateTests/stCreateTest/CREATE_EmptyContractAndCallIt_1wei.json
@@ -1,17 +1,17 @@
 {
     "CREATE_EmptyContractAndCallIt_1wei" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "5f819235613ee824d9931511c4f3fcc6b9e6380f531fd55e5d0b194e946f407c",
+                    "hash" : "0x5f819235613ee824d9931511c4f3fcc6b9e6380f531fd55e5d0b194e946f407c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "1335ca3b57b2762b2b943682205ae7e792e2b3a2ec8a123a98a96eb53186f5dd",
+                    "hash" : "0x1335ca3b57b2762b2b943682205ae7e792e2b3a2ec8a123a98a96eb53186f5dd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "53a30101b6f54133217dd206b739841e0472d29e176290d6e3464b94837be861",
+                    "hash" : "0x53a30101b6f54133217dd206b739841e0472d29e176290d6e3464b94837be861",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "53a30101b6f54133217dd206b739841e0472d29e176290d6e3464b94837be861",
+                    "hash" : "0x53a30101b6f54133217dd206b739841e0472d29e176290d6e3464b94837be861",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "1335ca3b57b2762b2b943682205ae7e792e2b3a2ec8a123a98a96eb53186f5dd",
+                    "hash" : "0x1335ca3b57b2762b2b943682205ae7e792e2b3a2ec8a123a98a96eb53186f5dd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,14 +61,14 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x5a600055602060006000f06001555a6002556000600060006000600160015461ea60f16003555a606455",
                 "nonce" : "0x00",
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithBalance.json b/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithBalance.json
index aa0742c17..da843ed63 100644
--- a/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithBalance.json
+++ b/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithBalance.json
@@ -1,17 +1,17 @@
 {
     "CREATE_EmptyContractWithBalance" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f4bd411c00e8158955baa48589471d9b3c534e77697173b44baeac86828a4782",
+                    "hash" : "0xf4bd411c00e8158955baa48589471d9b3c534e77697173b44baeac86828a4782",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "87dcd926369bb5229d8aa73a4dc5295ce32a9bd9b6448336678f000d3420be18",
+                    "hash" : "0x87dcd926369bb5229d8aa73a4dc5295ce32a9bd9b6448336678f000d3420be18",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f4bd411c00e8158955baa48589471d9b3c534e77697173b44baeac86828a4782",
+                    "hash" : "0xf4bd411c00e8158955baa48589471d9b3c534e77697173b44baeac86828a4782",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f4bd411c00e8158955baa48589471d9b3c534e77697173b44baeac86828a4782",
+                    "hash" : "0xf4bd411c00e8158955baa48589471d9b3c534e77697173b44baeac86828a4782",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "87dcd926369bb5229d8aa73a4dc5295ce32a9bd9b6448336678f000d3420be18",
+                    "hash" : "0x87dcd926369bb5229d8aa73a4dc5295ce32a9bd9b6448336678f000d3420be18",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,14 +61,14 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x5a600055602060006001f06001555a606455",
                 "nonce" : "0x00",
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorage.json b/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorage.json
index 240d37cae..9468c896b 100644
--- a/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorage.json
+++ b/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorage.json
@@ -1,17 +1,17 @@
 {
     "CREATE_EmptyContractWithStorage" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "2933815c2af5c423c25ef33d349898f15a3b79b763de49671616c310b6effcbb",
+                    "hash" : "0x2933815c2af5c423c25ef33d349898f15a3b79b763de49671616c310b6effcbb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a401bb1798616adafc66608fd09285c0c68831f97a9b4d404970da9c2a99a1e1",
+                    "hash" : "0xa401bb1798616adafc66608fd09285c0c68831f97a9b4d404970da9c2a99a1e1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "cb4d3f29a0485b8ec3eb183afc0b394fc098772e8fa0a84f38014d440933dbd4",
+                    "hash" : "0xcb4d3f29a0485b8ec3eb183afc0b394fc098772e8fa0a84f38014d440933dbd4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "cb4d3f29a0485b8ec3eb183afc0b394fc098772e8fa0a84f38014d440933dbd4",
+                    "hash" : "0xcb4d3f29a0485b8ec3eb183afc0b394fc098772e8fa0a84f38014d440933dbd4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a401bb1798616adafc66608fd09285c0c68831f97a9b4d404970da9c2a99a1e1",
+                    "hash" : "0xa401bb1798616adafc66608fd09285c0c68831f97a9b4d404970da9c2a99a1e1",
                     "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" : "0x5a6000557f600c6000556000600060006000600073c94f5374fce5edbc8e2a8697c15331676000527f7e6ebf0b61ea60f1000000000000000000000000000000000000000000000000602052604060006000f06001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
                 "code" : "0x600c600155",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_0wei.json b/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_0wei.json
index 60f0c4630..602d3691b 100644
--- a/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_0wei.json
+++ b/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_0wei.json
@@ -1,17 +1,17 @@
 {
     "CREATE_EmptyContractWithStorageAndCallIt_0wei" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "95724b5fb02381aa665d22187075abd0d6e60a2d7f1d98233fc1e2a9478e7018",
+                    "hash" : "0x95724b5fb02381aa665d22187075abd0d6e60a2d7f1d98233fc1e2a9478e7018",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a3b9c5957c28604d13f03fafd62478dca544d3dd2573699a404364b7622d871b",
+                    "hash" : "0xa3b9c5957c28604d13f03fafd62478dca544d3dd2573699a404364b7622d871b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "c8ad715cdf4e7489aab9aa1555a1b138356287e51ac3a73557c75c7b48629f96",
+                    "hash" : "0xc8ad715cdf4e7489aab9aa1555a1b138356287e51ac3a73557c75c7b48629f96",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c8ad715cdf4e7489aab9aa1555a1b138356287e51ac3a73557c75c7b48629f96",
+                    "hash" : "0xc8ad715cdf4e7489aab9aa1555a1b138356287e51ac3a73557c75c7b48629f96",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a3b9c5957c28604d13f03fafd62478dca544d3dd2573699a404364b7622d871b",
+                    "hash" : "0xa3b9c5957c28604d13f03fafd62478dca544d3dd2573699a404364b7622d871b",
                     "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" : "0x5a6000557f600c6000556000600060006000600073c94f5374fce5edbc8e2a8697c15331676000527f7e6ebf0b61ea60f1000000000000000000000000000000000000000000000000602052604060006000f06001555a6002556000600060006000600060015461ea60f16003555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
                 "code" : "0x600c600155",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_1wei.json b/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_1wei.json
index 3d4b51f96..ac103ecd1 100644
--- a/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_1wei.json
+++ b/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_1wei.json
@@ -1,17 +1,17 @@
 {
     "CREATE_EmptyContractWithStorageAndCallIt_1wei" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "79da1bc54589028fc4471e13af9b7b5e5c546f35b623f3d44cdf12afa263d38d",
+                    "hash" : "0x79da1bc54589028fc4471e13af9b7b5e5c546f35b623f3d44cdf12afa263d38d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "39f3f07069dc28f2485af1b33570a2cc31c565312f56fd0715cd4671d8072897",
+                    "hash" : "0x39f3f07069dc28f2485af1b33570a2cc31c565312f56fd0715cd4671d8072897",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "db693840d5eca93f43d95ef11946b7b5b2b994651b669b971544340bfeed89c7",
+                    "hash" : "0xdb693840d5eca93f43d95ef11946b7b5b2b994651b669b971544340bfeed89c7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "db693840d5eca93f43d95ef11946b7b5b2b994651b669b971544340bfeed89c7",
+                    "hash" : "0xdb693840d5eca93f43d95ef11946b7b5b2b994651b669b971544340bfeed89c7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "39f3f07069dc28f2485af1b33570a2cc31c565312f56fd0715cd4671d8072897",
+                    "hash" : "0x39f3f07069dc28f2485af1b33570a2cc31c565312f56fd0715cd4671d8072897",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x5a6000557f600c6000556000600060006000600073c94f5374fce5edbc8e2a8697c15331676000527f7e6ebf0b61ea60f1000000000000000000000000000000000000000000000000602052604060006000f06001555a6002556000600060006000600160015461ea60f16003555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
                 "code" : "0x600c600155",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stCreateTest/CREATE_empty000CreateinInitCode_Transaction.json b/GeneralStateTests/stCreateTest/CREATE_empty000CreateinInitCode_Transaction.json
index e042d953d..359f9e813 100644
--- a/GeneralStateTests/stCreateTest/CREATE_empty000CreateinInitCode_Transaction.json
+++ b/GeneralStateTests/stCreateTest/CREATE_empty000CreateinInitCode_Transaction.json
@@ -1,17 +1,17 @@
 {
     "CREATE_empty000CreateinInitCode_Transaction" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "14f55f5a337ba2e8d3282dc8e35821cf9e0418040fe8a38a4cc685d0b3de91f8",
+                    "hash" : "0x14f55f5a337ba2e8d3282dc8e35821cf9e0418040fe8a38a4cc685d0b3de91f8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "130a3511ff49e18b6c345692ae59f91919b89ce32c4ff1d0b5117baf99266e9f",
+                    "hash" : "0x130a3511ff49e18b6c345692ae59f91919b89ce32c4ff1d0b5117baf99266e9f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a31291b591da36e79fe99a2dea8664d3e327097d50416054c348d5e7a9277d84",
+                    "hash" : "0xa31291b591da36e79fe99a2dea8664d3e327097d50416054c348d5e7a9277d84",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "0eadf14941ab52c4bd16e5f80717342215a2ffc76116af4237d0fe1761f5db3f",
+                    "hash" : "0x0eadf14941ab52c4bd16e5f80717342215a2ffc76116af4237d0fe1761f5db3f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "130a3511ff49e18b6c345692ae59f91919b89ce32c4ff1d0b5117baf99266e9f",
+                    "hash" : "0x130a3511ff49e18b6c345692ae59f91919b89ce32c4ff1d0b5117baf99266e9f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,14 +61,14 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
                 "code" : "0x600c600155",
                 "nonce" : "0x00",
@@ -81,14 +81,14 @@
                 "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f150600060006000f0"
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/Call1024BalanceTooLow.json b/GeneralStateTests/stDelegatecallTestHomestead/Call1024BalanceTooLow.json
index d9213ba43..751854622 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/Call1024BalanceTooLow.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/Call1024BalanceTooLow.json
@@ -1,17 +1,17 @@
 {
     "Call1024BalanceTooLow" : {
         "env" : {
-            "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "currentCoinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f89e6292c4be9ae00ea7c7a3f200fdda6343f26e11220bd7270e0060c2dd52f8",
+                    "hash" : "0xf89e6292c4be9ae00ea7c7a3f200fdda6343f26e11220bd7270e0060c2dd52f8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f89e6292c4be9ae00ea7c7a3f200fdda6343f26e11220bd7270e0060c2dd52f8",
+                    "hash" : "0xf89e6292c4be9ae00ea7c7a3f200fdda6343f26e11220bd7270e0060c2dd52f8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "c42e890ccb4c38119ff0d6d688719dec416fcfac6c8e689e0c3c9c959745d597",
+                    "hash" : "0xc42e890ccb4c38119ff0d6d688719dec416fcfac6c8e689e0c3c9c959745d597",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e3c9d254cdc04524ea97f2b69997356811f2a78f1cd291ad76e60fdda029ca89",
+                    "hash" : "0xe3c9d254cdc04524ea97f2b69997356811f2a78f1cd291ad76e60fdda029ca89",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f89e6292c4be9ae00ea7c7a3f200fdda6343f26e11220bd7270e0060c2dd52f8",
+                    "hash" : "0xf89e6292c4be9ae00ea7c7a3f200fdda6343f26e11220bd7270e0060c2dd52f8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0400",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "17592186099592"
+                "0x10000000d788"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/Call1024OOG.json b/GeneralStateTests/stDelegatecallTestHomestead/Call1024OOG.json
index 12fc27bcc..dd34675e4 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/Call1024OOG.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/Call1024OOG.json
@@ -1,17 +1,17 @@
 {
     "Call1024OOG" : {
         "env" : {
-            "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "currentCoinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a02a93a32d38eb1caaff7d439a54ee709513ffbf7cb2e94fe4867760efa630e2",
+                    "hash" : "0xa02a93a32d38eb1caaff7d439a54ee709513ffbf7cb2e94fe4867760efa630e2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a02a93a32d38eb1caaff7d439a54ee709513ffbf7cb2e94fe4867760efa630e2",
+                    "hash" : "0xa02a93a32d38eb1caaff7d439a54ee709513ffbf7cb2e94fe4867760efa630e2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f5da42d8840745448354e89d1480751a81ef2764041df668de157c9c20e01153",
+                    "hash" : "0xf5da42d8840745448354e89d1480751a81ef2764041df668de157c9c20e01153",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "00ea8388f351e1cf10f03125b74cac80ab5367c73763f4746a20429b285148ab",
+                    "hash" : "0x00ea8388f351e1cf10f03125b74cac80ab5367c73763f4746a20429b285148ab",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a02a93a32d38eb1caaff7d439a54ee709513ffbf7cb2e94fe4867760efa630e2",
+                    "hash" : "0xa02a93a32d38eb1caaff7d439a54ee709513ffbf7cb2e94fe4867760efa630e2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0400",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f46001556103e860005402600101600255",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "15720826"
+                "0xefe17a"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/Call1024PreCalls.json b/GeneralStateTests/stDelegatecallTestHomestead/Call1024PreCalls.json
index eadb381ac..3d5cda3b5 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/Call1024PreCalls.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/Call1024PreCalls.json
@@ -1,17 +1,17 @@
 {
     "Call1024PreCalls" : {
         "env" : {
-            "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "currentCoinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d2f55a959af507ebc66062ee3e5a94fc5ce6d05a0cce8ee81ca95f6c57d793d7",
+                    "hash" : "0xd2f55a959af507ebc66062ee3e5a94fc5ce6d05a0cce8ee81ca95f6c57d793d7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d2f55a959af507ebc66062ee3e5a94fc5ce6d05a0cce8ee81ca95f6c57d793d7",
+                    "hash" : "0xd2f55a959af507ebc66062ee3e5a94fc5ce6d05a0cce8ee81ca95f6c57d793d7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "359e48d3f702c199d9ae8ccec578d191a0b4ea827c27abb2ca3aa6be3d5457be",
+                    "hash" : "0x359e48d3f702c199d9ae8ccec578d191a0b4ea827c27abb2ca3aa6be3d5457be",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "8d9b08f0c1f72af68ada841536bfa26af24586859ef2f11f8bd68f4e5686845e",
+                    "hash" : "0x8d9b08f0c1f72af68ada841536bfa26af24586859ef2f11f8bd68f4e5686845e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d2f55a959af507ebc66062ee3e5a94fc5ce6d05a0cce8ee81ca95f6c57d793d7",
+                    "hash" : "0xd2f55a959af507ebc66062ee3e5a94fc5ce6d05a0cce8ee81ca95f6c57d793d7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0fffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x07e8",
                 "code" : "0x6000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16002556000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff1600355600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
                 "nonce" : "0x00",
@@ -92,10 +92,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/CallLoseGasOOG.json b/GeneralStateTests/stDelegatecallTestHomestead/CallLoseGasOOG.json
index 0b80443c1..56b7aaf72 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/CallLoseGasOOG.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/CallLoseGasOOG.json
@@ -1,17 +1,17 @@
 {
     "CallLoseGasOOG" : {
         "env" : {
-            "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "currentCoinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "76b676c40691a124d702a8e95f2d949ea577fa4fec13942bcdb6e6671fe45779",
+                    "hash" : "0x76b676c40691a124d702a8e95f2d949ea577fa4fec13942bcdb6e6671fe45779",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "76b676c40691a124d702a8e95f2d949ea577fa4fec13942bcdb6e6671fe45779",
+                    "hash" : "0x76b676c40691a124d702a8e95f2d949ea577fa4fec13942bcdb6e6671fe45779",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "46cdf423ca61bdd9b7e9832556c468045366b2680c101ffc7e274d85ec5318b2",
+                    "hash" : "0x46cdf423ca61bdd9b7e9832556c468045366b2680c101ffc7e274d85ec5318b2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "68c34a88a0fe3b7334b8c67a33f46ba7aae6c38a73ec7f35a6ce5e656122d7f9",
+                    "hash" : "0x68c34a88a0fe3b7334b8c67a33f46ba7aae6c38a73ec7f35a6ce5e656122d7f9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "76b676c40691a124d702a8e95f2d949ea577fa4fec13942bcdb6e6671fe45779",
+                    "hash" : "0x76b676c40691a124d702a8e95f2d949ea577fa4fec13942bcdb6e6671fe45779",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0400",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f46001556103e860005402600101600255",
                 "nonce" : "0x00",
@@ -92,10 +92,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/CallRecursiveBombPreCall.json b/GeneralStateTests/stDelegatecallTestHomestead/CallRecursiveBombPreCall.json
index 7ce8e6124..026fe3122 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/CallRecursiveBombPreCall.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/CallRecursiveBombPreCall.json
@@ -1,17 +1,17 @@
 {
     "CallRecursiveBombPreCall" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "37d720f4b503f45cfa2e7204a42c8021435dbd3cb81cab6ff33f64dd5e4e74b8",
+                    "hash" : "0x37d720f4b503f45cfa2e7204a42c8021435dbd3cb81cab6ff33f64dd5e4e74b8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "37d720f4b503f45cfa2e7204a42c8021435dbd3cb81cab6ff33f64dd5e4e74b8",
+                    "hash" : "0x37d720f4b503f45cfa2e7204a42c8021435dbd3cb81cab6ff33f64dd5e4e74b8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "d8e2ff5fe7d8ad10816dafd8ad4206cd211be1e5fcb039f897813c000b8ae902",
+                    "hash" : "0xd8e2ff5fe7d8ad10816dafd8ad4206cd211be1e5fcb039f897813c000b8ae902",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6fa0501e55377f47a378886c63112ca3738a5269399d41c7613e9f50bb016d16",
+                    "hash" : "0x6fa0501e55377f47a378886c63112ca3738a5269399d41c7613e9f50bb016d16",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "37d720f4b503f45cfa2e7204a42c8021435dbd3cb81cab6ff33f64dd5e4e74b8",
+                    "hash" : "0x37d720f4b503f45cfa2e7204a42c8021435dbd3cb81cab6ff33f64dd5e4e74b8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0fffffffffffffffffffffffffffffff",
                 "code" : "0x6000600060006000601773bad304eb96065b2a98b57a48a06ae28d285a71b5620186a0f150600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b56707fffffffffffffff4",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600054016000556000600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b562036b005a03f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0fffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,10 +92,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/CallcodeLoseGasOOG.json b/GeneralStateTests/stDelegatecallTestHomestead/CallcodeLoseGasOOG.json
index c7b3416d0..29c079625 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/CallcodeLoseGasOOG.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/CallcodeLoseGasOOG.json
@@ -1,17 +1,17 @@
 {
     "CallcodeLoseGasOOG" : {
         "env" : {
-            "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "currentCoinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "803cabf86f2634d681c9a05e8a637fc65e925039850f565f3846dbbeb42251fc",
+                    "hash" : "0x803cabf86f2634d681c9a05e8a637fc65e925039850f565f3846dbbeb42251fc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "803cabf86f2634d681c9a05e8a637fc65e925039850f565f3846dbbeb42251fc",
+                    "hash" : "0x803cabf86f2634d681c9a05e8a637fc65e925039850f565f3846dbbeb42251fc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "803cabf86f2634d681c9a05e8a637fc65e925039850f565f3846dbbeb42251fc",
+                    "hash" : "0x803cabf86f2634d681c9a05e8a637fc65e925039850f565f3846dbbeb42251fc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "68c34a88a0fe3b7334b8c67a33f46ba7aae6c38a73ec7f35a6ce5e656122d7f9",
+                    "hash" : "0x68c34a88a0fe3b7334b8c67a33f46ba7aae6c38a73ec7f35a6ce5e656122d7f9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "803cabf86f2634d681c9a05e8a637fc65e925039850f565f3846dbbeb42251fc",
+                    "hash" : "0x803cabf86f2634d681c9a05e8a637fc65e925039850f565f3846dbbeb42251fc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0400",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f46001556103e860005402600101600255",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "166262"
+                "0x028976"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024.json b/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024.json
index e376de822..be7d48aad 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024.json
@@ -1,17 +1,17 @@
 {
     "Delegatecall1024" : {
         "env" : {
-            "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "currentCoinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f89e6292c4be9ae00ea7c7a3f200fdda6343f26e11220bd7270e0060c2dd52f8",
+                    "hash" : "0xf89e6292c4be9ae00ea7c7a3f200fdda6343f26e11220bd7270e0060c2dd52f8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f89e6292c4be9ae00ea7c7a3f200fdda6343f26e11220bd7270e0060c2dd52f8",
+                    "hash" : "0xf89e6292c4be9ae00ea7c7a3f200fdda6343f26e11220bd7270e0060c2dd52f8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "91c2381a360e81340004604a496994b7d585dca9e8834c0f3aa75739ff7861ca",
+                    "hash" : "0x91c2381a360e81340004604a496994b7d585dca9e8834c0f3aa75739ff7861ca",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e3c9d254cdc04524ea97f2b69997356811f2a78f1cd291ad76e60fdda029ca89",
+                    "hash" : "0xe3c9d254cdc04524ea97f2b69997356811f2a78f1cd291ad76e60fdda029ca89",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f89e6292c4be9ae00ea7c7a3f200fdda6343f26e11220bd7270e0060c2dd52f8",
+                    "hash" : "0xf89e6292c4be9ae00ea7c7a3f200fdda6343f26e11220bd7270e0060c2dd52f8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0400",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
                 "nonce" : "0x00",
@@ -92,10 +92,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024OOG.json b/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024OOG.json
index 78c788791..56edbb40d 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024OOG.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024OOG.json
@@ -1,17 +1,17 @@
 {
     "Delegatecall1024OOG" : {
         "env" : {
-            "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "currentCoinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a02a93a32d38eb1caaff7d439a54ee709513ffbf7cb2e94fe4867760efa630e2",
+                    "hash" : "0xa02a93a32d38eb1caaff7d439a54ee709513ffbf7cb2e94fe4867760efa630e2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a02a93a32d38eb1caaff7d439a54ee709513ffbf7cb2e94fe4867760efa630e2",
+                    "hash" : "0xa02a93a32d38eb1caaff7d439a54ee709513ffbf7cb2e94fe4867760efa630e2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f5da42d8840745448354e89d1480751a81ef2764041df668de157c9c20e01153",
+                    "hash" : "0xf5da42d8840745448354e89d1480751a81ef2764041df668de157c9c20e01153",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "00ea8388f351e1cf10f03125b74cac80ab5367c73763f4746a20429b285148ab",
+                    "hash" : "0x00ea8388f351e1cf10f03125b74cac80ab5367c73763f4746a20429b285148ab",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a02a93a32d38eb1caaff7d439a54ee709513ffbf7cb2e94fe4867760efa630e2",
+                    "hash" : "0xa02a93a32d38eb1caaff7d439a54ee709513ffbf7cb2e94fe4867760efa630e2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0400",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f46001556103e860005402600101600255",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "15720826"
+                "0xefe17a"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/callOutput1.json b/GeneralStateTests/stDelegatecallTestHomestead/callOutput1.json
index afc96ae30..50841b294 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/callOutput1.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/callOutput1.json
@@ -1,17 +1,17 @@
 {
     "callOutput1" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
+                    "hash" : "0x06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "068ae35f557da951c6407104a8a59d0bf8348710cf2c2f41d57107b18e8b9000",
+                    "hash" : "0x068ae35f557da951c6407104a8a59d0bf8348710cf2c2f41d57107b18e8b9000",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -29,7 +29,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
+                    "hash" : "0x06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -37,7 +37,7 @@
                     }
                 },
                 {
-                    "hash" : "b30cb132c5dcad75bae0377f1c798af7f22f3d007c03e538126204b188015c47",
+                    "hash" : "0xb30cb132c5dcad75bae0377f1c798af7f22f3d007c03e538126204b188015c47",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -47,7 +47,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
+                    "hash" : "0x06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -55,7 +55,7 @@
                     }
                 },
                 {
-                    "hash" : "cf919fbe638c0a9914cd897b0eee0c54d256b2f2151ccc0be601b832725cfec0",
+                    "hash" : "0xcf919fbe638c0a9914cd897b0eee0c54d256b2f2151ccc0be601b832725cfec0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -65,7 +65,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
+                    "hash" : "0x06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -73,7 +73,7 @@
                     }
                 },
                 {
-                    "hash" : "068ae35f557da951c6407104a8a59d0bf8348710cf2c2f41d57107b18e8b9000",
+                    "hash" : "0x068ae35f557da951c6407104a8a59d0bf8348710cf2c2f41d57107b18e8b9000",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -83,7 +83,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
+                    "hash" : "0x06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -91,7 +91,7 @@
                     }
                 },
                 {
-                    "hash" : "b30cb132c5dcad75bae0377f1c798af7f22f3d007c03e538126204b188015c47",
+                    "hash" : "0xb30cb132c5dcad75bae0377f1c798af7f22f3d007c03e538126204b188015c47",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -101,21 +101,21 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600101600055",
                 "nonce" : "0x00",
@@ -128,15 +128,15 @@
                 ""
             ],
             "gasLimit" : [
-                "1100000",
-                "900000"
+                "0x10c8e0",
+                "0x0dbba0"
             ],
             "gasPrice" : "0x00",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/callOutput2.json b/GeneralStateTests/stDelegatecallTestHomestead/callOutput2.json
index 7d25d66bd..c1a502f48 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/callOutput2.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/callOutput2.json
@@ -1,17 +1,17 @@
 {
     "callOutput2" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
+                    "hash" : "0x16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "7c812ae27fb6114b03cf557d6a7a7a7ae2a64680d50e5493c024b65acd3509bd",
+                    "hash" : "0x7c812ae27fb6114b03cf557d6a7a7a7ae2a64680d50e5493c024b65acd3509bd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -29,7 +29,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
+                    "hash" : "0x16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -37,7 +37,7 @@
                     }
                 },
                 {
-                    "hash" : "03962b53fdaea7ca84a2731cace90a5324f5d57a1560b465b9ff80e423aa1584",
+                    "hash" : "0x03962b53fdaea7ca84a2731cace90a5324f5d57a1560b465b9ff80e423aa1584",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -47,7 +47,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
+                    "hash" : "0x16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -55,7 +55,7 @@
                     }
                 },
                 {
-                    "hash" : "78b367e7118f6cee1621affd9aefa30dd2c0db56c6c276a5c24c2f16ff2a619b",
+                    "hash" : "0x78b367e7118f6cee1621affd9aefa30dd2c0db56c6c276a5c24c2f16ff2a619b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -65,7 +65,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
+                    "hash" : "0x16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -73,7 +73,7 @@
                     }
                 },
                 {
-                    "hash" : "7c812ae27fb6114b03cf557d6a7a7a7ae2a64680d50e5493c024b65acd3509bd",
+                    "hash" : "0x7c812ae27fb6114b03cf557d6a7a7a7ae2a64680d50e5493c024b65acd3509bd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -83,7 +83,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
+                    "hash" : "0x16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -91,7 +91,7 @@
                     }
                 },
                 {
-                    "hash" : "03962b53fdaea7ca84a2731cace90a5324f5d57a1560b465b9ff80e423aa1584",
+                    "hash" : "0x03962b53fdaea7ca84a2731cace90a5324f5d57a1560b465b9ff80e423aa1584",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -101,21 +101,21 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600101600055",
                 "nonce" : "0x00",
@@ -128,15 +128,15 @@
                 ""
             ],
             "gasLimit" : [
-                "1100000",
-                "900000"
+                "0x10c8e0",
+                "0x0dbba0"
             ],
             "gasPrice" : "0x00",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/callOutput3.json b/GeneralStateTests/stDelegatecallTestHomestead/callOutput3.json
index 2c66c978a..123721b0c 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/callOutput3.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/callOutput3.json
@@ -1,17 +1,17 @@
 {
     "callOutput3" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
+                    "hash" : "0xb3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "b77c61969e66250323aa42c02c709add3e0699af9a573829a741eb17977870dc",
+                    "hash" : "0xb77c61969e66250323aa42c02c709add3e0699af9a573829a741eb17977870dc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -29,7 +29,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
+                    "hash" : "0xb3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -37,7 +37,7 @@
                     }
                 },
                 {
-                    "hash" : "02e679656f8753d867a9af516cd59841c49f0620936f76a418457d9bb314648c",
+                    "hash" : "0x02e679656f8753d867a9af516cd59841c49f0620936f76a418457d9bb314648c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -47,7 +47,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
+                    "hash" : "0xb3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -55,7 +55,7 @@
                     }
                 },
                 {
-                    "hash" : "daaa42dbc4fc90068f17dff17bdffe46fd4b982a477a9a82d39ee69426858014",
+                    "hash" : "0xdaaa42dbc4fc90068f17dff17bdffe46fd4b982a477a9a82d39ee69426858014",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -65,7 +65,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
+                    "hash" : "0xb3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -73,7 +73,7 @@
                     }
                 },
                 {
-                    "hash" : "b77c61969e66250323aa42c02c709add3e0699af9a573829a741eb17977870dc",
+                    "hash" : "0xb77c61969e66250323aa42c02c709add3e0699af9a573829a741eb17977870dc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -83,7 +83,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
+                    "hash" : "0xb3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -91,7 +91,7 @@
                     }
                 },
                 {
-                    "hash" : "02e679656f8753d867a9af516cd59841c49f0620936f76a418457d9bb314648c",
+                    "hash" : "0x02e679656f8753d867a9af516cd59841c49f0620936f76a418457d9bb314648c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -101,21 +101,21 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600101600055",
                 "nonce" : "0x00",
@@ -128,15 +128,15 @@
                 ""
             ],
             "gasLimit" : [
-                "1100000",
-                "900000"
+                "0x10c8e0",
+                "0x0dbba0"
             ],
             "gasPrice" : "0x00",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail.json b/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail.json
index 21d552b3f..95cb3c1b2 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail.json
@@ -1,17 +1,17 @@
 {
     "callOutput3Fail" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "61ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dca",
+                    "hash" : "0x61ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dca",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "1e42c382668ca4e46c62ec30f79331a2953382bc8b7639a1458bc4e32ed32354",
+                    "hash" : "0x1e42c382668ca4e46c62ec30f79331a2953382bc8b7639a1458bc4e32ed32354",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -29,7 +29,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "61ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dca",
+                    "hash" : "0x61ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dca",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -37,7 +37,7 @@
                     }
                 },
                 {
-                    "hash" : "a61f6282e0aae7a71aecd2b93ae52b635f52f3b45abd0ed8d8b6722f3387f23b",
+                    "hash" : "0xa61f6282e0aae7a71aecd2b93ae52b635f52f3b45abd0ed8d8b6722f3387f23b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -47,7 +47,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "61ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dca",
+                    "hash" : "0x61ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dca",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -55,7 +55,7 @@
                     }
                 },
                 {
-                    "hash" : "3fba3507eee80bdc1a8c2ac07981adca8f6e5110673a0339e40c6d276314bc85",
+                    "hash" : "0x3fba3507eee80bdc1a8c2ac07981adca8f6e5110673a0339e40c6d276314bc85",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -65,7 +65,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "61ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dca",
+                    "hash" : "0x61ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dca",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -73,7 +73,7 @@
                     }
                 },
                 {
-                    "hash" : "1e42c382668ca4e46c62ec30f79331a2953382bc8b7639a1458bc4e32ed32354",
+                    "hash" : "0x1e42c382668ca4e46c62ec30f79331a2953382bc8b7639a1458bc4e32ed32354",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -83,7 +83,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "61ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dca",
+                    "hash" : "0x61ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dca",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -91,7 +91,7 @@
                     }
                 },
                 {
-                    "hash" : "a61f6282e0aae7a71aecd2b93ae52b635f52f3b45abd0ed8d8b6722f3387f23b",
+                    "hash" : "0xa61f6282e0aae7a71aecd2b93ae52b635f52f3b45abd0ed8d8b6722f3387f23b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -101,21 +101,21 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x016001600101600055",
                 "nonce" : "0x00",
@@ -128,15 +128,15 @@
                 ""
             ],
             "gasLimit" : [
-                "1100000",
-                "900000"
+                "0x10c8e0",
+                "0x0dbba0"
             ],
             "gasPrice" : "0x00",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial.json b/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial.json
index 642498385..95b243f78 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial.json
@@ -1,17 +1,17 @@
 {
     "callOutput3partial" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
+                    "hash" : "0xa36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "5bc2c3418e307e12aeb67b03a2a2c0d84aa6b35c286bd61dc900c872bdfb565b",
+                    "hash" : "0x5bc2c3418e307e12aeb67b03a2a2c0d84aa6b35c286bd61dc900c872bdfb565b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -29,7 +29,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
+                    "hash" : "0xa36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -37,7 +37,7 @@
                     }
                 },
                 {
-                    "hash" : "cd37783c7cd7783f650009c3a0542dd9b20aaa48f929e5e53722d1d3e9582c2f",
+                    "hash" : "0xcd37783c7cd7783f650009c3a0542dd9b20aaa48f929e5e53722d1d3e9582c2f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -47,7 +47,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
+                    "hash" : "0xa36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -55,7 +55,7 @@
                     }
                 },
                 {
-                    "hash" : "d9eac24117d8e8180aa96ed111a294c57dedc6dbc855e649c243d11bf330127b",
+                    "hash" : "0xd9eac24117d8e8180aa96ed111a294c57dedc6dbc855e649c243d11bf330127b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -65,7 +65,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
+                    "hash" : "0xa36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -73,7 +73,7 @@
                     }
                 },
                 {
-                    "hash" : "5bc2c3418e307e12aeb67b03a2a2c0d84aa6b35c286bd61dc900c872bdfb565b",
+                    "hash" : "0x5bc2c3418e307e12aeb67b03a2a2c0d84aa6b35c286bd61dc900c872bdfb565b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -83,7 +83,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
+                    "hash" : "0xa36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -91,7 +91,7 @@
                     }
                 },
                 {
-                    "hash" : "cd37783c7cd7783f650009c3a0542dd9b20aaa48f929e5e53722d1d3e9582c2f",
+                    "hash" : "0xcd37783c7cd7783f650009c3a0542dd9b20aaa48f929e5e53722d1d3e9582c2f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -101,21 +101,21 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600101600055",
                 "nonce" : "0x00",
@@ -128,15 +128,15 @@
                 ""
             ],
             "gasLimit" : [
-                "1100000",
-                "900000"
+                "0x10c8e0",
+                "0x0dbba0"
             ],
             "gasPrice" : "0x00",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail.json b/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail.json
index 6a1b9cd89..40d30e80e 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail.json
@@ -1,17 +1,17 @@
 {
     "callOutput3partialFail" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
+                    "hash" : "0xc02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "c98dfd74fa23d95c0ce68ada2a6ef2b348f566890b32f3a932d81d4b5e1fefbd",
+                    "hash" : "0xc98dfd74fa23d95c0ce68ada2a6ef2b348f566890b32f3a932d81d4b5e1fefbd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -29,7 +29,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
+                    "hash" : "0xc02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -37,7 +37,7 @@
                     }
                 },
                 {
-                    "hash" : "16601ea0e8c65451bae42cac0d74aa67d465f5b613c27559cdbd3feeaacaedd5",
+                    "hash" : "0x16601ea0e8c65451bae42cac0d74aa67d465f5b613c27559cdbd3feeaacaedd5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -47,7 +47,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
+                    "hash" : "0xc02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -55,7 +55,7 @@
                     }
                 },
                 {
-                    "hash" : "1740acac1df2e5b484cfac44850638c455419665ede6d3dbed9341129e7ccde7",
+                    "hash" : "0x1740acac1df2e5b484cfac44850638c455419665ede6d3dbed9341129e7ccde7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -65,7 +65,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
+                    "hash" : "0xc02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -73,7 +73,7 @@
                     }
                 },
                 {
-                    "hash" : "c98dfd74fa23d95c0ce68ada2a6ef2b348f566890b32f3a932d81d4b5e1fefbd",
+                    "hash" : "0xc98dfd74fa23d95c0ce68ada2a6ef2b348f566890b32f3a932d81d4b5e1fefbd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -83,7 +83,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
+                    "hash" : "0xc02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -91,7 +91,7 @@
                     }
                 },
                 {
-                    "hash" : "16601ea0e8c65451bae42cac0d74aa67d465f5b613c27559cdbd3feeaacaedd5",
+                    "hash" : "0x16601ea0e8c65451bae42cac0d74aa67d465f5b613c27559cdbd3feeaacaedd5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -101,21 +101,21 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x016001600101600055",
                 "nonce" : "0x00",
@@ -128,15 +128,15 @@
                 ""
             ],
             "gasLimit" : [
-                "1100000",
-                "900000"
+                "0x10c8e0",
+                "0x0dbba0"
             ],
             "gasPrice" : "0x00",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/callWithHighValueAndGasOOG.json b/GeneralStateTests/stDelegatecallTestHomestead/callWithHighValueAndGasOOG.json
index 4459093f4..7f25bfe12 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/callWithHighValueAndGasOOG.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/callWithHighValueAndGasOOG.json
@@ -1,17 +1,17 @@
 {
     "callWithHighValueAndGasOOG" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "54daa803bda94d91431e59da207338a9e4414900841128a7b465bc40a4b66407",
+                    "hash" : "0x54daa803bda94d91431e59da207338a9e4414900841128a7b465bc40a4b66407",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "54daa803bda94d91431e59da207338a9e4414900841128a7b465bc40a4b66407",
+                    "hash" : "0x54daa803bda94d91431e59da207338a9e4414900841128a7b465bc40a4b66407",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3627d19480c5de4564b2a814de4cda322e03d8481116406811ccb90b4b8f9040",
+                    "hash" : "0x3627d19480c5de4564b2a814de4cda322e03d8481116406811ccb90b4b8f9040",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3627d19480c5de4564b2a814de4cda322e03d8481116406811ccb90b4b8f9040",
+                    "hash" : "0x3627d19480c5de4564b2a814de4cda322e03d8481116406811ccb90b4b8f9040",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "54daa803bda94d91431e59da207338a9e4414900841128a7b465bc40a4b66407",
+                    "hash" : "0x54daa803bda94d91431e59da207338a9e4414900841128a7b465bc40a4b66407",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput1.json b/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput1.json
index 5783c3d40..4aebd8fb2 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput1.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput1.json
@@ -1,17 +1,17 @@
 {
     "callcodeOutput1" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
+                    "hash" : "0x06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
+                    "hash" : "0x06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
+                    "hash" : "0x06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
+                    "hash" : "0x06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
+                    "hash" : "0x06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600101600055",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1100000"
+                "0x10c8e0"
             ],
             "gasPrice" : "0x00",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput2.json b/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput2.json
index c0901fecc..ce49bdfd0 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput2.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput2.json
@@ -1,17 +1,17 @@
 {
     "callcodeOutput2" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
+                    "hash" : "0x16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
+                    "hash" : "0x16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
+                    "hash" : "0x16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
+                    "hash" : "0x16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
+                    "hash" : "0x16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600101600055",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1100000"
+                "0x10c8e0"
             ],
             "gasPrice" : "0x00",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3.json b/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3.json
index 1c915d8f6..4326034fd 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3.json
@@ -1,17 +1,17 @@
 {
     "callcodeOutput3" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
+                    "hash" : "0xb3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
+                    "hash" : "0xb3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
+                    "hash" : "0xb3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
+                    "hash" : "0xb3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
+                    "hash" : "0xb3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600101600055",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1100000"
+                "0x10c8e0"
             ],
             "gasPrice" : "0x00",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3Fail.json b/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3Fail.json
index b70dea271..14d5f7037 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3Fail.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3Fail.json
@@ -1,17 +1,17 @@
 {
     "callcodeOutput3Fail" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8ae",
+                    "hash" : "0x9be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8ae",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8ae",
+                    "hash" : "0x9be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8ae",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8ae",
+                    "hash" : "0x9be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8ae",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8ae",
+                    "hash" : "0x9be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8ae",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8ae",
+                    "hash" : "0x9be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8ae",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x016001600101600055",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1100000"
+                "0x10c8e0"
             ],
             "gasPrice" : "0x00",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partial.json b/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partial.json
index 899b07737..2e8ed087f 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partial.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partial.json
@@ -1,17 +1,17 @@
 {
     "callcodeOutput3partial" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
+                    "hash" : "0xa36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
+                    "hash" : "0xa36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
+                    "hash" : "0xa36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
+                    "hash" : "0xa36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
+                    "hash" : "0xa36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600101600055",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1100000"
+                "0x10c8e0"
             ],
             "gasPrice" : "0x00",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partialFail.json b/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partialFail.json
index 8028fb809..66eedb196 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partialFail.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partialFail.json
@@ -1,17 +1,17 @@
 {
     "callcodeOutput3partialFail" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
+                    "hash" : "0xc02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
+                    "hash" : "0xc02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
+                    "hash" : "0xc02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
+                    "hash" : "0xc02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
+                    "hash" : "0xc02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x016001600101600055",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1100000"
+                "0x10c8e0"
             ],
             "gasPrice" : "0x00",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG.json b/GeneralStateTests/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG.json
index 7b54be9f4..49cc3cd73 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG.json
@@ -1,17 +1,17 @@
 {
     "callcodeWithHighValueAndGasOOG" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "54daa803bda94d91431e59da207338a9e4414900841128a7b465bc40a4b66407",
+                    "hash" : "0x54daa803bda94d91431e59da207338a9e4414900841128a7b465bc40a4b66407",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "54daa803bda94d91431e59da207338a9e4414900841128a7b465bc40a4b66407",
+                    "hash" : "0x54daa803bda94d91431e59da207338a9e4414900841128a7b465bc40a4b66407",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3627d19480c5de4564b2a814de4cda322e03d8481116406811ccb90b4b8f9040",
+                    "hash" : "0x3627d19480c5de4564b2a814de4cda322e03d8481116406811ccb90b4b8f9040",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3627d19480c5de4564b2a814de4cda322e03d8481116406811ccb90b4b8f9040",
+                    "hash" : "0x3627d19480c5de4564b2a814de4cda322e03d8481116406811ccb90b4b8f9040",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "54daa803bda94d91431e59da207338a9e4414900841128a7b465bc40a4b66407",
+                    "hash" : "0x54daa803bda94d91431e59da207338a9e4414900841128a7b465bc40a4b66407",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer.json b/GeneralStateTests/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer.json
index fb90862f8..148013596 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer.json
@@ -1,17 +1,17 @@
 {
     "deleagateCallAfterValueTransfer" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "34eee42d18251585d6f194c31dd0a32fce9ce11d401b461283fa59cd2e4a908f",
+                    "hash" : "0x34eee42d18251585d6f194c31dd0a32fce9ce11d401b461283fa59cd2e4a908f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "34eee42d18251585d6f194c31dd0a32fce9ce11d401b461283fa59cd2e4a908f",
+                    "hash" : "0x34eee42d18251585d6f194c31dd0a32fce9ce11d401b461283fa59cd2e4a908f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6b675b43db04a786f746800c6468b5e0f172fb6bbe81ec4224cb71d9d8d5db8a",
+                    "hash" : "0x6b675b43db04a786f746800c6468b5e0f172fb6bbe81ec4224cb71d9d8d5db8a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a1e359f8d476209f735120764824acf4f05313fa0763cb17b6fcbd828f54e4eb",
+                    "hash" : "0xa1e359f8d476209f735120764824acf4f05313fa0763cb17b6fcbd828f54e4eb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "34eee42d18251585d6f194c31dd0a32fce9ce11d401b461283fa59cd2e4a908f",
+                    "hash" : "0x34eee42d18251585d6f194c31dd0a32fce9ce11d401b461283fa59cd2e4a908f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x10c8e0",
                 "code" : "0x60016000526040600060406000731000000000000000000000000000000000000001620186a0f4",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x3460005533600155600035600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "453081"
+                "0x06e9d9"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                ""
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel.json b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel.json
index 94fd881f5..560acbd65 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel.json
@@ -1,17 +1,17 @@
 {
     "delegatecallAndOOGatTxLevel" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "ba5b78a980dd457d36a4662048a50e4dd61ae61dc46aa65fd8c7e62d3737c23f",
+                    "hash" : "0xba5b78a980dd457d36a4662048a50e4dd61ae61dc46aa65fd8c7e62d3737c23f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "ba5b78a980dd457d36a4662048a50e4dd61ae61dc46aa65fd8c7e62d3737c23f",
+                    "hash" : "0xba5b78a980dd457d36a4662048a50e4dd61ae61dc46aa65fd8c7e62d3737c23f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2e18df95e1e1ff61fc388c004dcb33c7ec8d70f7ecf1582b8a7b9e09d0213aff",
+                    "hash" : "0x2e18df95e1e1ff61fc388c004dcb33c7ec8d70f7ecf1582b8a7b9e09d0213aff",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "2e18df95e1e1ff61fc388c004dcb33c7ec8d70f7ecf1582b8a7b9e09d0213aff",
+                    "hash" : "0x2e18df95e1e1ff61fc388c004dcb33c7ec8d70f7ecf1582b8a7b9e09d0213aff",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "ba5b78a980dd457d36a4662048a50e4dd61ae61dc46aa65fd8c7e62d3737c23f",
+                    "hash" : "0xba5b78a980dd457d36a4662048a50e4dd61ae61dc46aa65fd8c7e62d3737c23f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b5622dc6c1f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallBasic.json b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallBasic.json
index e140e2810..adb8f2770 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallBasic.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallBasic.json
@@ -1,17 +1,17 @@
 {
     "delegatecallBasic" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "2512ff0ce792e9e7cc6baf69efc98fdc84eaf90e02b42359155dc3dbe11a216f",
+                    "hash" : "0x2512ff0ce792e9e7cc6baf69efc98fdc84eaf90e02b42359155dc3dbe11a216f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "2512ff0ce792e9e7cc6baf69efc98fdc84eaf90e02b42359155dc3dbe11a216f",
+                    "hash" : "0x2512ff0ce792e9e7cc6baf69efc98fdc84eaf90e02b42359155dc3dbe11a216f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2b36c981d9b509f87383320c6075f2db04df7a63c8cfd266747fba3e0f3c5e23",
+                    "hash" : "0x2b36c981d9b509f87383320c6075f2db04df7a63c8cfd266747fba3e0f3c5e23",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "bbf97b3bd7ab803993f910fce99ea8d201f3edf99cd9d5bb0dbb67efa76e7af1",
+                    "hash" : "0xbbf97b3bd7ab803993f910fce99ea8d201f3edf99cd9d5bb0dbb67efa76e7af1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "2512ff0ce792e9e7cc6baf69efc98fdc84eaf90e02b42359155dc3dbe11a216f",
+                    "hash" : "0x2512ff0ce792e9e7cc6baf69efc98fdc84eaf90e02b42359155dc3dbe11a216f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallEmptycontract.json b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallEmptycontract.json
index 0f0e5d4c4..166db6f2c 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallEmptycontract.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallEmptycontract.json
@@ -1,17 +1,17 @@
 {
     "delegatecallEmptycontract" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e401648d71617dd66da72c98c4b195f9942c6ab1b8d47cc8df112f70bbdbe59c",
+                    "hash" : "0xe401648d71617dd66da72c98c4b195f9942c6ab1b8d47cc8df112f70bbdbe59c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e401648d71617dd66da72c98c4b195f9942c6ab1b8d47cc8df112f70bbdbe59c",
+                    "hash" : "0xe401648d71617dd66da72c98c4b195f9942c6ab1b8d47cc8df112f70bbdbe59c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "421e15ae720639d82241626c9e33c4724a90b9606e030bd95ea29f5cf182abbc",
+                    "hash" : "0x421e15ae720639d82241626c9e33c4724a90b9606e030bd95ea29f5cf182abbc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6ab445199097ad4916576058e1f45ea664254d2a185f7a6770f93f6249b67a6d",
+                    "hash" : "0x6ab445199097ad4916576058e1f45ea664254d2a185f7a6770f93f6249b67a6d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e401648d71617dd66da72c98c4b195f9942c6ab1b8d47cc8df112f70bbdbe59c",
+                    "hash" : "0xe401648d71617dd66da72c98c4b195f9942c6ab1b8d47cc8df112f70bbdbe59c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x03e8",
                 "code" : "0x604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b561c350f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x10c8e0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "105044"
+                "0x019a54"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                ""
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract.json b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract.json
index 770a8b796..23b04b625 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract.json
@@ -1,17 +1,17 @@
 {
     "delegatecallInInitcodeToEmptyContract" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "fc586f571a68abde4664489c9403bcc34c00b5a5a901b08f20286ba4df9f6808",
+                    "hash" : "0xfc586f571a68abde4664489c9403bcc34c00b5a5a901b08f20286ba4df9f6808",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "158d67812da0bb53249d5b1eef7a3afd6d49d30a48a5e44b8fb5adc04b7f24b2",
+                    "hash" : "0x158d67812da0bb53249d5b1eef7a3afd6d49d30a48a5e44b8fb5adc04b7f24b2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f64b295c03ee71e17306638045fbdc1410407d4053da492f8d0439bf6d019dfa",
+                    "hash" : "0xf64b295c03ee71e17306638045fbdc1410407d4053da492f8d0439bf6d019dfa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4d96399212e798bced58a2f159526808d3d3d3693ba75daa5a612710bae2b666",
+                    "hash" : "0x4d96399212e798bced58a2f159526808d3d3d3693ba75daa5a612710bae2b666",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "158d67812da0bb53249d5b1eef7a3afd6d49d30a48a5e44b8fb5adc04b7f24b2",
+                    "hash" : "0x158d67812da0bb53249d5b1eef7a3afd6d49d30a48a5e44b8fb5adc04b7f24b2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x2710",
                 "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600055000000000000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "453081"
+                "0x06e9d9"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                ""
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract.json b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract.json
index 182f80aaf..148fdcc6a 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract.json
@@ -1,17 +1,17 @@
 {
     "delegatecallInInitcodeToExistingContract" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c605c5a5aed700f9a860c312d674957fadc7f8bb8eba731e354c955a5b560abc",
+                    "hash" : "0xc605c5a5aed700f9a860c312d674957fadc7f8bb8eba731e354c955a5b560abc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "75cab413f0e28fa5f089e9717bd2b0a83f696b9b2f4d7b29bacb88089627b436",
+                    "hash" : "0x75cab413f0e28fa5f089e9717bd2b0a83f696b9b2f4d7b29bacb88089627b436",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "d87bd102ecdc321d465c120f8ab1b7879c76ff2ea668a30e654d54980990e815",
+                    "hash" : "0xd87bd102ecdc321d465c120f8ab1b7879c76ff2ea668a30e654d54980990e815",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a71b08f56ca855abe5d005ca76d485d33f504e1ab287fce444a7a2b981ca0bf7",
+                    "hash" : "0xa71b08f56ca855abe5d005ca76d485d33f504e1ab287fce444a7a2b981ca0bf7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "75cab413f0e28fa5f089e9717bd2b0a83f696b9b2f4d7b29bacb88089627b436",
+                    "hash" : "0x75cab413f0e28fa5f089e9717bd2b0a83f696b9b2f4d7b29bacb88089627b436",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x2710",
                 "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600055336001550000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x03e8",
                 "code" : "0x6460016000556000526005601b6001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x00",
                 "code" : "0x600160025533600b55",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "453081"
+                "0x06e9d9"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                ""
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG.json b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG.json
index 42fb326a0..809086d3d 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG.json
@@ -1,17 +1,17 @@
 {
     "delegatecallInInitcodeToExistingContractOOG" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1e065699c57a6069c9e414c1d2d48e5b844e0dcba2ca115346fdce55e390eea0",
+                    "hash" : "0x1e065699c57a6069c9e414c1d2d48e5b844e0dcba2ca115346fdce55e390eea0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "403001f1fecf0f1933d3e75932c1a47e82e9771f7384c0b5e8cc4f8fa69d51b4",
+                    "hash" : "0x403001f1fecf0f1933d3e75932c1a47e82e9771f7384c0b5e8cc4f8fa69d51b4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "eaab62f1092ba56b88d26964035cfb32a8f8ecc0324e3055e54eb3c3c656c2ac",
+                    "hash" : "0xeaab62f1092ba56b88d26964035cfb32a8f8ecc0324e3055e54eb3c3c656c2ac",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "eaab62f1092ba56b88d26964035cfb32a8f8ecc0324e3055e54eb3c3c656c2ac",
+                    "hash" : "0xeaab62f1092ba56b88d26964035cfb32a8f8ecc0324e3055e54eb3c3c656c2ac",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "403001f1fecf0f1933d3e75932c1a47e82e9771f7384c0b5e8cc4f8fa69d51b4",
+                    "hash" : "0x403001f1fecf0f1933d3e75932c1a47e82e9771f7384c0b5e8cc4f8fa69d51b4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x2710",
                 "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600a5533600b550000000000000000000000000000000000000000000000602052604060006005f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x00",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "153096"
+                "0x025608"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                ""
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallOOGinCall.json b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallOOGinCall.json
index 2050ca33c..a4992b29d 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallOOGinCall.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallOOGinCall.json
@@ -1,17 +1,17 @@
 {
     "delegatecallOOGinCall" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "97f7583d78c8460de11a3d242e60cec9e4c5102a4dd716b7c349affa46dc5fbd",
+                    "hash" : "0x97f7583d78c8460de11a3d242e60cec9e4c5102a4dd716b7c349affa46dc5fbd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "97f7583d78c8460de11a3d242e60cec9e4c5102a4dd716b7c349affa46dc5fbd",
+                    "hash" : "0x97f7583d78c8460de11a3d242e60cec9e4c5102a4dd716b7c349affa46dc5fbd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "8782ba71653982d5b1499fc3925f998a296935f2b93532ced17a11995e7470f4",
+                    "hash" : "0x8782ba71653982d5b1499fc3925f998a296935f2b93532ced17a11995e7470f4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ea679add7136ceac29a5959418b80efbf9a2bc06180ba11f4c86ee879873b71e",
+                    "hash" : "0xea679add7136ceac29a5959418b80efbf9a2bc06180ba11f4c86ee879873b71e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "97f7583d78c8460de11a3d242e60cec9e4c5102a4dd716b7c349affa46dc5fbd",
+                    "hash" : "0x97f7583d78c8460de11a3d242e60cec9e4c5102a4dd716b7c349affa46dc5fbd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x6001600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b5612710f401600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallSenderCheck.json b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallSenderCheck.json
index d8dbb181d..b3537f7db 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallSenderCheck.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallSenderCheck.json
@@ -1,17 +1,17 @@
 {
     "delegatecallSenderCheck" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "3ee3def6faec0d2b15492365eb1b13e698028761b972eecb90debc5f4fca1b8e",
+                    "hash" : "0x3ee3def6faec0d2b15492365eb1b13e698028761b972eecb90debc5f4fca1b8e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "3ee3def6faec0d2b15492365eb1b13e698028761b972eecb90debc5f4fca1b8e",
+                    "hash" : "0x3ee3def6faec0d2b15492365eb1b13e698028761b972eecb90debc5f4fca1b8e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "79e93486f433ce20789892e86732ea1b82da98e95e3106a4e230d7375bf8ce78",
+                    "hash" : "0x79e93486f433ce20789892e86732ea1b82da98e95e3106a4e230d7375bf8ce78",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ff3106c25f8522d36427351cfe036b0de9c6a31fb1dc11369330263b8bb8671d",
+                    "hash" : "0xff3106c25f8522d36427351cfe036b0de9c6a31fb1dc11369330263b8bb8671d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "3ee3def6faec0d2b15492365eb1b13e698028761b972eecb90debc5f4fca1b8e",
+                    "hash" : "0x3ee3def6faec0d2b15492365eb1b13e698028761b972eecb90debc5f4fca1b8e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x33600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallValueCheck.json b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallValueCheck.json
index 63be7a435..0d382a813 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallValueCheck.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallValueCheck.json
@@ -1,17 +1,17 @@
 {
     "delegatecallValueCheck" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "14122ff01c9fbf8e582d0f8e8b334179bc3cbb23eaa4b8a110fd68f1b837c2da",
+                    "hash" : "0x14122ff01c9fbf8e582d0f8e8b334179bc3cbb23eaa4b8a110fd68f1b837c2da",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "14122ff01c9fbf8e582d0f8e8b334179bc3cbb23eaa4b8a110fd68f1b837c2da",
+                    "hash" : "0x14122ff01c9fbf8e582d0f8e8b334179bc3cbb23eaa4b8a110fd68f1b837c2da",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2e53a8d0a33187907d3212bcf073019c5fd52c265eb1dacc1bdafd0523319fa3",
+                    "hash" : "0x2e53a8d0a33187907d3212bcf073019c5fd52c265eb1dacc1bdafd0523319fa3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "bbfbd005f26707e3c305c91bce59be351d4364f047e8207a352a312a9ebfd474",
+                    "hash" : "0xbbfbd005f26707e3c305c91bce59be351d4364f047e8207a352a312a9ebfd474",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "14122ff01c9fbf8e582d0f8e8b334179bc3cbb23eaa4b8a110fd68f1b837c2da",
+                    "hash" : "0x14122ff01c9fbf8e582d0f8e8b334179bc3cbb23eaa4b8a110fd68f1b837c2da",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x34600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "23"
+                "0x17"
             ]
         }
     }
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode.json b/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode.json
index 0b845f866..7ee523f84 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode.json
@@ -1,17 +1,17 @@
 {
     "delegatecodeDynamicCode" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "34616e4bebbecdb2ee6df873d01dc9cae9c8df6ada0f82a771bdbb263a45fabd",
+                    "hash" : "0x34616e4bebbecdb2ee6df873d01dc9cae9c8df6ada0f82a771bdbb263a45fabd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d43ad6ed360b96eed203341e247d9b966de5023edeea7f56faeeca0599c19dee",
+                    "hash" : "0xd43ad6ed360b96eed203341e247d9b966de5023edeea7f56faeeca0599c19dee",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2c22ecfb190e74da4016ed037b12bc3c03567d4d0c0dbd1072a0f328dbd133ed",
+                    "hash" : "0x2c22ecfb190e74da4016ed037b12bc3c03567d4d0c0dbd1072a0f328dbd133ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c1fec9297af842876aa7b3fdc2fc0ba3cd149ce001258d23dcfe76480b8af925",
+                    "hash" : "0xc1fec9297af842876aa7b3fdc2fc0ba3cd149ce001258d23dcfe76480b8af925",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d43ad6ed360b96eed203341e247d9b966de5023edeea7f56faeeca0599c19dee",
+                    "hash" : "0xd43ad6ed360b96eed203341e247d9b966de5023edeea7f56faeeca0599c19dee",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x2710",
                 "code" : "0x7f716860016000553360145560005260096017f36000526012600e6001f0600a556000527f604060006040600073ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b66201866020527fa0f4600b55000000000000000000000000000000000000000000000000000000604052606060006001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "453081"
+                "0x06e9d9"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                ""
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall.json b/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall.json
index 9163dc268..21abcde80 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall.json
@@ -1,17 +1,17 @@
 {
     "delegatecodeDynamicCode2SelfCall" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "2771f7c6dc351bc4d63081a5b17d3db73cbc82d66257d11b07bd0893c69a1013",
+                    "hash" : "0x2771f7c6dc351bc4d63081a5b17d3db73cbc82d66257d11b07bd0893c69a1013",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c493cd7d3b0bee68dfcd27c0b98ac21cf7df2237d58cdb6c6e5b8143f31e8cee",
+                    "hash" : "0xc493cd7d3b0bee68dfcd27c0b98ac21cf7df2237d58cdb6c6e5b8143f31e8cee",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "019c584e05bc713b729b4f8f297a1b15c3ed2acbc5f13961fad470b0d2c7ce54",
+                    "hash" : "0x019c584e05bc713b729b4f8f297a1b15c3ed2acbc5f13961fad470b0d2c7ce54",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "89ae3fb825e0f39499e54ecd90b9caafe8fafba9fb1c2d17a6a0d112851053f4",
+                    "hash" : "0x89ae3fb825e0f39499e54ecd90b9caafe8fafba9fb1c2d17a6a0d112851053f4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c493cd7d3b0bee68dfcd27c0b98ac21cf7df2237d58cdb6c6e5b8143f31e8cee",
+                    "hash" : "0xc493cd7d3b0bee68dfcd27c0b98ac21cf7df2237d58cdb6c6e5b8143f31e8cee",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x10c8e0",
                 "code" : "0x7f60406000604060007313136008b64ff592819b2fa6d43f2835c452020e6201866000527fa0f4600b5533600c550000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "453081"
+                "0x06e9d9"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                ""
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stEIP150Specific/CallAndCallcodeConsumeMoreGasThenTransactionHas.json b/GeneralStateTests/stEIP150Specific/CallAndCallcodeConsumeMoreGasThenTransactionHas.json
index 61ceb6fc7..ea80d22b0 100644
--- a/GeneralStateTests/stEIP150Specific/CallAndCallcodeConsumeMoreGasThenTransactionHas.json
+++ b/GeneralStateTests/stEIP150Specific/CallAndCallcodeConsumeMoreGasThenTransactionHas.json
@@ -1,17 +1,17 @@
 {
     "CallAndCallcodeConsumeMoreGasThenTransactionHas" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e07824c59862157c8bf611662ba4c741fb14bbb207765ca6c089a3161c90e786",
+                    "hash" : "0xe07824c59862157c8bf611662ba4c741fb14bbb207765ca6c089a3161c90e786",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e07824c59862157c8bf611662ba4c741fb14bbb207765ca6c089a3161c90e786",
+                    "hash" : "0xe07824c59862157c8bf611662ba4c741fb14bbb207765ca6c089a3161c90e786",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "492c80701f532eb73ec68a36db0cf88136e6674d58dbabcb4ddba0949fc62acd",
+                    "hash" : "0x492c80701f532eb73ec68a36db0cf88136e6674d58dbabcb4ddba0949fc62acd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "492c80701f532eb73ec68a36db0cf88136e6674d58dbabcb4ddba0949fc62acd",
+                    "hash" : "0x492c80701f532eb73ec68a36db0cf88136e6674d58dbabcb4ddba0949fc62acd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e07824c59862157c8bf611662ba4c741fb14bbb207765ca6c089a3161c90e786",
+                    "hash" : "0xe07824c59862157c8bf611662ba4c741fb14bbb207765ca6c089a3161c90e786",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000103" : {
+            "0x1000000000000000000000000000000000000103" : {
                 "balance" : "0x00",
                 "code" : "0x6012600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a60085560006000600060006000731000000000000000000000000000000000000103620927c0f160095560006000600060006000731000000000000000000000000000000000000103620927c0f2600a55",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stEIP150Specific/CallAskMoreGasOnDepth2ThenTransactionHas.json b/GeneralStateTests/stEIP150Specific/CallAskMoreGasOnDepth2ThenTransactionHas.json
index a91f6937b..4541e5916 100644
--- a/GeneralStateTests/stEIP150Specific/CallAskMoreGasOnDepth2ThenTransactionHas.json
+++ b/GeneralStateTests/stEIP150Specific/CallAskMoreGasOnDepth2ThenTransactionHas.json
@@ -1,17 +1,17 @@
 {
     "CallAskMoreGasOnDepth2ThenTransactionHas" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "ee81a2e65faf354a854a80b05a1cbe6ba6c4889c8904cef51fe58fe6b597ebd4",
+                    "hash" : "0xee81a2e65faf354a854a80b05a1cbe6ba6c4889c8904cef51fe58fe6b597ebd4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "ee81a2e65faf354a854a80b05a1cbe6ba6c4889c8904cef51fe58fe6b597ebd4",
+                    "hash" : "0xee81a2e65faf354a854a80b05a1cbe6ba6c4889c8904cef51fe58fe6b597ebd4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5c710e203f3b6994d828244ef8e1c0eeb7d81a697e0c530ea8a393819f78a979",
+                    "hash" : "0x5c710e203f3b6994d828244ef8e1c0eeb7d81a697e0c530ea8a393819f78a979",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5c710e203f3b6994d828244ef8e1c0eeb7d81a697e0c530ea8a393819f78a979",
+                    "hash" : "0x5c710e203f3b6994d828244ef8e1c0eeb7d81a697e0c530ea8a393819f78a979",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "ee81a2e65faf354a854a80b05a1cbe6ba6c4889c8904cef51fe58fe6b597ebd4",
+                    "hash" : "0xee81a2e65faf354a854a80b05a1cbe6ba6c4889c8904cef51fe58fe6b597ebd4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,28 +61,28 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000107" : {
+            "0x1000000000000000000000000000000000000107" : {
                 "balance" : "0x00",
                 "code" : "0x5a60085560006000600060006000731000000000000000000000000000000000000108620927c0f1600955",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000108" : {
+            "0x1000000000000000000000000000000000000108" : {
                 "balance" : "0x00",
                 "code" : "0x5a600855",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a6008556000600060006000600073100000000000000000000000000000000000010762030d40f1600955",
                 "nonce" : "0x00",
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stEIP150Specific/CallGoesOOGOnSecondLevel.json b/GeneralStateTests/stEIP150Specific/CallGoesOOGOnSecondLevel.json
index fe84b6b1b..d4879a306 100644
--- a/GeneralStateTests/stEIP150Specific/CallGoesOOGOnSecondLevel.json
+++ b/GeneralStateTests/stEIP150Specific/CallGoesOOGOnSecondLevel.json
@@ -1,17 +1,17 @@
 {
     "CallGoesOOGOnSecondLevel" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "efa25a148e3c0182c26ed417bf44ed027fc73297a668655d82e61053866e5043",
+                    "hash" : "0xefa25a148e3c0182c26ed417bf44ed027fc73297a668655d82e61053866e5043",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "efa25a148e3c0182c26ed417bf44ed027fc73297a668655d82e61053866e5043",
+                    "hash" : "0xefa25a148e3c0182c26ed417bf44ed027fc73297a668655d82e61053866e5043",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "efa25a148e3c0182c26ed417bf44ed027fc73297a668655d82e61053866e5043",
+                    "hash" : "0xefa25a148e3c0182c26ed417bf44ed027fc73297a668655d82e61053866e5043",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "efa25a148e3c0182c26ed417bf44ed027fc73297a668655d82e61053866e5043",
+                    "hash" : "0xefa25a148e3c0182c26ed417bf44ed027fc73297a668655d82e61053866e5043",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "efa25a148e3c0182c26ed417bf44ed027fc73297a668655d82e61053866e5043",
+                    "hash" : "0xefa25a148e3c0182c26ed417bf44ed027fc73297a668655d82e61053866e5043",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,28 +61,28 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000110" : {
+            "0x1000000000000000000000000000000000000110" : {
                 "balance" : "0x00",
                 "code" : "0x5a60085560006000600060006000731000000000000000000000000000000000000111620927c0f1600955",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000111" : {
+            "0x1000000000000000000000000000000000000111" : {
                 "balance" : "0x00",
                 "code" : "0x5a600855600060006000f050600060006000f0505a6009555a600a55",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a60085560006000600060006000731000000000000000000000000000000000000110620927c0f1600955",
                 "nonce" : "0x00",
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "220000"
+                "0x035b60"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stEIP150Specific/CallGoesOOGOnSecondLevel2.json b/GeneralStateTests/stEIP150Specific/CallGoesOOGOnSecondLevel2.json
index 690fd07d0..363d86c1c 100644
--- a/GeneralStateTests/stEIP150Specific/CallGoesOOGOnSecondLevel2.json
+++ b/GeneralStateTests/stEIP150Specific/CallGoesOOGOnSecondLevel2.json
@@ -1,17 +1,17 @@
 {
     "CallGoesOOGOnSecondLevel2" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "ce9eb695d33e2a0421b7c83dc50126010f662cfcab1c6cf971fc22d33e58ed49",
+                    "hash" : "0xce9eb695d33e2a0421b7c83dc50126010f662cfcab1c6cf971fc22d33e58ed49",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "ce9eb695d33e2a0421b7c83dc50126010f662cfcab1c6cf971fc22d33e58ed49",
+                    "hash" : "0xce9eb695d33e2a0421b7c83dc50126010f662cfcab1c6cf971fc22d33e58ed49",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "ce9eb695d33e2a0421b7c83dc50126010f662cfcab1c6cf971fc22d33e58ed49",
+                    "hash" : "0xce9eb695d33e2a0421b7c83dc50126010f662cfcab1c6cf971fc22d33e58ed49",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ce9eb695d33e2a0421b7c83dc50126010f662cfcab1c6cf971fc22d33e58ed49",
+                    "hash" : "0xce9eb695d33e2a0421b7c83dc50126010f662cfcab1c6cf971fc22d33e58ed49",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "ce9eb695d33e2a0421b7c83dc50126010f662cfcab1c6cf971fc22d33e58ed49",
+                    "hash" : "0xce9eb695d33e2a0421b7c83dc50126010f662cfcab1c6cf971fc22d33e58ed49",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,28 +61,28 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000113" : {
+            "0x1000000000000000000000000000000000000113" : {
                 "balance" : "0x00",
                 "code" : "0x5a60085560006000600060006000731000000000000000000000000000000000000114620927c0f1600955",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000114" : {
+            "0x1000000000000000000000000000000000000114" : {
                 "balance" : "0x00",
                 "code" : "0x5a6008555a6009555a600a55",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a60085560006000600060006000731000000000000000000000000000000000000113620927c0f1600955",
                 "nonce" : "0x00",
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "160000"
+                "0x027100"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stEIP150Specific/CreateAndGasInsideCreate.json b/GeneralStateTests/stEIP150Specific/CreateAndGasInsideCreate.json
index 5b717f348..2c5ff674b 100644
--- a/GeneralStateTests/stEIP150Specific/CreateAndGasInsideCreate.json
+++ b/GeneralStateTests/stEIP150Specific/CreateAndGasInsideCreate.json
@@ -1,17 +1,17 @@
 {
     "CreateAndGasInsideCreate" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "3ca082f6185a3019aea75573a032dd81b0e99f7b7f464b1a84e55eae4513baf5",
+                    "hash" : "0x3ca082f6185a3019aea75573a032dd81b0e99f7b7f464b1a84e55eae4513baf5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "4bd8b2a14dc113c65caabef1a52808b711e65ef0eadb38e72a7d0527fbddf1aa",
+                    "hash" : "0x4bd8b2a14dc113c65caabef1a52808b711e65ef0eadb38e72a7d0527fbddf1aa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "0a54e84b6282918bc9e9ec50464ca2edf2e4e3f4ef2ce08fb8660e05b2b0cb02",
+                    "hash" : "0x0a54e84b6282918bc9e9ec50464ca2edf2e4e3f4ef2ce08fb8660e05b2b0cb02",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "0a54e84b6282918bc9e9ec50464ca2edf2e4e3f4ef2ce08fb8660e05b2b0cb02",
+                    "hash" : "0x0a54e84b6282918bc9e9ec50464ca2edf2e4e3f4ef2ce08fb8660e05b2b0cb02",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "4bd8b2a14dc113c65caabef1a52808b711e65ef0eadb38e72a7d0527fbddf1aa",
+                    "hash" : "0x4bd8b2a14dc113c65caabef1a52808b711e65ef0eadb38e72a7d0527fbddf1aa",
                     "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" : "0x5a600a55635a60fd556000526004601c6000f0600b555a600955",
                 "nonce" : "0x00",
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stEIP150Specific/DelegateCallOnEIP.json b/GeneralStateTests/stEIP150Specific/DelegateCallOnEIP.json
index f003942b1..76e116df3 100644
--- a/GeneralStateTests/stEIP150Specific/DelegateCallOnEIP.json
+++ b/GeneralStateTests/stEIP150Specific/DelegateCallOnEIP.json
@@ -1,17 +1,17 @@
 {
     "DelegateCallOnEIP" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "ccd9fad58a72db64ef2ed866ed2cef19f77371516bfed7fb06958262be55b9ff",
+                    "hash" : "0xccd9fad58a72db64ef2ed866ed2cef19f77371516bfed7fb06958262be55b9ff",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "ccd9fad58a72db64ef2ed866ed2cef19f77371516bfed7fb06958262be55b9ff",
+                    "hash" : "0xccd9fad58a72db64ef2ed866ed2cef19f77371516bfed7fb06958262be55b9ff",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "ba11e0c4133e225a4573c0cfcfe659593f5367809ded272dc41e3822ce25728a",
+                    "hash" : "0xba11e0c4133e225a4573c0cfcfe659593f5367809ded272dc41e3822ce25728a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ba11e0c4133e225a4573c0cfcfe659593f5367809ded272dc41e3822ce25728a",
+                    "hash" : "0xba11e0c4133e225a4573c0cfcfe659593f5367809ded272dc41e3822ce25728a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "ccd9fad58a72db64ef2ed866ed2cef19f77371516bfed7fb06958262be55b9ff",
+                    "hash" : "0xccd9fad58a72db64ef2ed866ed2cef19f77371516bfed7fb06958262be55b9ff",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000105" : {
+            "0x1000000000000000000000000000000000000105" : {
                 "balance" : "0x00",
                 "code" : "0x6012600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a6008556000600060006000731000000000000000000000000000000000000105620927c0f4600955",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stEIP150Specific/ExecuteCallThatAskForeGasThenTrabsactionHas.json b/GeneralStateTests/stEIP150Specific/ExecuteCallThatAskForeGasThenTrabsactionHas.json
index 981217f15..037ad7f82 100644
--- a/GeneralStateTests/stEIP150Specific/ExecuteCallThatAskForeGasThenTrabsactionHas.json
+++ b/GeneralStateTests/stEIP150Specific/ExecuteCallThatAskForeGasThenTrabsactionHas.json
@@ -1,17 +1,17 @@
 {
     "ExecuteCallThatAskForeGasThenTrabsactionHas" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a306e41ea48a4777ce1ed4032d38cc4c56fd68acb409e69cec7e1315f08bf388",
+                    "hash" : "0xa306e41ea48a4777ce1ed4032d38cc4c56fd68acb409e69cec7e1315f08bf388",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a306e41ea48a4777ce1ed4032d38cc4c56fd68acb409e69cec7e1315f08bf388",
+                    "hash" : "0xa306e41ea48a4777ce1ed4032d38cc4c56fd68acb409e69cec7e1315f08bf388",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2ab90cc71d90ed870799ed29d0d2d6e73cf62d99216df95952b4bda626bf6f0f",
+                    "hash" : "0x2ab90cc71d90ed870799ed29d0d2d6e73cf62d99216df95952b4bda626bf6f0f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "2ab90cc71d90ed870799ed29d0d2d6e73cf62d99216df95952b4bda626bf6f0f",
+                    "hash" : "0x2ab90cc71d90ed870799ed29d0d2d6e73cf62d99216df95952b4bda626bf6f0f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a306e41ea48a4777ce1ed4032d38cc4c56fd68acb409e69cec7e1315f08bf388",
+                    "hash" : "0xa306e41ea48a4777ce1ed4032d38cc4c56fd68acb409e69cec7e1315f08bf388",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0186a0",
                 "code" : "0x600c600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x60006000600060006000731000000000000000000000000000000000000001620927c0f1600155",
                 "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/stEIP150Specific/NewGasPriceForCodes.json b/GeneralStateTests/stEIP150Specific/NewGasPriceForCodes.json
index 1123843ac..4f9d794ce 100644
--- a/GeneralStateTests/stEIP150Specific/NewGasPriceForCodes.json
+++ b/GeneralStateTests/stEIP150Specific/NewGasPriceForCodes.json
@@ -1,17 +1,17 @@
 {
     "NewGasPriceForCodes" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "58530241bc470bb693bf79333ecdb9561a65cad9a5e2717df5e9d2e252ed111e",
+                    "hash" : "0x58530241bc470bb693bf79333ecdb9561a65cad9a5e2717df5e9d2e252ed111e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "717eb439457deec8adb3980be18a1e4a5950a316b9612e18f487180b123cf1a5",
+                    "hash" : "0x717eb439457deec8adb3980be18a1e4a5950a316b9612e18f487180b123cf1a5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "d6bfa0493ca6ab0b2dcf421757ba5c36fe8f4ee93b09f447c735404a063c77a6",
+                    "hash" : "0xd6bfa0493ca6ab0b2dcf421757ba5c36fe8f4ee93b09f447c735404a063c77a6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "eaa47f6fe617ab6ca6fea56adfda649114ec8d4997aa586e5ee23517697db10b",
+                    "hash" : "0xeaa47f6fe617ab6ca6fea56adfda649114ec8d4997aa586e5ee23517697db10b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "717eb439457deec8adb3980be18a1e4a5950a316b9612e18f487180b123cf1a5",
+                    "hash" : "0x717eb439457deec8adb3980be18a1e4a5950a316b9612e18f487180b123cf1a5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,28 +61,28 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000010" : {
+            "0x1000000000000000000000000000000000000010" : {
                 "balance" : "0x6f",
                 "code" : "0x1122334455667788991011121314151617181920212223242526272829303132",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000011" : {
+            "0x1000000000000000000000000000000000000011" : {
                 "balance" : "0x00",
                 "code" : "0x6011606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x7310000000000000000000000000000000000000103b6001556014600060007310000000000000000000000000000000000000103c60005160025560005460045560006000600060006001731000000000000000000000000000000000000011617530f160055560006000600060006001731000000000000000000000000000000000000011617530f26006556000600060006000731000000000000000000000000000000000000011617530f460075560006000600060006000731000000000000000000000000000000000000013617530f160085573a94f5374fce5edbc8e2a8697c15331677e6ebf0b316003555a600a55",
                 "nonce" : "0x00",
@@ -96,14 +96,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stEIP150Specific/SuicideToExistingContract.json b/GeneralStateTests/stEIP150Specific/SuicideToExistingContract.json
index 6495b32c2..fac7b2858 100644
--- a/GeneralStateTests/stEIP150Specific/SuicideToExistingContract.json
+++ b/GeneralStateTests/stEIP150Specific/SuicideToExistingContract.json
@@ -1,17 +1,17 @@
 {
     "SuicideToExistingContract" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7f124d7f842eeeebc6889a06e0ad72ff0eb1ef804ee0254a6b3810b82eac0ddc",
+                    "hash" : "0x7f124d7f842eeeebc6889a06e0ad72ff0eb1ef804ee0254a6b3810b82eac0ddc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7f124d7f842eeeebc6889a06e0ad72ff0eb1ef804ee0254a6b3810b82eac0ddc",
+                    "hash" : "0x7f124d7f842eeeebc6889a06e0ad72ff0eb1ef804ee0254a6b3810b82eac0ddc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "763d607a4cdc3b051ec38ee7163e301a0924d81abbc516930e5bc1eee311b000",
+                    "hash" : "0x763d607a4cdc3b051ec38ee7163e301a0924d81abbc516930e5bc1eee311b000",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "763d607a4cdc3b051ec38ee7163e301a0924d81abbc516930e5bc1eee311b000",
+                    "hash" : "0x763d607a4cdc3b051ec38ee7163e301a0924d81abbc516930e5bc1eee311b000",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7f124d7f842eeeebc6889a06e0ad72ff0eb1ef804ee0254a6b3810b82eac0ddc",
+                    "hash" : "0x7f124d7f842eeeebc6889a06e0ad72ff0eb1ef804ee0254a6b3810b82eac0ddc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000118" : {
+            "0x1000000000000000000000000000000000000118" : {
                 "balance" : "0x00",
                 "code" : "0x73b94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x6000600060006000600073100000000000000000000000000000000000011861ea60f1505a600155",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stEIP150Specific/SuicideToNotExistingContract.json b/GeneralStateTests/stEIP150Specific/SuicideToNotExistingContract.json
index 0bd1fc78b..82754e99c 100644
--- a/GeneralStateTests/stEIP150Specific/SuicideToNotExistingContract.json
+++ b/GeneralStateTests/stEIP150Specific/SuicideToNotExistingContract.json
@@ -1,17 +1,17 @@
 {
     "SuicideToNotExistingContract" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b58c2baf17ec8ec989abfb6056bae2e5afe08d1bce5fc64039faba8e86f4fdd6",
+                    "hash" : "0xb58c2baf17ec8ec989abfb6056bae2e5afe08d1bce5fc64039faba8e86f4fdd6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "ce5fed1d914f20ec2be902b0c6eaffdb5c0cc0740d5eb6ea7ba96a9e62806fe7",
+                    "hash" : "0xce5fed1d914f20ec2be902b0c6eaffdb5c0cc0740d5eb6ea7ba96a9e62806fe7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "048a1a4296c851fa94efb1fd2b94b50f2e48ed2d4311dbe65e84e3f7f443f0ea",
+                    "hash" : "0x048a1a4296c851fa94efb1fd2b94b50f2e48ed2d4311dbe65e84e3f7f443f0ea",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "048a1a4296c851fa94efb1fd2b94b50f2e48ed2d4311dbe65e84e3f7f443f0ea",
+                    "hash" : "0x048a1a4296c851fa94efb1fd2b94b50f2e48ed2d4311dbe65e84e3f7f443f0ea",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "ce5fed1d914f20ec2be902b0c6eaffdb5c0cc0740d5eb6ea7ba96a9e62806fe7",
+                    "hash" : "0xce5fed1d914f20ec2be902b0c6eaffdb5c0cc0740d5eb6ea7ba96a9e62806fe7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000116" : {
+            "0x1000000000000000000000000000000000000116" : {
                 "balance" : "0x00",
                 "code" : "0x732000000000000000000000000000000000000115ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x6000600060006000600073100000000000000000000000000000000000011661ea60f1505a600155",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64e0.json b/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64e0.json
index 2895b0a0d..9b070adc6 100644
--- a/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64e0.json
+++ b/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64e0.json
@@ -1,17 +1,17 @@
 {
     "Transaction64Rule_d64e0" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "300197205e17725d24ac15faf4b0a5703ca5a20900072391433f474fc6b0bdde",
+                    "hash" : "0x300197205e17725d24ac15faf4b0a5703ca5a20900072391433f474fc6b0bdde",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "300197205e17725d24ac15faf4b0a5703ca5a20900072391433f474fc6b0bdde",
+                    "hash" : "0x300197205e17725d24ac15faf4b0a5703ca5a20900072391433f474fc6b0bdde",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "0dd4965ee43d67558de611542f84ea9b0bfebeb3ba0ac08dac3a113a2d1be693",
+                    "hash" : "0x0dd4965ee43d67558de611542f84ea9b0bfebeb3ba0ac08dac3a113a2d1be693",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "0dd4965ee43d67558de611542f84ea9b0bfebeb3ba0ac08dac3a113a2d1be693",
+                    "hash" : "0x0dd4965ee43d67558de611542f84ea9b0bfebeb3ba0ac08dac3a113a2d1be693",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "300197205e17725d24ac15faf4b0a5703ca5a20900072391433f474fc6b0bdde",
+                    "hash" : "0x300197205e17725d24ac15faf4b0a5703ca5a20900072391433f474fc6b0bdde",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000118" : {
+            "0x1000000000000000000000000000000000000118" : {
                 "balance" : "0x00",
                 "code" : "0x600c600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a6000556000600060006000600073100000000000000000000000000000000000011862027100f1505a600255",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "160062"
+                "0x02713e"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64m1.json b/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64m1.json
index de3b7f253..5b657d60d 100644
--- a/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64m1.json
+++ b/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64m1.json
@@ -1,17 +1,17 @@
 {
     "Transaction64Rule_d64m1" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7740dccc6594212bcd6b8cf509e183942d0f57059debd89fc73e5342f4ffa3e0",
+                    "hash" : "0x7740dccc6594212bcd6b8cf509e183942d0f57059debd89fc73e5342f4ffa3e0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7740dccc6594212bcd6b8cf509e183942d0f57059debd89fc73e5342f4ffa3e0",
+                    "hash" : "0x7740dccc6594212bcd6b8cf509e183942d0f57059debd89fc73e5342f4ffa3e0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "0d82c218e524c5acb7df66a7272be03c127fa60032e82dc6e0b6d1cd0b471bb8",
+                    "hash" : "0x0d82c218e524c5acb7df66a7272be03c127fa60032e82dc6e0b6d1cd0b471bb8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "0d82c218e524c5acb7df66a7272be03c127fa60032e82dc6e0b6d1cd0b471bb8",
+                    "hash" : "0x0d82c218e524c5acb7df66a7272be03c127fa60032e82dc6e0b6d1cd0b471bb8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7740dccc6594212bcd6b8cf509e183942d0f57059debd89fc73e5342f4ffa3e0",
+                    "hash" : "0x7740dccc6594212bcd6b8cf509e183942d0f57059debd89fc73e5342f4ffa3e0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000118" : {
+            "0x1000000000000000000000000000000000000118" : {
                 "balance" : "0x00",
                 "code" : "0x600c600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a6000556000600060006000600073100000000000000000000000000000000000011862027100f1505a600255",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "160061"
+                "0x02713d"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64p1.json b/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64p1.json
index 3a4f7bbb0..d55195f16 100644
--- a/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64p1.json
+++ b/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64p1.json
@@ -1,17 +1,17 @@
 {
     "Transaction64Rule_d64p1" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c1fee512043ed639ec2ecb9c28eb25c50e5ab267b612e2c376d1dec2f7f7c53e",
+                    "hash" : "0xc1fee512043ed639ec2ecb9c28eb25c50e5ab267b612e2c376d1dec2f7f7c53e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c1fee512043ed639ec2ecb9c28eb25c50e5ab267b612e2c376d1dec2f7f7c53e",
+                    "hash" : "0xc1fee512043ed639ec2ecb9c28eb25c50e5ab267b612e2c376d1dec2f7f7c53e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6d41678dd6a40efd6de0e8f748d863ce6887335dda01bd7c4eb5e443ea47bc3a",
+                    "hash" : "0x6d41678dd6a40efd6de0e8f748d863ce6887335dda01bd7c4eb5e443ea47bc3a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6d41678dd6a40efd6de0e8f748d863ce6887335dda01bd7c4eb5e443ea47bc3a",
+                    "hash" : "0x6d41678dd6a40efd6de0e8f748d863ce6887335dda01bd7c4eb5e443ea47bc3a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c1fee512043ed639ec2ecb9c28eb25c50e5ab267b612e2c376d1dec2f7f7c53e",
+                    "hash" : "0xc1fee512043ed639ec2ecb9c28eb25c50e5ab267b612e2c376d1dec2f7f7c53e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000118" : {
+            "0x1000000000000000000000000000000000000118" : {
                 "balance" : "0x00",
                 "code" : "0x600c600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a6000556000600060006000600073100000000000000000000000000000000000011862027100f1505a600255",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "160063"
+                "0x02713f"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawBalanceGas.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawBalanceGas.json
index aef6d30cd..a82043002 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawBalanceGas.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawBalanceGas.json
@@ -1,57 +1,157 @@
 {
     "RawBalanceGas" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9594eb0e3732854789880025219a4299899e42993f76597e94ace4e3dd676817",
+                    "hash" : "0x78616469907b7fd3a5c3cece8f532ed97e1e21c043cd894ca4e1b651001aaf40",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
+                    },
+                    "postState" : {
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0xee52",
+                            "code" : "",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0xe8d4a421ae",
+                            "code" : "",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        },
+                        "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x00",
+                            "code" : "0x5a6000555a600155",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x00" : "0x08d5b6",
+                                "0x01" : "0x088791"
+                            }
+                        }
                     }
                 }
             ],
             "EIP158" : [
                 {
-                    "hash" : "9594eb0e3732854789880025219a4299899e42993f76597e94ace4e3dd676817",
+                    "hash" : "0x78616469907b7fd3a5c3cece8f532ed97e1e21c043cd894ca4e1b651001aaf40",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
+                    },
+                    "postState" : {
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0xee52",
+                            "code" : "",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0xe8d4a421ae",
+                            "code" : "",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        },
+                        "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x00",
+                            "code" : "0x5a6000555a600155",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x00" : "0x08d5b6",
+                                "0x01" : "0x088791"
+                            }
+                        }
                     }
                 }
             ],
             "Frontier" : [
                 {
-                    "hash" : "54d0888537290f3584dc138c31d9700d004cdca600be21849820a76c54c619b4",
+                    "hash" : "0x78616469907b7fd3a5c3cece8f532ed97e1e21c043cd894ca4e1b651001aaf40",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
+                    },
+                    "postState" : {
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0xee52",
+                            "code" : "",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0xe8d4a421ae",
+                            "code" : "",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        },
+                        "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x00",
+                            "code" : "0x5a6000555a600155",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x00" : "0x08d5b6",
+                                "0x01" : "0x088791"
+                            }
+                        }
                     }
                 }
             ],
             "Homestead" : [
                 {
-                    "hash" : "54d0888537290f3584dc138c31d9700d004cdca600be21849820a76c54c619b4",
+                    "hash" : "0x78616469907b7fd3a5c3cece8f532ed97e1e21c043cd894ca4e1b651001aaf40",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
+                    },
+                    "postState" : {
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0xee52",
+                            "code" : "",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0xe8d4a421ae",
+                            "code" : "",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        },
+                        "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x00",
+                            "code" : "0x5a6000555a600155",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x00" : "0x08d5b6",
+                                "0x01" : "0x088791"
+                            }
+                        }
                     }
                 }
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9594eb0e3732854789880025219a4299899e42993f76597e94ace4e3dd676817",
+                    "hash" : "0x78616469907b7fd3a5c3cece8f532ed97e1e21c043cd894ca4e1b651001aaf40",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +161,16 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x5a60005573a94f5374fce5edbc8e2a8697c15331677e6ebf0b31505a600155",
+                "code" : "0x5a6000555a600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +181,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGas.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGas.json
index 746ca5526..64f967cdd 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGas.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGas.json
@@ -1,17 +1,17 @@
 {
     "RawCallCodeGas" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a9de43f50361bb52e8383e5018e5bbfd8160c40073af31c8803653f062752f73",
+                    "hash" : "0xa9de43f50361bb52e8383e5018e5bbfd8160c40073af31c8803653f062752f73",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a9de43f50361bb52e8383e5018e5bbfd8160c40073af31c8803653f062752f73",
+                    "hash" : "0xa9de43f50361bb52e8383e5018e5bbfd8160c40073af31c8803653f062752f73",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "436e92e96d0098ec2950e7e748d41b646f6156a57c140a001ca5ad0e0fb344c4",
+                    "hash" : "0x436e92e96d0098ec2950e7e748d41b646f6156a57c140a001ca5ad0e0fb344c4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "436e92e96d0098ec2950e7e748d41b646f6156a57c140a001ca5ad0e0fb344c4",
+                    "hash" : "0x436e92e96d0098ec2950e7e748d41b646f6156a57c140a001ca5ad0e0fb344c4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a9de43f50361bb52e8383e5018e5bbfd8160c40073af31c8803653f062752f73",
+                    "hash" : "0xa9de43f50361bb52e8383e5018e5bbfd8160c40073af31c8803653f062752f73",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a6000556000600060006000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b617530f2505a600155",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "500000"
+                "0x07a120"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasAsk.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasAsk.json
index 171082506..8ab2e865a 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasAsk.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasAsk.json
@@ -1,17 +1,17 @@
 {
     "RawCallCodeGasAsk" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1b60ec8d034bb388ac3b901653c64f17b9cc255612599a25f0568e2d26a03396",
+                    "hash" : "0x1b60ec8d034bb388ac3b901653c64f17b9cc255612599a25f0568e2d26a03396",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "1b60ec8d034bb388ac3b901653c64f17b9cc255612599a25f0568e2d26a03396",
+                    "hash" : "0x1b60ec8d034bb388ac3b901653c64f17b9cc255612599a25f0568e2d26a03396",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a3955a3f904c97066bd8999d4f24870bc4570c6a4be430bc1facc169f00cfe65",
+                    "hash" : "0xa3955a3f904c97066bd8999d4f24870bc4570c6a4be430bc1facc169f00cfe65",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a3955a3f904c97066bd8999d4f24870bc4570c6a4be430bc1facc169f00cfe65",
+                    "hash" : "0xa3955a3f904c97066bd8999d4f24870bc4570c6a4be430bc1facc169f00cfe65",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "1b60ec8d034bb388ac3b901653c64f17b9cc255612599a25f0568e2d26a03396",
+                    "hash" : "0x1b60ec8d034bb388ac3b901653c64f17b9cc255612599a25f0568e2d26a03396",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a6000556000600060006000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f2505a600155",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "500000"
+                "0x07a120"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasMemory.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasMemory.json
index 8f24add71..8660ab5ae 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasMemory.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasMemory.json
@@ -1,17 +1,17 @@
 {
     "RawCallCodeGasMemory" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "be24131f3cacd61852065ce4e951e44f21e09faf5592e19e9a154b9689b5d903",
+                    "hash" : "0xbe24131f3cacd61852065ce4e951e44f21e09faf5592e19e9a154b9689b5d903",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "be24131f3cacd61852065ce4e951e44f21e09faf5592e19e9a154b9689b5d903",
+                    "hash" : "0xbe24131f3cacd61852065ce4e951e44f21e09faf5592e19e9a154b9689b5d903",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "25a1d6dffd60c9ff124f52b4d208e4977c55ff7b0556c92c3bc1aec273966268",
+                    "hash" : "0x25a1d6dffd60c9ff124f52b4d208e4977c55ff7b0556c92c3bc1aec273966268",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "25a1d6dffd60c9ff124f52b4d208e4977c55ff7b0556c92c3bc1aec273966268",
+                    "hash" : "0x25a1d6dffd60c9ff124f52b4d208e4977c55ff7b0556c92c3bc1aec273966268",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "be24131f3cacd61852065ce4e951e44f21e09faf5592e19e9a154b9689b5d903",
+                    "hash" : "0xbe24131f3cacd61852065ce4e951e44f21e09faf5592e19e9a154b9689b5d903",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600055611f406000611f406000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b617530f2505a600155",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "500000"
+                "0x07a120"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasMemoryAsk.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasMemoryAsk.json
index e86a834be..fd36e520d 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasMemoryAsk.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasMemoryAsk.json
@@ -1,17 +1,17 @@
 {
     "RawCallCodeGasMemoryAsk" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f9c6b537196e490df5ffde1c93010be0f221e107d87a5bcffb6ef8a3e4e716c3",
+                    "hash" : "0xf9c6b537196e490df5ffde1c93010be0f221e107d87a5bcffb6ef8a3e4e716c3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f9c6b537196e490df5ffde1c93010be0f221e107d87a5bcffb6ef8a3e4e716c3",
+                    "hash" : "0xf9c6b537196e490df5ffde1c93010be0f221e107d87a5bcffb6ef8a3e4e716c3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "266e3b403ae2a5f7158a91249c08b3e6fd267085ba4aab04bcac6eae2c34925b",
+                    "hash" : "0x266e3b403ae2a5f7158a91249c08b3e6fd267085ba4aab04bcac6eae2c34925b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "266e3b403ae2a5f7158a91249c08b3e6fd267085ba4aab04bcac6eae2c34925b",
+                    "hash" : "0x266e3b403ae2a5f7158a91249c08b3e6fd267085ba4aab04bcac6eae2c34925b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f9c6b537196e490df5ffde1c93010be0f221e107d87a5bcffb6ef8a3e4e716c3",
+                    "hash" : "0xf9c6b537196e490df5ffde1c93010be0f221e107d87a5bcffb6ef8a3e4e716c3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600055611f406000611f406000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f2505a600155",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "500000"
+                "0x07a120"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransfer.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransfer.json
index 4d3716258..cc7ed113d 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransfer.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransfer.json
@@ -1,17 +1,17 @@
 {
     "RawCallCodeGasValueTransfer" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "81986bcc6162211f6bdf1e898413b97be5595607d67c4a6b6d1e6dfb6e625cb3",
+                    "hash" : "0x81986bcc6162211f6bdf1e898413b97be5595607d67c4a6b6d1e6dfb6e625cb3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "81986bcc6162211f6bdf1e898413b97be5595607d67c4a6b6d1e6dfb6e625cb3",
+                    "hash" : "0x81986bcc6162211f6bdf1e898413b97be5595607d67c4a6b6d1e6dfb6e625cb3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "026291c5288f263f79d5df5ff4cf7f76493758a6e5af0e2adbcdc3417a65a88d",
+                    "hash" : "0x026291c5288f263f79d5df5ff4cf7f76493758a6e5af0e2adbcdc3417a65a88d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "026291c5288f263f79d5df5ff4cf7f76493758a6e5af0e2adbcdc3417a65a88d",
+                    "hash" : "0x026291c5288f263f79d5df5ff4cf7f76493758a6e5af0e2adbcdc3417a65a88d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "81986bcc6162211f6bdf1e898413b97be5595607d67c4a6b6d1e6dfb6e625cb3",
+                    "hash" : "0x81986bcc6162211f6bdf1e898413b97be5595607d67c4a6b6d1e6dfb6e625cb3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a6000556000600060006000600a73094f5374fce5edbc8e2a8697c15331677e6ebf0b617530f2505a600155",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "500000"
+                "0x07a120"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferAsk.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferAsk.json
index 0278c1c4b..bf561be61 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferAsk.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferAsk.json
@@ -1,17 +1,17 @@
 {
     "RawCallCodeGasValueTransferAsk" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "77966e6d1d7092b2a0265eae154775b15ad90b4b12853657961fc7ad67413fd5",
+                    "hash" : "0x77966e6d1d7092b2a0265eae154775b15ad90b4b12853657961fc7ad67413fd5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "77966e6d1d7092b2a0265eae154775b15ad90b4b12853657961fc7ad67413fd5",
+                    "hash" : "0x77966e6d1d7092b2a0265eae154775b15ad90b4b12853657961fc7ad67413fd5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "ae6d57a264af762cf603b673d22bb14697901f3f99f79af0528afca7ed41c650",
+                    "hash" : "0xae6d57a264af762cf603b673d22bb14697901f3f99f79af0528afca7ed41c650",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ae6d57a264af762cf603b673d22bb14697901f3f99f79af0528afca7ed41c650",
+                    "hash" : "0xae6d57a264af762cf603b673d22bb14697901f3f99f79af0528afca7ed41c650",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "77966e6d1d7092b2a0265eae154775b15ad90b4b12853657961fc7ad67413fd5",
+                    "hash" : "0x77966e6d1d7092b2a0265eae154775b15ad90b4b12853657961fc7ad67413fd5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a6000556000600060006000600a73094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f2505a600155",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "500000"
+                "0x07a120"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemory.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemory.json
index 4e515dfa0..20387ed04 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemory.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemory.json
@@ -1,17 +1,17 @@
 {
     "RawCallCodeGasValueTransferMemory" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "352c2b4f6d8c2b94575e87a102660501a4dcc77ceff28a1b9a1e71b8daeec53f",
+                    "hash" : "0x352c2b4f6d8c2b94575e87a102660501a4dcc77ceff28a1b9a1e71b8daeec53f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "352c2b4f6d8c2b94575e87a102660501a4dcc77ceff28a1b9a1e71b8daeec53f",
+                    "hash" : "0x352c2b4f6d8c2b94575e87a102660501a4dcc77ceff28a1b9a1e71b8daeec53f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "ed8dc1a5d3a2a2a298b8e6906b8e3daa16b9e4c0cebc22b48ce4699739cf07be",
+                    "hash" : "0xed8dc1a5d3a2a2a298b8e6906b8e3daa16b9e4c0cebc22b48ce4699739cf07be",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ed8dc1a5d3a2a2a298b8e6906b8e3daa16b9e4c0cebc22b48ce4699739cf07be",
+                    "hash" : "0xed8dc1a5d3a2a2a298b8e6906b8e3daa16b9e4c0cebc22b48ce4699739cf07be",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "352c2b4f6d8c2b94575e87a102660501a4dcc77ceff28a1b9a1e71b8daeec53f",
+                    "hash" : "0x352c2b4f6d8c2b94575e87a102660501a4dcc77ceff28a1b9a1e71b8daeec53f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600055611f406000611f406000600a73094f5374fce5edbc8e2a8697c15331677e6ebf0b617530f2505a600155",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "500000"
+                "0x07a120"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemoryAsk.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemoryAsk.json
index c955ad8ae..170ab69ad 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemoryAsk.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemoryAsk.json
@@ -1,17 +1,17 @@
 {
     "RawCallCodeGasValueTransferMemoryAsk" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "42fd1ee6696ceec53bccbefc5566dd46bc126b8347a86b242603cf016d7fa105",
+                    "hash" : "0x42fd1ee6696ceec53bccbefc5566dd46bc126b8347a86b242603cf016d7fa105",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "42fd1ee6696ceec53bccbefc5566dd46bc126b8347a86b242603cf016d7fa105",
+                    "hash" : "0x42fd1ee6696ceec53bccbefc5566dd46bc126b8347a86b242603cf016d7fa105",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "55ce044177361ed520bee5fcf11c37416ab57bd929f02760f3d3e715d1b72729",
+                    "hash" : "0x55ce044177361ed520bee5fcf11c37416ab57bd929f02760f3d3e715d1b72729",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "55ce044177361ed520bee5fcf11c37416ab57bd929f02760f3d3e715d1b72729",
+                    "hash" : "0x55ce044177361ed520bee5fcf11c37416ab57bd929f02760f3d3e715d1b72729",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "42fd1ee6696ceec53bccbefc5566dd46bc126b8347a86b242603cf016d7fa105",
+                    "hash" : "0x42fd1ee6696ceec53bccbefc5566dd46bc126b8347a86b242603cf016d7fa105",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600055611f406000611f406000600a73094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f2505a600155",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "500000"
+                "0x07a120"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGas.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGas.json
index 6cd10a527..6f8dab78f 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGas.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGas.json
@@ -1,17 +1,17 @@
 {
     "RawCallGas" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6a3f5d5a1e41b13f138b96f1dd5a2c16151eb5846d1e11ae922f181c891e391d",
+                    "hash" : "0x6a3f5d5a1e41b13f138b96f1dd5a2c16151eb5846d1e11ae922f181c891e391d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6a3f5d5a1e41b13f138b96f1dd5a2c16151eb5846d1e11ae922f181c891e391d",
+                    "hash" : "0x6a3f5d5a1e41b13f138b96f1dd5a2c16151eb5846d1e11ae922f181c891e391d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2f373b8f988e05aca842b2731a5c229cbf67485ef92f564c51a793ed93ce6a86",
+                    "hash" : "0x2f373b8f988e05aca842b2731a5c229cbf67485ef92f564c51a793ed93ce6a86",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "2f373b8f988e05aca842b2731a5c229cbf67485ef92f564c51a793ed93ce6a86",
+                    "hash" : "0x2f373b8f988e05aca842b2731a5c229cbf67485ef92f564c51a793ed93ce6a86",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6a3f5d5a1e41b13f138b96f1dd5a2c16151eb5846d1e11ae922f181c891e391d",
+                    "hash" : "0x6a3f5d5a1e41b13f138b96f1dd5a2c16151eb5846d1e11ae922f181c891e391d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a6000556000600060006000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b617530f1505a600155",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "500000"
+                "0x07a120"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasAsk.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasAsk.json
index d98a3761a..7b601f0b2 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasAsk.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasAsk.json
@@ -1,17 +1,17 @@
 {
     "RawCallGasAsk" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9e524b1079059232d58d268ea909257fcd4b43dd00fc4cb7fdcc329e161710f9",
+                    "hash" : "0x9e524b1079059232d58d268ea909257fcd4b43dd00fc4cb7fdcc329e161710f9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9e524b1079059232d58d268ea909257fcd4b43dd00fc4cb7fdcc329e161710f9",
+                    "hash" : "0x9e524b1079059232d58d268ea909257fcd4b43dd00fc4cb7fdcc329e161710f9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "84bb30ba0337cdb822deb5dae3195e4e33e7f075ef2bb4e7c369f730ba563b6f",
+                    "hash" : "0x84bb30ba0337cdb822deb5dae3195e4e33e7f075ef2bb4e7c369f730ba563b6f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "84bb30ba0337cdb822deb5dae3195e4e33e7f075ef2bb4e7c369f730ba563b6f",
+                    "hash" : "0x84bb30ba0337cdb822deb5dae3195e4e33e7f075ef2bb4e7c369f730ba563b6f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9e524b1079059232d58d268ea909257fcd4b43dd00fc4cb7fdcc329e161710f9",
+                    "hash" : "0x9e524b1079059232d58d268ea909257fcd4b43dd00fc4cb7fdcc329e161710f9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a6000556000600060006000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f1505a600155",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "500000"
+                "0x07a120"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransfer.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransfer.json
index 36292b882..ddb968c55 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransfer.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransfer.json
@@ -1,17 +1,17 @@
 {
     "RawCallGasValueTransfer" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "53743363119daa3545155fb6e66499d142f4e88b839bc1fc96ccdc3bdccd51c8",
+                    "hash" : "0x53743363119daa3545155fb6e66499d142f4e88b839bc1fc96ccdc3bdccd51c8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "53743363119daa3545155fb6e66499d142f4e88b839bc1fc96ccdc3bdccd51c8",
+                    "hash" : "0x53743363119daa3545155fb6e66499d142f4e88b839bc1fc96ccdc3bdccd51c8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "319c877894cd436e6eaeee70679efa83272bdd1b9841b02715b512b53cbff3b2",
+                    "hash" : "0x319c877894cd436e6eaeee70679efa83272bdd1b9841b02715b512b53cbff3b2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "319c877894cd436e6eaeee70679efa83272bdd1b9841b02715b512b53cbff3b2",
+                    "hash" : "0x319c877894cd436e6eaeee70679efa83272bdd1b9841b02715b512b53cbff3b2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "53743363119daa3545155fb6e66499d142f4e88b839bc1fc96ccdc3bdccd51c8",
+                    "hash" : "0x53743363119daa3545155fb6e66499d142f4e88b839bc1fc96ccdc3bdccd51c8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a6000556000600060006000600a73094f5374fce5edbc8e2a8697c15331677e6ebf0b617530f1505a600155",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "500000"
+                "0x07a120"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferAsk.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferAsk.json
index 46afd539c..f6a93b5c2 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferAsk.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferAsk.json
@@ -1,17 +1,17 @@
 {
     "RawCallGasValueTransferAsk" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7326d3a2e1ab46d6f770874570d83fdec18a132bd8260957d6df2bd0c576b998",
+                    "hash" : "0x7326d3a2e1ab46d6f770874570d83fdec18a132bd8260957d6df2bd0c576b998",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7326d3a2e1ab46d6f770874570d83fdec18a132bd8260957d6df2bd0c576b998",
+                    "hash" : "0x7326d3a2e1ab46d6f770874570d83fdec18a132bd8260957d6df2bd0c576b998",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e0076a602530d15c8ccceafb9cd46357c713c7872fd4634f1aefecf9c9356ea7",
+                    "hash" : "0xe0076a602530d15c8ccceafb9cd46357c713c7872fd4634f1aefecf9c9356ea7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e0076a602530d15c8ccceafb9cd46357c713c7872fd4634f1aefecf9c9356ea7",
+                    "hash" : "0xe0076a602530d15c8ccceafb9cd46357c713c7872fd4634f1aefecf9c9356ea7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7326d3a2e1ab46d6f770874570d83fdec18a132bd8260957d6df2bd0c576b998",
+                    "hash" : "0x7326d3a2e1ab46d6f770874570d83fdec18a132bd8260957d6df2bd0c576b998",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a6000556000600060006000600a73094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f1505a600155",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "500000"
+                "0x07a120"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemory.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemory.json
index b581ce6db..67c496c3b 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemory.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemory.json
@@ -1,17 +1,17 @@
 {
     "RawCallGasValueTransferMemory" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "75a36bb5966cf991ef2c3bce1f26fbe18cf8ef791e4711c3ba99102cb66e7866",
+                    "hash" : "0x75a36bb5966cf991ef2c3bce1f26fbe18cf8ef791e4711c3ba99102cb66e7866",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "75a36bb5966cf991ef2c3bce1f26fbe18cf8ef791e4711c3ba99102cb66e7866",
+                    "hash" : "0x75a36bb5966cf991ef2c3bce1f26fbe18cf8ef791e4711c3ba99102cb66e7866",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "04a0baee683517e8d6a1a481f0606787c654e3ad3a44b4b4455df96e0f75bc17",
+                    "hash" : "0x04a0baee683517e8d6a1a481f0606787c654e3ad3a44b4b4455df96e0f75bc17",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "04a0baee683517e8d6a1a481f0606787c654e3ad3a44b4b4455df96e0f75bc17",
+                    "hash" : "0x04a0baee683517e8d6a1a481f0606787c654e3ad3a44b4b4455df96e0f75bc17",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "75a36bb5966cf991ef2c3bce1f26fbe18cf8ef791e4711c3ba99102cb66e7866",
+                    "hash" : "0x75a36bb5966cf991ef2c3bce1f26fbe18cf8ef791e4711c3ba99102cb66e7866",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600055611f406000611f406000600a73094f5374fce5edbc8e2a8697c15331677e6ebf0b617530f1505a600155",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "500000"
+                "0x07a120"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemoryAsk.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemoryAsk.json
index 7a15361d0..02a5554d9 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemoryAsk.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemoryAsk.json
@@ -1,17 +1,17 @@
 {
     "RawCallGasValueTransferMemoryAsk" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "38a9882d94b98319300b186630b0d54596fc84fb636ef6e3736edb43bd59eec4",
+                    "hash" : "0x38a9882d94b98319300b186630b0d54596fc84fb636ef6e3736edb43bd59eec4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "38a9882d94b98319300b186630b0d54596fc84fb636ef6e3736edb43bd59eec4",
+                    "hash" : "0x38a9882d94b98319300b186630b0d54596fc84fb636ef6e3736edb43bd59eec4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "eaadd3be7f372407630197e81a9f04f8a84c9ccee0e8d9ee8ed76c9a2a2a1938",
+                    "hash" : "0xeaadd3be7f372407630197e81a9f04f8a84c9ccee0e8d9ee8ed76c9a2a2a1938",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "eaadd3be7f372407630197e81a9f04f8a84c9ccee0e8d9ee8ed76c9a2a2a1938",
+                    "hash" : "0xeaadd3be7f372407630197e81a9f04f8a84c9ccee0e8d9ee8ed76c9a2a2a1938",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "38a9882d94b98319300b186630b0d54596fc84fb636ef6e3736edb43bd59eec4",
+                    "hash" : "0x38a9882d94b98319300b186630b0d54596fc84fb636ef6e3736edb43bd59eec4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600055611f406000611f406000600a73094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f1505a600155",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "500000"
+                "0x07a120"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallMemoryGas.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallMemoryGas.json
index 564cd8420..1f769ece1 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallMemoryGas.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallMemoryGas.json
@@ -1,17 +1,17 @@
 {
     "RawCallMemoryGas" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f4bb0b3beae4538ef32103fde8ec3a220e25346bc3dae89a3cacead75f135921",
+                    "hash" : "0xf4bb0b3beae4538ef32103fde8ec3a220e25346bc3dae89a3cacead75f135921",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f4bb0b3beae4538ef32103fde8ec3a220e25346bc3dae89a3cacead75f135921",
+                    "hash" : "0xf4bb0b3beae4538ef32103fde8ec3a220e25346bc3dae89a3cacead75f135921",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "576930e1e057042952521306058dc35a8cee5a53919d72da54ccdda095925ee4",
+                    "hash" : "0x576930e1e057042952521306058dc35a8cee5a53919d72da54ccdda095925ee4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "576930e1e057042952521306058dc35a8cee5a53919d72da54ccdda095925ee4",
+                    "hash" : "0x576930e1e057042952521306058dc35a8cee5a53919d72da54ccdda095925ee4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f4bb0b3beae4538ef32103fde8ec3a220e25346bc3dae89a3cacead75f135921",
+                    "hash" : "0xf4bb0b3beae4538ef32103fde8ec3a220e25346bc3dae89a3cacead75f135921",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600055611f406000611f406000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b617530f1505a600155",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "500000"
+                "0x07a120"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallMemoryGasAsk.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallMemoryGasAsk.json
index 589c4088d..2c57fe04e 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallMemoryGasAsk.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallMemoryGasAsk.json
@@ -1,17 +1,17 @@
 {
     "RawCallMemoryGasAsk" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "77bef630a7e6cb48745f83e5a618a5a0f4d4fa6e3572c006769ba95c97463240",
+                    "hash" : "0x77bef630a7e6cb48745f83e5a618a5a0f4d4fa6e3572c006769ba95c97463240",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "77bef630a7e6cb48745f83e5a618a5a0f4d4fa6e3572c006769ba95c97463240",
+                    "hash" : "0x77bef630a7e6cb48745f83e5a618a5a0f4d4fa6e3572c006769ba95c97463240",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "fa67f8254413de74863bdebf6a653f34032bbdb1bfde6e7263803182f06a2920",
+                    "hash" : "0xfa67f8254413de74863bdebf6a653f34032bbdb1bfde6e7263803182f06a2920",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "fa67f8254413de74863bdebf6a653f34032bbdb1bfde6e7263803182f06a2920",
+                    "hash" : "0xfa67f8254413de74863bdebf6a653f34032bbdb1bfde6e7263803182f06a2920",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "77bef630a7e6cb48745f83e5a618a5a0f4d4fa6e3572c006769ba95c97463240",
+                    "hash" : "0x77bef630a7e6cb48745f83e5a618a5a0f4d4fa6e3572c006769ba95c97463240",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600055611f406000611f406000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f1505a600155",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "500000"
+                "0x07a120"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer.json
index 00902cd35..5e60f1f70 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer.json
@@ -1,17 +1,17 @@
 {
     "RawCreateFailGasValueTransfer" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "78b1837232c666307f4a9cb23e48b971eeb6a547a4b788815c6e60170ab03b8a",
+                    "hash" : "0x78b1837232c666307f4a9cb23e48b971eeb6a547a4b788815c6e60170ab03b8a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "78b1837232c666307f4a9cb23e48b971eeb6a547a4b788815c6e60170ab03b8a",
+                    "hash" : "0x78b1837232c666307f4a9cb23e48b971eeb6a547a4b788815c6e60170ab03b8a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "78b1837232c666307f4a9cb23e48b971eeb6a547a4b788815c6e60170ab03b8a",
+                    "hash" : "0x78b1837232c666307f4a9cb23e48b971eeb6a547a4b788815c6e60170ab03b8a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "78b1837232c666307f4a9cb23e48b971eeb6a547a4b788815c6e60170ab03b8a",
+                    "hash" : "0x78b1837232c666307f4a9cb23e48b971eeb6a547a4b788815c6e60170ab03b8a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "78b1837232c666307f4a9cb23e48b971eeb6a547a4b788815c6e60170ab03b8a",
+                    "hash" : "0x78b1837232c666307f4a9cb23e48b971eeb6a547a4b788815c6e60170ab03b8a",
                     "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" : "0x5a60005560006000600bf0505a600155",
                 "nonce" : "0x00",
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "500000"
+                "0x07a120"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer2.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer2.json
index 31d7d247c..ab5059ab7 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer2.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer2.json
@@ -1,17 +1,17 @@
 {
     "RawCreateFailGasValueTransfer2" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "8887a012bc134474e28263d35dd6da51cdf62dabae317588516cd9d972db2184",
+                    "hash" : "0x8887a012bc134474e28263d35dd6da51cdf62dabae317588516cd9d972db2184",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "8887a012bc134474e28263d35dd6da51cdf62dabae317588516cd9d972db2184",
+                    "hash" : "0x8887a012bc134474e28263d35dd6da51cdf62dabae317588516cd9d972db2184",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "8887a012bc134474e28263d35dd6da51cdf62dabae317588516cd9d972db2184",
+                    "hash" : "0x8887a012bc134474e28263d35dd6da51cdf62dabae317588516cd9d972db2184",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "8887a012bc134474e28263d35dd6da51cdf62dabae317588516cd9d972db2184",
+                    "hash" : "0x8887a012bc134474e28263d35dd6da51cdf62dabae317588516cd9d972db2184",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "8887a012bc134474e28263d35dd6da51cdf62dabae317588516cd9d972db2184",
+                    "hash" : "0x8887a012bc134474e28263d35dd6da51cdf62dabae317588516cd9d972db2184",
                     "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" : "0x5a600055611f406000600bf0505a600155",
                 "nonce" : "0x00",
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "500000"
+                "0x07a120"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGas.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGas.json
index 8a1ddd3f8..059051f73 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGas.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGas.json
@@ -1,17 +1,17 @@
 {
     "RawCreateGas" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "98b0ca4f957c73bcac52f7587ac95d1046c9f247ca237f5bf538b6cf2446d6d9",
+                    "hash" : "0x98b0ca4f957c73bcac52f7587ac95d1046c9f247ca237f5bf538b6cf2446d6d9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b916802637eb51608d6ef5f2aefc37152cd59cb98b238b06a7276ffe8926879f",
+                    "hash" : "0xb916802637eb51608d6ef5f2aefc37152cd59cb98b238b06a7276ffe8926879f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "98b0ca4f957c73bcac52f7587ac95d1046c9f247ca237f5bf538b6cf2446d6d9",
+                    "hash" : "0x98b0ca4f957c73bcac52f7587ac95d1046c9f247ca237f5bf538b6cf2446d6d9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "98b0ca4f957c73bcac52f7587ac95d1046c9f247ca237f5bf538b6cf2446d6d9",
+                    "hash" : "0x98b0ca4f957c73bcac52f7587ac95d1046c9f247ca237f5bf538b6cf2446d6d9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b916802637eb51608d6ef5f2aefc37152cd59cb98b238b06a7276ffe8926879f",
+                    "hash" : "0xb916802637eb51608d6ef5f2aefc37152cd59cb98b238b06a7276ffe8926879f",
                     "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" : "0x5a600055600060006000f0505a600155",
                 "nonce" : "0x00",
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "500000"
+                "0x07a120"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasMemory.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasMemory.json
index 0956d72f3..a0d82d8bc 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasMemory.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasMemory.json
@@ -1,17 +1,17 @@
 {
     "RawCreateGasMemory" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d5e6f06bf6b2a9352e049cd92c933096ac6824657fb5b28c2ac7e6d899e0dcee",
+                    "hash" : "0xd5e6f06bf6b2a9352e049cd92c933096ac6824657fb5b28c2ac7e6d899e0dcee",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e6701e817eca8c6146df517e058530c3ab277f3af8cea26f6643e94e7ad5f113",
+                    "hash" : "0xe6701e817eca8c6146df517e058530c3ab277f3af8cea26f6643e94e7ad5f113",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "d5e6f06bf6b2a9352e049cd92c933096ac6824657fb5b28c2ac7e6d899e0dcee",
+                    "hash" : "0xd5e6f06bf6b2a9352e049cd92c933096ac6824657fb5b28c2ac7e6d899e0dcee",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "d5e6f06bf6b2a9352e049cd92c933096ac6824657fb5b28c2ac7e6d899e0dcee",
+                    "hash" : "0xd5e6f06bf6b2a9352e049cd92c933096ac6824657fb5b28c2ac7e6d899e0dcee",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e6701e817eca8c6146df517e058530c3ab277f3af8cea26f6643e94e7ad5f113",
+                    "hash" : "0xe6701e817eca8c6146df517e058530c3ab277f3af8cea26f6643e94e7ad5f113",
                     "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" : "0x5a600055611f4060006000f0505a600155",
                 "nonce" : "0x00",
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "500000"
+                "0x07a120"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasValueTransfer.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasValueTransfer.json
index 8e2e3942e..a4df43c0c 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasValueTransfer.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasValueTransfer.json
@@ -1,17 +1,17 @@
 {
     "RawCreateGasValueTransfer" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "85b2c400d7c56f0b46006c42f350429138d89a153009a3b8e77d1af8b0e926c6",
+                    "hash" : "0x85b2c400d7c56f0b46006c42f350429138d89a153009a3b8e77d1af8b0e926c6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "eb81439d01333840ec0930c4ddf3f5c175d272cde817b40b1163fdcd2a013e84",
+                    "hash" : "0xeb81439d01333840ec0930c4ddf3f5c175d272cde817b40b1163fdcd2a013e84",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "85b2c400d7c56f0b46006c42f350429138d89a153009a3b8e77d1af8b0e926c6",
+                    "hash" : "0x85b2c400d7c56f0b46006c42f350429138d89a153009a3b8e77d1af8b0e926c6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "85b2c400d7c56f0b46006c42f350429138d89a153009a3b8e77d1af8b0e926c6",
+                    "hash" : "0x85b2c400d7c56f0b46006c42f350429138d89a153009a3b8e77d1af8b0e926c6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "eb81439d01333840ec0930c4ddf3f5c175d272cde817b40b1163fdcd2a013e84",
+                    "hash" : "0xeb81439d01333840ec0930c4ddf3f5c175d272cde817b40b1163fdcd2a013e84",
                     "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" : "0x5a60005560006000600af0505a600155",
                 "nonce" : "0x00",
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "500000"
+                "0x07a120"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasValueTransferMemory.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasValueTransferMemory.json
index d38b6f2d9..b2e6224bb 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasValueTransferMemory.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasValueTransferMemory.json
@@ -1,17 +1,17 @@
 {
     "RawCreateGasValueTransferMemory" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "454417282a9177c084c420b352336b40a9a68d61dc3f82038000d0425647d287",
+                    "hash" : "0x454417282a9177c084c420b352336b40a9a68d61dc3f82038000d0425647d287",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d7f24038790cb5ae4392128d48ca82f08bbebe7275f23dde610323ce0ddb9874",
+                    "hash" : "0xd7f24038790cb5ae4392128d48ca82f08bbebe7275f23dde610323ce0ddb9874",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "454417282a9177c084c420b352336b40a9a68d61dc3f82038000d0425647d287",
+                    "hash" : "0x454417282a9177c084c420b352336b40a9a68d61dc3f82038000d0425647d287",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "454417282a9177c084c420b352336b40a9a68d61dc3f82038000d0425647d287",
+                    "hash" : "0x454417282a9177c084c420b352336b40a9a68d61dc3f82038000d0425647d287",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d7f24038790cb5ae4392128d48ca82f08bbebe7275f23dde610323ce0ddb9874",
+                    "hash" : "0xd7f24038790cb5ae4392128d48ca82f08bbebe7275f23dde610323ce0ddb9874",
                     "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" : "0x5a600055611f406000600af0505a600155",
                 "nonce" : "0x00",
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "500000"
+                "0x07a120"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGas.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGas.json
index 3d4e137b9..90468fc8b 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGas.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGas.json
@@ -1,17 +1,17 @@
 {
     "RawDelegateCallGas" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f3feb27bd5aead6931cb022d68ea9807a9679afd269c4abba6f79643ea00ec39",
+                    "hash" : "0xf3feb27bd5aead6931cb022d68ea9807a9679afd269c4abba6f79643ea00ec39",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f3feb27bd5aead6931cb022d68ea9807a9679afd269c4abba6f79643ea00ec39",
+                    "hash" : "0xf3feb27bd5aead6931cb022d68ea9807a9679afd269c4abba6f79643ea00ec39",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4ef295967b34e8f6cec6931840bc0947960383d969a9e0f2236183f0faa7575d",
+                    "hash" : "0x4ef295967b34e8f6cec6931840bc0947960383d969a9e0f2236183f0faa7575d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "45015e5fa68594215fb6943b7e7212278fb25b5d2b13f844163c306e14c65838",
+                    "hash" : "0x45015e5fa68594215fb6943b7e7212278fb25b5d2b13f844163c306e14c65838",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f3feb27bd5aead6931cb022d68ea9807a9679afd269c4abba6f79643ea00ec39",
+                    "hash" : "0xf3feb27bd5aead6931cb022d68ea9807a9679afd269c4abba6f79643ea00ec39",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600055600060006000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b617530f4505a600155",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "500000"
+                "0x07a120"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasAsk.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasAsk.json
index 59e8b299f..3dd79b000 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasAsk.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasAsk.json
@@ -1,17 +1,17 @@
 {
     "RawDelegateCallGasAsk" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e201f686d6c3a0fda065d4c84218a9e5ecf91b7fe75ddfc3b4efd67f210ed9fb",
+                    "hash" : "0xe201f686d6c3a0fda065d4c84218a9e5ecf91b7fe75ddfc3b4efd67f210ed9fb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e201f686d6c3a0fda065d4c84218a9e5ecf91b7fe75ddfc3b4efd67f210ed9fb",
+                    "hash" : "0xe201f686d6c3a0fda065d4c84218a9e5ecf91b7fe75ddfc3b4efd67f210ed9fb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "426f5e836aae47940b3ed939db21cc9e335d12eda8949a1d5169f3d6d0e3ccb3",
+                    "hash" : "0x426f5e836aae47940b3ed939db21cc9e335d12eda8949a1d5169f3d6d0e3ccb3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "426f5e836aae47940b3ed939db21cc9e335d12eda8949a1d5169f3d6d0e3ccb3",
+                    "hash" : "0x426f5e836aae47940b3ed939db21cc9e335d12eda8949a1d5169f3d6d0e3ccb3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e201f686d6c3a0fda065d4c84218a9e5ecf91b7fe75ddfc3b4efd67f210ed9fb",
+                    "hash" : "0xe201f686d6c3a0fda065d4c84218a9e5ecf91b7fe75ddfc3b4efd67f210ed9fb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600055600060006000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f4505a600155",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "500000"
+                "0x07a120"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasMemory.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasMemory.json
index 9fd76357b..6fe370f7d 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasMemory.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasMemory.json
@@ -1,17 +1,17 @@
 {
     "RawDelegateCallGasMemory" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "41d8038613105ad50a5b49d38f5f99f097f1e0a4a26332ee805237f159c7a23e",
+                    "hash" : "0x41d8038613105ad50a5b49d38f5f99f097f1e0a4a26332ee805237f159c7a23e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "41d8038613105ad50a5b49d38f5f99f097f1e0a4a26332ee805237f159c7a23e",
+                    "hash" : "0x41d8038613105ad50a5b49d38f5f99f097f1e0a4a26332ee805237f159c7a23e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "65b7569621f6fe011a10e6f0e6bae950ee444caabd07c4536e6a5141678b25de",
+                    "hash" : "0x65b7569621f6fe011a10e6f0e6bae950ee444caabd07c4536e6a5141678b25de",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ceac93c2f55b3827be027e884c9e774d233e5109dd8fd35cf25c9fb804a47ec4",
+                    "hash" : "0xceac93c2f55b3827be027e884c9e774d233e5109dd8fd35cf25c9fb804a47ec4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "41d8038613105ad50a5b49d38f5f99f097f1e0a4a26332ee805237f159c7a23e",
+                    "hash" : "0x41d8038613105ad50a5b49d38f5f99f097f1e0a4a26332ee805237f159c7a23e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600055611f406000611f40600073094f5374fce5edbc8e2a8697c15331677e6ebf0b617530f4505a600155",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "500000"
+                "0x07a120"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasMemoryAsk.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasMemoryAsk.json
index a49d8c56f..abfc82559 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasMemoryAsk.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasMemoryAsk.json
@@ -1,17 +1,17 @@
 {
     "RawDelegateCallGasMemoryAsk" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "25290ff69aa4a920e50553973ef7a88ff58677e2b3ad95f1447ec29292c491cf",
+                    "hash" : "0x25290ff69aa4a920e50553973ef7a88ff58677e2b3ad95f1447ec29292c491cf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "25290ff69aa4a920e50553973ef7a88ff58677e2b3ad95f1447ec29292c491cf",
+                    "hash" : "0x25290ff69aa4a920e50553973ef7a88ff58677e2b3ad95f1447ec29292c491cf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f555a574c2f7fd08089b3a4a03595daa66e980fc2bd4cdb4615edfb07d19caf2",
+                    "hash" : "0xf555a574c2f7fd08089b3a4a03595daa66e980fc2bd4cdb4615edfb07d19caf2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f555a574c2f7fd08089b3a4a03595daa66e980fc2bd4cdb4615edfb07d19caf2",
+                    "hash" : "0xf555a574c2f7fd08089b3a4a03595daa66e980fc2bd4cdb4615edfb07d19caf2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "25290ff69aa4a920e50553973ef7a88ff58677e2b3ad95f1447ec29292c491cf",
+                    "hash" : "0x25290ff69aa4a920e50553973ef7a88ff58677e2b3ad95f1447ec29292c491cf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600055611f406000611f40600073094f5374fce5edbc8e2a8697c15331677e6ebf0b622dc6c0f4505a600155",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "500000"
+                "0x07a120"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeCopyGas.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeCopyGas.json
index b9db55003..25b6bfd11 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeCopyGas.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeCopyGas.json
@@ -1,17 +1,17 @@
 {
     "RawExtCodeCopyGas" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f5da2fa2f8bd5badfe45d582dbc888cdd08a682259cfbef6342ce587cdf94086",
+                    "hash" : "0xf5da2fa2f8bd5badfe45d582dbc888cdd08a682259cfbef6342ce587cdf94086",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f5da2fa2f8bd5badfe45d582dbc888cdd08a682259cfbef6342ce587cdf94086",
+                    "hash" : "0xf5da2fa2f8bd5badfe45d582dbc888cdd08a682259cfbef6342ce587cdf94086",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "299139e4ca9042a2dc9be3402cb96ef69ebbdb16d4485eb12ea5a230fd3b7c13",
+                    "hash" : "0x299139e4ca9042a2dc9be3402cb96ef69ebbdb16d4485eb12ea5a230fd3b7c13",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "299139e4ca9042a2dc9be3402cb96ef69ebbdb16d4485eb12ea5a230fd3b7c13",
+                    "hash" : "0x299139e4ca9042a2dc9be3402cb96ef69ebbdb16d4485eb12ea5a230fd3b7c13",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f5da2fa2f8bd5badfe45d582dbc888cdd08a682259cfbef6342ce587cdf94086",
+                    "hash" : "0xf5da2fa2f8bd5badfe45d582dbc888cdd08a682259cfbef6342ce587cdf94086",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x0112233445566778899101112131415161718191202122232425",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a60005560146000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b3c5a600155",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeCopyMemoryGas.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeCopyMemoryGas.json
index e01014a7b..eca48410d 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeCopyMemoryGas.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeCopyMemoryGas.json
@@ -1,17 +1,17 @@
 {
     "RawExtCodeCopyMemoryGas" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "dd7c68b94ba7007eb5bff79c11b1dbb2f5bcc47d7bee305298b760856f7be6ea",
+                    "hash" : "0xdd7c68b94ba7007eb5bff79c11b1dbb2f5bcc47d7bee305298b760856f7be6ea",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "dd7c68b94ba7007eb5bff79c11b1dbb2f5bcc47d7bee305298b760856f7be6ea",
+                    "hash" : "0xdd7c68b94ba7007eb5bff79c11b1dbb2f5bcc47d7bee305298b760856f7be6ea",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "60b8a1372e768661d0c83723a862df03ba35138aac9478a00199511fa5e446f7",
+                    "hash" : "0x60b8a1372e768661d0c83723a862df03ba35138aac9478a00199511fa5e446f7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "60b8a1372e768661d0c83723a862df03ba35138aac9478a00199511fa5e446f7",
+                    "hash" : "0x60b8a1372e768661d0c83723a862df03ba35138aac9478a00199511fa5e446f7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "dd7c68b94ba7007eb5bff79c11b1dbb2f5bcc47d7bee305298b760856f7be6ea",
+                    "hash" : "0xdd7c68b94ba7007eb5bff79c11b1dbb2f5bcc47d7bee305298b760856f7be6ea",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x0112233445566778899101112131415161718191202122232425",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600055612b706000600073094f5374fce5edbc8e2a8697c15331677e6ebf0b3c5a600155",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeSizeGas.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeSizeGas.json
index 813051d0c..a15e97d0a 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeSizeGas.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeSizeGas.json
@@ -1,57 +1,185 @@
 {
     "RawExtCodeSizeGas" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "3bd93804e5bf8b20f53cd9a157d13e83354a82868128d8814fd7bd382376885c",
+                    "hash" : "0xf346ad33132bb259364e57a873b8dcef7fbc87698fbce7f44201cf1793b57a42",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
+                    },
+                    "postState" : {
+                        "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x00",
+                            "code" : "0x0112233445566778899101112131415161718191202122232425",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0xee52",
+                            "code" : "",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0xe8d4a421ae",
+                            "code" : "",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        },
+                        "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x00",
+                            "code" : "0x5a6000555a600155",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x00" : "0x08d5b6",
+                                "0x01" : "0x088791"
+                            }
+                        }
                     }
                 }
             ],
             "EIP158" : [
                 {
-                    "hash" : "3bd93804e5bf8b20f53cd9a157d13e83354a82868128d8814fd7bd382376885c",
+                    "hash" : "0xf346ad33132bb259364e57a873b8dcef7fbc87698fbce7f44201cf1793b57a42",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
+                    },
+                    "postState" : {
+                        "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x00",
+                            "code" : "0x0112233445566778899101112131415161718191202122232425",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0xee52",
+                            "code" : "",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0xe8d4a421ae",
+                            "code" : "",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        },
+                        "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x00",
+                            "code" : "0x5a6000555a600155",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x00" : "0x08d5b6",
+                                "0x01" : "0x088791"
+                            }
+                        }
                     }
                 }
             ],
             "Frontier" : [
                 {
-                    "hash" : "58cdfe9a8a4a77b9d8a476be3590ab21193e54949c134ec3cdec4a40447044ce",
+                    "hash" : "0xf346ad33132bb259364e57a873b8dcef7fbc87698fbce7f44201cf1793b57a42",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
+                    },
+                    "postState" : {
+                        "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x00",
+                            "code" : "0x0112233445566778899101112131415161718191202122232425",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0xee52",
+                            "code" : "",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0xe8d4a421ae",
+                            "code" : "",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        },
+                        "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x00",
+                            "code" : "0x5a6000555a600155",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x00" : "0x08d5b6",
+                                "0x01" : "0x088791"
+                            }
+                        }
                     }
                 }
             ],
             "Homestead" : [
                 {
-                    "hash" : "58cdfe9a8a4a77b9d8a476be3590ab21193e54949c134ec3cdec4a40447044ce",
+                    "hash" : "0xf346ad33132bb259364e57a873b8dcef7fbc87698fbce7f44201cf1793b57a42",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
+                    },
+                    "postState" : {
+                        "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x00",
+                            "code" : "0x0112233445566778899101112131415161718191202122232425",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0xee52",
+                            "code" : "",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0xe8d4a421ae",
+                            "code" : "",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        },
+                        "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x00",
+                            "code" : "0x5a6000555a600155",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x00" : "0x08d5b6",
+                                "0x01" : "0x088791"
+                            }
+                        }
                     }
                 }
             ],
             "Metropolis" : [
                 {
-                    "hash" : "3bd93804e5bf8b20f53cd9a157d13e83354a82868128d8814fd7bd382376885c",
+                    "hash" : "0xf346ad33132bb259364e57a873b8dcef7fbc87698fbce7f44201cf1793b57a42",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +189,23 @@
             ]
         },
         "pre" : {
-            "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x0112233445566778899101112131415161718191202122232425",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x5a60005573094f5374fce5edbc8e2a8697c15331677e6ebf0b3b505a600155",
+                "code" : "0x5a6000555a600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +216,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stEIP158Specific/CALL_OneVCallSuicide.json b/GeneralStateTests/stEIP158Specific/CALL_OneVCallSuicide.json
index ef11da08c..b62244e50 100644
--- a/GeneralStateTests/stEIP158Specific/CALL_OneVCallSuicide.json
+++ b/GeneralStateTests/stEIP158Specific/CALL_OneVCallSuicide.json
@@ -1,17 +1,17 @@
 {
     "CALL_OneVCallSuicide" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9d6a0f433324877903fd7824e33158c62752deed863a8d2fdf3a1df012ba0f72",
+                    "hash" : "0x9d6a0f433324877903fd7824e33158c62752deed863a8d2fdf3a1df012ba0f72",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9d6a0f433324877903fd7824e33158c62752deed863a8d2fdf3a1df012ba0f72",
+                    "hash" : "0x9d6a0f433324877903fd7824e33158c62752deed863a8d2fdf3a1df012ba0f72",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "ba636cbfdf864eed36b7fd36ad42e8694bb1817a4b8e8e9942c1ce8e1a8b452f",
+                    "hash" : "0xba636cbfdf864eed36b7fd36ad42e8694bb1817a4b8e8e9942c1ce8e1a8b452f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ba636cbfdf864eed36b7fd36ad42e8694bb1817a4b8e8e9942c1ce8e1a8b452f",
+                    "hash" : "0xba636cbfdf864eed36b7fd36ad42e8694bb1817a4b8e8e9942c1ce8e1a8b452f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9d6a0f433324877903fd7824e33158c62752deed863a8d2fdf3a1df012ba0f72",
+                    "hash" : "0x9d6a0f433324877903fd7824e33158c62752deed863a8d2fdf3a1df012ba0f72",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1505a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x73b94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stEIP158Specific/CALL_ZeroVCallSuicide.json b/GeneralStateTests/stEIP158Specific/CALL_ZeroVCallSuicide.json
index df13c6924..9e2216118 100644
--- a/GeneralStateTests/stEIP158Specific/CALL_ZeroVCallSuicide.json
+++ b/GeneralStateTests/stEIP158Specific/CALL_ZeroVCallSuicide.json
@@ -1,17 +1,17 @@
 {
     "CALL_ZeroVCallSuicide" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e76553703206c2cc61d5ed4e89229b1ef08f4a2769fa7a9851eaacdc60cd1b14",
+                    "hash" : "0xe76553703206c2cc61d5ed4e89229b1ef08f4a2769fa7a9851eaacdc60cd1b14",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e76553703206c2cc61d5ed4e89229b1ef08f4a2769fa7a9851eaacdc60cd1b14",
+                    "hash" : "0xe76553703206c2cc61d5ed4e89229b1ef08f4a2769fa7a9851eaacdc60cd1b14",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5ed0275864a115e3c3420d2e1729d25f6a59089abfb581fde385195a560af5a5",
+                    "hash" : "0x5ed0275864a115e3c3420d2e1729d25f6a59089abfb581fde385195a560af5a5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5ed0275864a115e3c3420d2e1729d25f6a59089abfb581fde385195a560af5a5",
+                    "hash" : "0x5ed0275864a115e3c3420d2e1729d25f6a59089abfb581fde385195a560af5a5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e76553703206c2cc61d5ed4e89229b1ef08f4a2769fa7a9851eaacdc60cd1b14",
+                    "hash" : "0xe76553703206c2cc61d5ed4e89229b1ef08f4a2769fa7a9851eaacdc60cd1b14",
                     "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" : "0x5a6000556000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1505a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x73b94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stEIP158Specific/EXP_Empty.json b/GeneralStateTests/stEIP158Specific/EXP_Empty.json
index 2532cb854..a9f924fd0 100644
--- a/GeneralStateTests/stEIP158Specific/EXP_Empty.json
+++ b/GeneralStateTests/stEIP158Specific/EXP_Empty.json
@@ -1,17 +1,17 @@
 {
     "EXP_Empty" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6d14764dbe4291fd612b847a7b378a6e42da87209063184263ffd06e25a0c446",
+                    "hash" : "0x6d14764dbe4291fd612b847a7b378a6e42da87209063184263ffd06e25a0c446",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "41d83353455a43d5fffdc0ef1901a9861cb0cad2249da8883da516f1abb6b27b",
+                    "hash" : "0x41d83353455a43d5fffdc0ef1901a9861cb0cad2249da8883da516f1abb6b27b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6d14764dbe4291fd612b847a7b378a6e42da87209063184263ffd06e25a0c446",
+                    "hash" : "0x6d14764dbe4291fd612b847a7b378a6e42da87209063184263ffd06e25a0c446",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6d14764dbe4291fd612b847a7b378a6e42da87209063184263ffd06e25a0c446",
+                    "hash" : "0x6d14764dbe4291fd612b847a7b378a6e42da87209063184263ffd06e25a0c446",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "41d83353455a43d5fffdc0ef1901a9861cb0cad2249da8883da516f1abb6b27b",
+                    "hash" : "0x41d83353455a43d5fffdc0ef1901a9861cb0cad2249da8883da516f1abb6b27b",
                     "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" : "0x5a600055600c60000a6001555a6002556000600c0a6003555a60045567ffffffffffffffff60000a6005555a6006556fffffffffffffffffffffffffffffffff60000a6007555a6008557fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60000a6009555a600a55600067ffffffffffffffff0a600b555a600c5560006fffffffffffffffffffffffffffffffff0a600d555a600e5560007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0a600f555a606455",
                 "nonce" : "0x00",
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stEIP158Specific/EXTCODESIZE_toEpmty.json b/GeneralStateTests/stEIP158Specific/EXTCODESIZE_toEpmty.json
index 87c859e38..eb66157b8 100644
--- a/GeneralStateTests/stEIP158Specific/EXTCODESIZE_toEpmty.json
+++ b/GeneralStateTests/stEIP158Specific/EXTCODESIZE_toEpmty.json
@@ -1,17 +1,17 @@
 {
     "EXTCODESIZE_toEpmty" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "34a02e6b097a84f37b8b8dfc7ec67212c22f90b0fd96739445110c91dc45280a",
+                    "hash" : "0x34a02e6b097a84f37b8b8dfc7ec67212c22f90b0fd96739445110c91dc45280a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "34a02e6b097a84f37b8b8dfc7ec67212c22f90b0fd96739445110c91dc45280a",
+                    "hash" : "0x34a02e6b097a84f37b8b8dfc7ec67212c22f90b0fd96739445110c91dc45280a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "8da206824967bc73b6adf5714e337ce99d2e181201d6bb69920bba8ca8e17088",
+                    "hash" : "0x8da206824967bc73b6adf5714e337ce99d2e181201d6bb69920bba8ca8e17088",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "8da206824967bc73b6adf5714e337ce99d2e181201d6bb69920bba8ca8e17088",
+                    "hash" : "0x8da206824967bc73b6adf5714e337ce99d2e181201d6bb69920bba8ca8e17088",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "34a02e6b097a84f37b8b8dfc7ec67212c22f90b0fd96739445110c91dc45280a",
+                    "hash" : "0x34a02e6b097a84f37b8b8dfc7ec67212c22f90b0fd96739445110c91dc45280a",
                     "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" : "0x5a60005573c94f5374fce5edbc8e2a8697c15331677e6ebf0b3b6001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stEIP158Specific/EXTCODESIZE_toNonExistent.json b/GeneralStateTests/stEIP158Specific/EXTCODESIZE_toNonExistent.json
index 0ef8b8572..bd372618a 100644
--- a/GeneralStateTests/stEIP158Specific/EXTCODESIZE_toNonExistent.json
+++ b/GeneralStateTests/stEIP158Specific/EXTCODESIZE_toNonExistent.json
@@ -1,17 +1,17 @@
 {
     "EXTCODESIZE_toNonExistent" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "61431c2ae5d71abbaeb163ac1ee1fe6ce0a27cf7a9eebcc9f250f696d30f5aa1",
+                    "hash" : "0x61431c2ae5d71abbaeb163ac1ee1fe6ce0a27cf7a9eebcc9f250f696d30f5aa1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "61431c2ae5d71abbaeb163ac1ee1fe6ce0a27cf7a9eebcc9f250f696d30f5aa1",
+                    "hash" : "0x61431c2ae5d71abbaeb163ac1ee1fe6ce0a27cf7a9eebcc9f250f696d30f5aa1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6f640e328965e45fb3b37ee5e99eae277153dee13ca21c942ffbfe9c11c0e01e",
+                    "hash" : "0x6f640e328965e45fb3b37ee5e99eae277153dee13ca21c942ffbfe9c11c0e01e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6f640e328965e45fb3b37ee5e99eae277153dee13ca21c942ffbfe9c11c0e01e",
+                    "hash" : "0x6f640e328965e45fb3b37ee5e99eae277153dee13ca21c942ffbfe9c11c0e01e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "61431c2ae5d71abbaeb163ac1ee1fe6ce0a27cf7a9eebcc9f250f696d30f5aa1",
+                    "hash" : "0x61431c2ae5d71abbaeb163ac1ee1fe6ce0a27cf7a9eebcc9f250f696d30f5aa1",
                     "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" : "0x5a60005573c94f5374fce5edbc8e2a8697c15331677e6ebf0b3b6001555a606455",
                 "nonce" : "0x00",
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stEIP158Specific/vitalikTransactionTest.json b/GeneralStateTests/stEIP158Specific/vitalikTransactionTest.json
index 088a55321..7f91942ab 100644
--- a/GeneralStateTests/stEIP158Specific/vitalikTransactionTest.json
+++ b/GeneralStateTests/stEIP158Specific/vitalikTransactionTest.json
@@ -1,17 +1,17 @@
 {
     "vitalikTransactionTest" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7a281a1ce18be77fa72d654767a410e2244f172c744ee2ac1154960f4981a3b4",
+                    "hash" : "0x7a281a1ce18be77fa72d654767a410e2244f172c744ee2ac1154960f4981a3b4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e3de92e8ec039e7b32fc50549194af8e16214e995915d1f66c4121d30ff88275",
+                    "hash" : "0xe3de92e8ec039e7b32fc50549194af8e16214e995915d1f66c4121d30ff88275",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6243be0d831b29c25ba9250267d6c78bc84e087c1d0d9b76f7fc40212ae857e2",
+                    "hash" : "0x6243be0d831b29c25ba9250267d6c78bc84e087c1d0d9b76f7fc40212ae857e2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "413833e5cb37a0c12c8e02c380e3c51587a102c5b02f1a65dc42a89b89224275",
+                    "hash" : "0x413833e5cb37a0c12c8e02c380e3c51587a102c5b02f1a65dc42a89b89224275",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e3de92e8ec039e7b32fc50549194af8e16214e995915d1f66c4121d30ff88275",
+                    "hash" : "0xe3de92e8ec039e7b32fc50549194af8e16214e995915d1f66c4121d30ff88275",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "cd2a3d9f938e13cd947ec05abc7fe734df8dd826" : {
+            "0xcd2a3d9f938e13cd947ec05abc7fe734df8dd826" : {
                 "balance" : "0xffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x014f",
                 "storage" : {
                 }
             },
-            "ee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4" : {
+            "0xee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -85,10 +85,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x014f",
-            "secretKey" : "c85ef7d79691fe79573b1a7064c19c1a9819ebdbd1faaab1a8ec92344438aaf4",
+            "secretKey" : "0xc85ef7d79691fe79573b1a7064c19c1a9819ebdbd1faaab1a8ec92344438aaf4",
             "to" : "",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stExample/add11.json b/GeneralStateTests/stExample/add11.json
index 03a32c747..f9a5d44d7 100644
--- a/GeneralStateTests/stExample/add11.json
+++ b/GeneralStateTests/stExample/add11.json
@@ -1,17 +1,17 @@
 {
     "add11" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "17454a767e5f04461256f3812ffca930443c04a47d05ce3f38940c4a14b8c479",
+                    "hash" : "0x17454a767e5f04461256f3812ffca930443c04a47d05ce3f38940c4a14b8c479",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "17454a767e5f04461256f3812ffca930443c04a47d05ce3f38940c4a14b8c479",
+                    "hash" : "0x17454a767e5f04461256f3812ffca930443c04a47d05ce3f38940c4a14b8c479",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "17454a767e5f04461256f3812ffca930443c04a47d05ce3f38940c4a14b8c479",
+                    "hash" : "0x17454a767e5f04461256f3812ffca930443c04a47d05ce3f38940c4a14b8c479",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "17454a767e5f04461256f3812ffca930443c04a47d05ce3f38940c4a14b8c479",
+                    "hash" : "0x17454a767e5f04461256f3812ffca930443c04a47d05ce3f38940c4a14b8c479",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "17454a767e5f04461256f3812ffca930443c04a47d05ce3f38940c4a14b8c479",
+                    "hash" : "0x17454a767e5f04461256f3812ffca930443c04a47d05ce3f38940c4a14b8c479",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600101600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContract.json b/GeneralStateTests/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContract.json
index 2db7bff45..4d447949f 100644
--- a/GeneralStateTests/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContract.json
+++ b/GeneralStateTests/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContract.json
@@ -1,17 +1,17 @@
 {
     "contractCreationOOGdontLeaveEmptyContract" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "35df33d2a146ff660bb837914781857715d1b8752371b2f3e0768f29dd484775",
+                    "hash" : "0x35df33d2a146ff660bb837914781857715d1b8752371b2f3e0768f29dd484775",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "35df33d2a146ff660bb837914781857715d1b8752371b2f3e0768f29dd484775",
+                    "hash" : "0x35df33d2a146ff660bb837914781857715d1b8752371b2f3e0768f29dd484775",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "11ad11c6c73f16022220dad1de2eb827aa3c04fa651f7a7b15231ed98efab9bc",
+                    "hash" : "0x11ad11c6c73f16022220dad1de2eb827aa3c04fa651f7a7b15231ed98efab9bc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "11ad11c6c73f16022220dad1de2eb827aa3c04fa651f7a7b15231ed98efab9bc",
+                    "hash" : "0x11ad11c6c73f16022220dad1de2eb827aa3c04fa651f7a7b15231ed98efab9bc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "35df33d2a146ff660bb837914781857715d1b8752371b2f3e0768f29dd484775",
+                    "hash" : "0x35df33d2a146ff660bb837914781857715d1b8752371b2f3e0768f29dd484775",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60106001557f6001600155601080600c6000396000f3006000355415600957005b6020356000600052602060006000f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "93056"
+                "0x016b80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000001",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000001",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContractViaTransaction.json b/GeneralStateTests/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContractViaTransaction.json
index 05ddbe28b..8f2926828 100644
--- a/GeneralStateTests/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContractViaTransaction.json
+++ b/GeneralStateTests/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContractViaTransaction.json
@@ -1,17 +1,17 @@
 {
     "contractCreationOOGdontLeaveEmptyContractViaTransaction" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "982629977cc807888a4aca6888907d0348ce9b6af9482eb0606bb42d3312d883",
+                    "hash" : "0x982629977cc807888a4aca6888907d0348ce9b6af9482eb0606bb42d3312d883",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "86631b9f3536a824efa412c3162885c8bbb1657e315b8dbbda6a24a8ae8ff868",
+                    "hash" : "0x86631b9f3536a824efa412c3162885c8bbb1657e315b8dbbda6a24a8ae8ff868",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "09977193631f79f56dc2d8dd43b100c0d93e3e1019f12bc7990e06769790b7c5",
+                    "hash" : "0x09977193631f79f56dc2d8dd43b100c0d93e3e1019f12bc7990e06769790b7c5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "bf80ccfd1a7e6bf9f0ab98b938595389fd7240f2206c33bade862e49c19c2248",
+                    "hash" : "0xbf80ccfd1a7e6bf9f0ab98b938595389fd7240f2206c33bade862e49c19c2248",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "86631b9f3536a824efa412c3162885c8bbb1657e315b8dbbda6a24a8ae8ff868",
+                    "hash" : "0x86631b9f3536a824efa412c3162885c8bbb1657e315b8dbbda6a24a8ae8ff868",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6001600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x10c8e0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161c350f1",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 "0x6040600060406000600073100000000000000000000000000000000000000161c350f1"
             ],
             "gasLimit" : [
-                "96000"
+                "0x017700"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stHomesteadSpecific/createContractViaContract.json b/GeneralStateTests/stHomesteadSpecific/createContractViaContract.json
index 5239d5367..67741bfdb 100644
--- a/GeneralStateTests/stHomesteadSpecific/createContractViaContract.json
+++ b/GeneralStateTests/stHomesteadSpecific/createContractViaContract.json
@@ -1,17 +1,17 @@
 {
     "createContractViaContract" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "373942284112628b5c8cfd0f36d8058934fe6861cd7224feb3ac2d03739da305",
+                    "hash" : "0x373942284112628b5c8cfd0f36d8058934fe6861cd7224feb3ac2d03739da305",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "00a243435c3922719d07f434874d20e02a1971ca2bc6d6359bcc18f7e1e766f1",
+                    "hash" : "0x00a243435c3922719d07f434874d20e02a1971ca2bc6d6359bcc18f7e1e766f1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "373942284112628b5c8cfd0f36d8058934fe6861cd7224feb3ac2d03739da305",
+                    "hash" : "0x373942284112628b5c8cfd0f36d8058934fe6861cd7224feb3ac2d03739da305",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "373942284112628b5c8cfd0f36d8058934fe6861cd7224feb3ac2d03739da305",
+                    "hash" : "0x373942284112628b5c8cfd0f36d8058934fe6861cd7224feb3ac2d03739da305",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "00a243435c3922719d07f434874d20e02a1971ca2bc6d6359bcc18f7e1e766f1",
+                    "hash" : "0x00a243435c3922719d07f434874d20e02a1971ca2bc6d6359bcc18f7e1e766f1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x600060006000f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "100000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000001",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000001",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stHomesteadSpecific/createContractViaContractOOGInitCode.json b/GeneralStateTests/stHomesteadSpecific/createContractViaContractOOGInitCode.json
index b360862e5..eb6f7a666 100644
--- a/GeneralStateTests/stHomesteadSpecific/createContractViaContractOOGInitCode.json
+++ b/GeneralStateTests/stHomesteadSpecific/createContractViaContractOOGInitCode.json
@@ -1,17 +1,17 @@
 {
     "createContractViaContractOOGInitCode" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f079b93388a39a4c343c66a917a044fb0d91de079786366d0c6c3b01bee07e7b",
+                    "hash" : "0xf079b93388a39a4c343c66a917a044fb0d91de079786366d0c6c3b01bee07e7b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f079b93388a39a4c343c66a917a044fb0d91de079786366d0c6c3b01bee07e7b",
+                    "hash" : "0xf079b93388a39a4c343c66a917a044fb0d91de079786366d0c6c3b01bee07e7b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "ef627373222f9f8a0c974af676a99f9a8c62a585e7b8935cec7a26a7029ae6f0",
+                    "hash" : "0xef627373222f9f8a0c974af676a99f9a8c62a585e7b8935cec7a26a7029ae6f0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ef627373222f9f8a0c974af676a99f9a8c62a585e7b8935cec7a26a7029ae6f0",
+                    "hash" : "0xef627373222f9f8a0c974af676a99f9a8c62a585e7b8935cec7a26a7029ae6f0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f079b93388a39a4c343c66a917a044fb0d91de079786366d0c6c3b01bee07e7b",
+                    "hash" : "0xf079b93388a39a4c343c66a917a044fb0d91de079786366d0c6c3b01bee07e7b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6b602060406000f0600c600055600052600c60146000f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x10c8e0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "105044"
+                "0x019a54"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000001",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000001",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stHomesteadSpecific/createContractViaTransactionCost53000.json b/GeneralStateTests/stHomesteadSpecific/createContractViaTransactionCost53000.json
index 259a02915..909b14a80 100644
--- a/GeneralStateTests/stHomesteadSpecific/createContractViaTransactionCost53000.json
+++ b/GeneralStateTests/stHomesteadSpecific/createContractViaTransactionCost53000.json
@@ -1,17 +1,17 @@
 {
     "createContractViaTransactionCost53000" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "53f5b84edd82703a225e53e9ae3639729eb8e337098531456998af602b0ded0a",
+                    "hash" : "0x53f5b84edd82703a225e53e9ae3639729eb8e337098531456998af602b0ded0a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "01d55964b2d7eb43d050c308c5835cbc9d0d876a35fd855f063ca4fc424c4e28",
+                    "hash" : "0x01d55964b2d7eb43d050c308c5835cbc9d0d876a35fd855f063ca4fc424c4e28",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "cf29b86efa1b7f5f999ef519fcc921062924d5c14d78baf491252fbf5a0d85b8",
+                    "hash" : "0xcf29b86efa1b7f5f999ef519fcc921062924d5c14d78baf491252fbf5a0d85b8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "53f5b84edd82703a225e53e9ae3639729eb8e337098531456998af602b0ded0a",
+                    "hash" : "0x53f5b84edd82703a225e53e9ae3639729eb8e337098531456998af602b0ded0a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "01d55964b2d7eb43d050c308c5835cbc9d0d876a35fd855f063ca4fc424c4e28",
+                    "hash" : "0x01d55964b2d7eb43d050c308c5835cbc9d0d876a35fd855f063ca4fc424c4e28",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -74,14 +74,14 @@
                 ""
             ],
             "gasLimit" : [
-                "100000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stInitCodeTest/CallContractToCreateContractAndCallItOOG.json b/GeneralStateTests/stInitCodeTest/CallContractToCreateContractAndCallItOOG.json
index cb95e9c1e..fecd74926 100644
--- a/GeneralStateTests/stInitCodeTest/CallContractToCreateContractAndCallItOOG.json
+++ b/GeneralStateTests/stInitCodeTest/CallContractToCreateContractAndCallItOOG.json
@@ -1,17 +1,17 @@
 {
     "CallContractToCreateContractAndCallItOOG" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x05f5e100",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "fcb25702c7c2186a58e9936af688f085395718f6ef1c8d29fea496b5f589f864",
+                    "hash" : "0xfcb25702c7c2186a58e9936af688f085395718f6ef1c8d29fea496b5f589f864",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f7f358c00a469057a8f00ad5ec59a8f0170605b89aa526948ec3be8e70b8e96d",
+                    "hash" : "0xf7f358c00a469057a8f00ad5ec59a8f0170605b89aa526948ec3be8e70b8e96d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "125bb759624d0f75e9a13d45208c3adf9b01bac040c37617e4f6fa82cc66880e",
+                    "hash" : "0x125bb759624d0f75e9a13d45208c3adf9b01bac040c37617e4f6fa82cc66880e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "125bb759624d0f75e9a13d45208c3adf9b01bac040c37617e4f6fa82cc66880e",
+                    "hash" : "0x125bb759624d0f75e9a13d45208c3adf9b01bac040c37617e4f6fa82cc66880e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f7f358c00a469057a8f00ad5ec59a8f0170605b89aa526948ec3be8e70b8e96d",
+                    "hash" : "0xf7f358c00a469057a8f00ad5ec59a8f0170605b89aa526948ec3be8e70b8e96d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x03e8",
                 "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b6001f0600055600060006000600060006000546103e8f1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f5e100",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 "0x00"
             ],
             "gasLimit" : [
-                "203000"
+                "0x0318f8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stInitCodeTest/CallContractToCreateContractNoCash.json b/GeneralStateTests/stInitCodeTest/CallContractToCreateContractNoCash.json
index 5c9b107a6..acb54634f 100644
--- a/GeneralStateTests/stInitCodeTest/CallContractToCreateContractNoCash.json
+++ b/GeneralStateTests/stInitCodeTest/CallContractToCreateContractNoCash.json
@@ -1,17 +1,17 @@
 {
     "CallContractToCreateContractNoCash" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x05f5e100",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "ac141f722f0723010a7e634d6da894a6ed548d16643dfa3a0305feba3398ea6a",
+                    "hash" : "0xac141f722f0723010a7e634d6da894a6ed548d16643dfa3a0305feba3398ea6a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "ac141f722f0723010a7e634d6da894a6ed548d16643dfa3a0305feba3398ea6a",
+                    "hash" : "0xac141f722f0723010a7e634d6da894a6ed548d16643dfa3a0305feba3398ea6a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "ac141f722f0723010a7e634d6da894a6ed548d16643dfa3a0305feba3398ea6a",
+                    "hash" : "0xac141f722f0723010a7e634d6da894a6ed548d16643dfa3a0305feba3398ea6a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ac141f722f0723010a7e634d6da894a6ed548d16643dfa3a0305feba3398ea6a",
+                    "hash" : "0xac141f722f0723010a7e634d6da894a6ed548d16643dfa3a0305feba3398ea6a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "ac141f722f0723010a7e634d6da894a6ed548d16643dfa3a0305feba3398ea6a",
+                    "hash" : "0xac141f722f0723010a7e634d6da894a6ed548d16643dfa3a0305feba3398ea6a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x2710",
                 "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b620186a0f0600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f5e100",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 "0x00"
             ],
             "gasLimit" : [
-                "20000000"
+                "0x01312d00"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stInitCodeTest/CallContractToCreateContractOOG.json b/GeneralStateTests/stInitCodeTest/CallContractToCreateContractOOG.json
index ee7326067..104498601 100644
--- a/GeneralStateTests/stInitCodeTest/CallContractToCreateContractOOG.json
+++ b/GeneralStateTests/stInitCodeTest/CallContractToCreateContractOOG.json
@@ -1,17 +1,17 @@
 {
     "CallContractToCreateContractOOG" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x05f5e100",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f59872f076aae7b433a18fca69d4c2de1dcb5efe4a33f602ddcd9f076692f923",
+                    "hash" : "0xf59872f076aae7b433a18fca69d4c2de1dcb5efe4a33f602ddcd9f076692f923",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e7db137cc3df6d785a0820d8354296bd7bced99f719af76cfc28cf097569aa43",
+                    "hash" : "0xe7db137cc3df6d785a0820d8354296bd7bced99f719af76cfc28cf097569aa43",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "befdd7b9114f546b0b7ce58f5e46b24f24003acff6af79cac0c32ee17029a2cd",
+                    "hash" : "0xbefdd7b9114f546b0b7ce58f5e46b24f24003acff6af79cac0c32ee17029a2cd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "befdd7b9114f546b0b7ce58f5e46b24f24003acff6af79cac0c32ee17029a2cd",
+                    "hash" : "0xbefdd7b9114f546b0b7ce58f5e46b24f24003acff6af79cac0c32ee17029a2cd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e7db137cc3df6d785a0820d8354296bd7bced99f719af76cfc28cf097569aa43",
+                    "hash" : "0xe7db137cc3df6d785a0820d8354296bd7bced99f719af76cfc28cf097569aa43",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b6001f0600055600060006000600060006000546000f1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f5e100",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 "0x00"
             ],
             "gasLimit" : [
-                "20000000"
+                "0x01312d00"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stInitCodeTest/CallContractToCreateContractOOGBonusGas.json b/GeneralStateTests/stInitCodeTest/CallContractToCreateContractOOGBonusGas.json
index ea5e10bc6..a06a54d6c 100644
--- a/GeneralStateTests/stInitCodeTest/CallContractToCreateContractOOGBonusGas.json
+++ b/GeneralStateTests/stInitCodeTest/CallContractToCreateContractOOGBonusGas.json
@@ -1,17 +1,17 @@
 {
     "CallContractToCreateContractOOGBonusGas" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x05f5e100",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "5cc580fa6536cadacd23d6d5f7afb50076a5f7889832cfca9dc0a10473900898",
+                    "hash" : "0x5cc580fa6536cadacd23d6d5f7afb50076a5f7889832cfca9dc0a10473900898",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "1df975ab2132724cb9ce03e9cacef9e4d40a57a284c0cc20414debc014ddd9b6",
+                    "hash" : "0x1df975ab2132724cb9ce03e9cacef9e4d40a57a284c0cc20414debc014ddd9b6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "63bf90b1298600ad4eead4b7c518cba014b52bafdd3ffa7f6ae19e6f22530651",
+                    "hash" : "0x63bf90b1298600ad4eead4b7c518cba014b52bafdd3ffa7f6ae19e6f22530651",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "63bf90b1298600ad4eead4b7c518cba014b52bafdd3ffa7f6ae19e6f22530651",
+                    "hash" : "0x63bf90b1298600ad4eead4b7c518cba014b52bafdd3ffa7f6ae19e6f22530651",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "1df975ab2132724cb9ce03e9cacef9e4d40a57a284c0cc20414debc014ddd9b6",
+                    "hash" : "0x1df975ab2132724cb9ce03e9cacef9e4d40a57a284c0cc20414debc014ddd9b6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x70",
                 "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b6001f06000556000600060006000600c6000546000f1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f5e100",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 "0x00"
             ],
             "gasLimit" : [
-                "20000000"
+                "0x01312d00"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractIfCalled.json b/GeneralStateTests/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractIfCalled.json
index 55140c8af..cb4fb1aa0 100644
--- a/GeneralStateTests/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractIfCalled.json
+++ b/GeneralStateTests/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractIfCalled.json
@@ -1,17 +1,17 @@
 {
     "CallContractToCreateContractWhichWouldCreateContractIfCalled" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x05f5e100",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "ccb3e0f5b2e7a9eeb364611ad58c4d5d29c4b9ba85883b6eede820376e3d5727",
+                    "hash" : "0xccb3e0f5b2e7a9eeb364611ad58c4d5d29c4b9ba85883b6eede820376e3d5727",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "47086403782efc54f929a3b9b6691265db6f4e8081f9c360f7048b7712f6f114",
+                    "hash" : "0x47086403782efc54f929a3b9b6691265db6f4e8081f9c360f7048b7712f6f114",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "82391f2ce4d0391379a80ca1bfd7baadd5a296652bec4ce809191af461298810",
+                    "hash" : "0x82391f2ce4d0391379a80ca1bfd7baadd5a296652bec4ce809191af461298810",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "82391f2ce4d0391379a80ca1bfd7baadd5a296652bec4ce809191af461298810",
+                    "hash" : "0x82391f2ce4d0391379a80ca1bfd7baadd5a296652bec4ce809191af461298810",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "47086403782efc54f929a3b9b6691265db6f4e8081f9c360f7048b7712f6f114",
+                    "hash" : "0x47086403782efc54f929a3b9b6691265db6f4e8081f9c360f7048b7712f6f114",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x03e8",
                 "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b6001f06000556000600060006000600160005461c350f1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f5e100",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 "0x00"
             ],
             "gasLimit" : [
-                "20000000"
+                "0x01312d00"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractInInitCode.json b/GeneralStateTests/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractInInitCode.json
index 4c7610f56..607e73b4b 100644
--- a/GeneralStateTests/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractInInitCode.json
+++ b/GeneralStateTests/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractInInitCode.json
@@ -1,17 +1,17 @@
 {
     "CallContractToCreateContractWhichWouldCreateContractInInitCode" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x05f5e100",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a281799aefc2823b2740b1368b39068de101c2c3eb8863becac0f3252b00dbb6",
+                    "hash" : "0xa281799aefc2823b2740b1368b39068de101c2c3eb8863becac0f3252b00dbb6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "58fb374685d5b632a101fbb327141ac46688bad3ddc0329b44761bf72e7b1475",
+                    "hash" : "0x58fb374685d5b632a101fbb327141ac46688bad3ddc0329b44761bf72e7b1475",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a281799aefc2823b2740b1368b39068de101c2c3eb8863becac0f3252b00dbb6",
+                    "hash" : "0xa281799aefc2823b2740b1368b39068de101c2c3eb8863becac0f3252b00dbb6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a281799aefc2823b2740b1368b39068de101c2c3eb8863becac0f3252b00dbb6",
+                    "hash" : "0xa281799aefc2823b2740b1368b39068de101c2c3eb8863becac0f3252b00dbb6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "58fb374685d5b632a101fbb327141ac46688bad3ddc0329b44761bf72e7b1475",
+                    "hash" : "0x58fb374685d5b632a101fbb327141ac46688bad3ddc0329b44761bf72e7b1475",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01",
                 "code" : "0x6b600c600055602060406000f0600052600c60146000f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f5e100",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 "0x00"
             ],
             "gasLimit" : [
-                "20000000"
+                "0x01312d00"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stInitCodeTest/CallRecursiveContract.json b/GeneralStateTests/stInitCodeTest/CallRecursiveContract.json
index 7668eb560..b5b183e13 100644
--- a/GeneralStateTests/stInitCodeTest/CallRecursiveContract.json
+++ b/GeneralStateTests/stInitCodeTest/CallRecursiveContract.json
@@ -1,17 +1,17 @@
 {
     "CallRecursiveContract" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x05f5e100",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f2b33499b0bdf4a78f3f6d54c7f3ede696df72fceba07519f1327de7181184b5",
+                    "hash" : "0xf2b33499b0bdf4a78f3f6d54c7f3ede696df72fceba07519f1327de7181184b5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "624e603c08a6f3ec965ecbadc51c73e26a6f8d77c65aca8fe08a21d9082b258f",
+                    "hash" : "0x624e603c08a6f3ec965ecbadc51c73e26a6f8d77c65aca8fe08a21d9082b258f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4fee218443f0d352ef33dfe5dd9bdf120528b38ef3be46630b865bea6b1e6b28",
+                    "hash" : "0x4fee218443f0d352ef33dfe5dd9bdf120528b38ef3be46630b865bea6b1e6b28",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4fee218443f0d352ef33dfe5dd9bdf120528b38ef3be46630b865bea6b1e6b28",
+                    "hash" : "0x4fee218443f0d352ef33dfe5dd9bdf120528b38ef3be46630b865bea6b1e6b28",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "624e603c08a6f3ec965ecbadc51c73e26a6f8d77c65aca8fe08a21d9082b258f",
+                    "hash" : "0x624e603c08a6f3ec965ecbadc51c73e26a6f8d77c65aca8fe08a21d9082b258f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x3060025560206000600039602060006000f0",
                 "nonce" : "0x28",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 "0x00"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stInitCodeTest/CallTheContractToCreateEmptyContract.json b/GeneralStateTests/stInitCodeTest/CallTheContractToCreateEmptyContract.json
index a0b804b09..77e8e13a2 100644
--- a/GeneralStateTests/stInitCodeTest/CallTheContractToCreateEmptyContract.json
+++ b/GeneralStateTests/stInitCodeTest/CallTheContractToCreateEmptyContract.json
@@ -1,17 +1,17 @@
 {
     "CallTheContractToCreateEmptyContract" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x05f5e100",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "00cfff7e10d762e286e00843be08f353174b8adfffd4c4494f60cb9b4ef8a86e",
+                    "hash" : "0x00cfff7e10d762e286e00843be08f353174b8adfffd4c4494f60cb9b4ef8a86e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "83d9a35ebebdf653931fabd255b98059e0e83fa0b0001665e7a6e428f905e13b",
+                    "hash" : "0x83d9a35ebebdf653931fabd255b98059e0e83fa0b0001665e7a6e428f905e13b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "00cfff7e10d762e286e00843be08f353174b8adfffd4c4494f60cb9b4ef8a86e",
+                    "hash" : "0x00cfff7e10d762e286e00843be08f353174b8adfffd4c4494f60cb9b4ef8a86e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "00cfff7e10d762e286e00843be08f353174b8adfffd4c4494f60cb9b4ef8a86e",
+                    "hash" : "0x00cfff7e10d762e286e00843be08f353174b8adfffd4c4494f60cb9b4ef8a86e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "83d9a35ebebdf653931fabd255b98059e0e83fa0b0001665e7a6e428f905e13b",
+                    "hash" : "0x83d9a35ebebdf653931fabd255b98059e0e83fa0b0001665e7a6e428f905e13b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x602060006000f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 "0x00"
             ],
             "gasLimit" : [
-                "100000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stInitCodeTest/NotEnoughCashContractCreation.json b/GeneralStateTests/stInitCodeTest/NotEnoughCashContractCreation.json
index c0b092e61..41e972b83 100644
--- a/GeneralStateTests/stInitCodeTest/NotEnoughCashContractCreation.json
+++ b/GeneralStateTests/stInitCodeTest/NotEnoughCashContractCreation.json
@@ -1,17 +1,17 @@
 {
     "NotEnoughCashContractCreation" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f10846403945e764b907151f573ce337b6a5a1d0f51b43bfbb59af88a9991ab2",
+                    "hash" : "0xf10846403945e764b907151f573ce337b6a5a1d0f51b43bfbb59af88a9991ab2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f10846403945e764b907151f573ce337b6a5a1d0f51b43bfbb59af88a9991ab2",
+                    "hash" : "0xf10846403945e764b907151f573ce337b6a5a1d0f51b43bfbb59af88a9991ab2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f10846403945e764b907151f573ce337b6a5a1d0f51b43bfbb59af88a9991ab2",
+                    "hash" : "0xf10846403945e764b907151f573ce337b6a5a1d0f51b43bfbb59af88a9991ab2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f10846403945e764b907151f573ce337b6a5a1d0f51b43bfbb59af88a9991ab2",
+                    "hash" : "0xf10846403945e764b907151f573ce337b6a5a1d0f51b43bfbb59af88a9991ab2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f10846403945e764b907151f573ce337b6a5a1d0f51b43bfbb59af88a9991ab2",
+                    "hash" : "0xf10846403945e764b907151f573ce337b6a5a1d0f51b43bfbb59af88a9991ab2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x56a1",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -74,14 +74,14 @@
                 "0x600a80600c6000396000f200600160008035811a8100"
             ],
             "gasLimit" : [
-                "54176"
+                "0xd3a0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "100"
+                "0x64"
             ]
         }
     }
diff --git a/GeneralStateTests/stInitCodeTest/OutOfGasContractCreation.json b/GeneralStateTests/stInitCodeTest/OutOfGasContractCreation.json
index ffa12653c..126a8b8f6 100644
--- a/GeneralStateTests/stInitCodeTest/OutOfGasContractCreation.json
+++ b/GeneralStateTests/stInitCodeTest/OutOfGasContractCreation.json
@@ -1,17 +1,17 @@
 {
     "OutOfGasContractCreation" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x05f5e100",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "18c1342886baeaf926b3fbbfb0484bf0cd1ced43576547c11153d3c8944d5c47",
+                    "hash" : "0x18c1342886baeaf926b3fbbfb0484bf0cd1ced43576547c11153d3c8944d5c47",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "18c1342886baeaf926b3fbbfb0484bf0cd1ced43576547c11153d3c8944d5c47",
+                    "hash" : "0x18c1342886baeaf926b3fbbfb0484bf0cd1ced43576547c11153d3c8944d5c47",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4dc8fd3642ac4025c835f5d567dfac89679c66da501e5b9657115366467a1b42",
+                    "hash" : "0x4dc8fd3642ac4025c835f5d567dfac89679c66da501e5b9657115366467a1b42",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "18c1342886baeaf926b3fbbfb0484bf0cd1ced43576547c11153d3c8944d5c47",
+                    "hash" : "0x18c1342886baeaf926b3fbbfb0484bf0cd1ced43576547c11153d3c8944d5c47",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "18c1342886baeaf926b3fbbfb0484bf0cd1ced43576547c11153d3c8944d5c47",
+                    "hash" : "0x18c1342886baeaf926b3fbbfb0484bf0cd1ced43576547c11153d3c8944d5c47",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -74,14 +74,14 @@
                 "0x600a80600c6000396000f200600160008035811a8100"
             ],
             "gasLimit" : [
-                "54000"
+                "0xd2f0"
             ],
             "gasPrice" : "0x03",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stInitCodeTest/OutOfGasPrefundedContractCreation.json b/GeneralStateTests/stInitCodeTest/OutOfGasPrefundedContractCreation.json
index db11009fa..13f6dad96 100644
--- a/GeneralStateTests/stInitCodeTest/OutOfGasPrefundedContractCreation.json
+++ b/GeneralStateTests/stInitCodeTest/OutOfGasPrefundedContractCreation.json
@@ -1,17 +1,17 @@
 {
     "OutOfGasPrefundedContractCreation" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x05f5e100",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "820dea567b5028afad5568712a2bbfcf60e44f845b8d9d5668e8abf00763867b",
+                    "hash" : "0x820dea567b5028afad5568712a2bbfcf60e44f845b8d9d5668e8abf00763867b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "820dea567b5028afad5568712a2bbfcf60e44f845b8d9d5668e8abf00763867b",
+                    "hash" : "0x820dea567b5028afad5568712a2bbfcf60e44f845b8d9d5668e8abf00763867b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "cbc258a15bcc22ec1c8d9e63b82159dd1caf8f3527d8215bdd9168e39d0c89e2",
+                    "hash" : "0xcbc258a15bcc22ec1c8d9e63b82159dd1caf8f3527d8215bdd9168e39d0c89e2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "820dea567b5028afad5568712a2bbfcf60e44f845b8d9d5668e8abf00763867b",
+                    "hash" : "0x820dea567b5028afad5568712a2bbfcf60e44f845b8d9d5668e8abf00763867b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "820dea567b5028afad5568712a2bbfcf60e44f845b8d9d5668e8abf00763867b",
+                    "hash" : "0x820dea567b5028afad5568712a2bbfcf60e44f845b8d9d5668e8abf00763867b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 "0x600a80600c6000396000f200600160008035811a8100"
             ],
             "gasLimit" : [
-                "54000"
+                "0xd2f0"
             ],
             "gasPrice" : "0x03",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stInitCodeTest/ReturnTest.json b/GeneralStateTests/stInitCodeTest/ReturnTest.json
index 5bcdab0b4..0554f9d2e 100644
--- a/GeneralStateTests/stInitCodeTest/ReturnTest.json
+++ b/GeneralStateTests/stInitCodeTest/ReturnTest.json
@@ -1,17 +1,17 @@
 {
     "ReturnTest" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "8dc79f7b0515a4242d5e46f4aef2e9648a0743cf4278786cb5cfa399630ae3cf",
+                    "hash" : "0x8dc79f7b0515a4242d5e46f4aef2e9648a0743cf4278786cb5cfa399630ae3cf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "8dc79f7b0515a4242d5e46f4aef2e9648a0743cf4278786cb5cfa399630ae3cf",
+                    "hash" : "0x8dc79f7b0515a4242d5e46f4aef2e9648a0743cf4278786cb5cfa399630ae3cf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2b31035b94d9371fc05da98a08a0d51b69b99accf06645f69d25a8c2addb4108",
+                    "hash" : "0x2b31035b94d9371fc05da98a08a0d51b69b99accf06645f69d25a8c2addb4108",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "2b31035b94d9371fc05da98a08a0d51b69b99accf06645f69d25a8c2addb4108",
+                    "hash" : "0x2b31035b94d9371fc05da98a08a0d51b69b99accf06645f69d25a8c2addb4108",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "8dc79f7b0515a4242d5e46f4aef2e9648a0743cf4278786cb5cfa399630ae3cf",
+                    "hash" : "0x8dc79f7b0515a4242d5e46f4aef2e9648a0743cf4278786cb5cfa399630ae3cf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "194f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0x194f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x6001601f6001601e600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b6107d0f1506000516000556002601ef3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
                 "code" : "0x60156000526001601ff3",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "300000"
+                "0x0493e0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "194f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x194f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stInitCodeTest/ReturnTest2.json b/GeneralStateTests/stInitCodeTest/ReturnTest2.json
index 66a1c15fd..47d58eccb 100644
--- a/GeneralStateTests/stInitCodeTest/ReturnTest2.json
+++ b/GeneralStateTests/stInitCodeTest/ReturnTest2.json
@@ -1,17 +1,17 @@
 {
     "ReturnTest2" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x3b9aca00",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "4826e07577b6c45b7e3164c54be942f6a30a57014deb830eb065db8c9ecff2e1",
+                    "hash" : "0x4826e07577b6c45b7e3164c54be942f6a30a57014deb830eb065db8c9ecff2e1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "4826e07577b6c45b7e3164c54be942f6a30a57014deb830eb065db8c9ecff2e1",
+                    "hash" : "0x4826e07577b6c45b7e3164c54be942f6a30a57014deb830eb065db8c9ecff2e1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9330976c9b157c848242ece05257c5c056efeb55310c91406ebe0ed40ff3f578",
+                    "hash" : "0x9330976c9b157c848242ece05257c5c056efeb55310c91406ebe0ed40ff3f578",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9330976c9b157c848242ece05257c5c056efeb55310c91406ebe0ed40ff3f578",
+                    "hash" : "0x9330976c9b157c848242ece05257c5c056efeb55310c91406ebe0ed40ff3f578",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "4826e07577b6c45b7e3164c54be942f6a30a57014deb830eb065db8c9ecff2e1",
+                    "hash" : "0x4826e07577b6c45b7e3164c54be942f6a30a57014deb830eb065db8c9ecff2e1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "194f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0x194f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x60156000526020602060206000600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b611b58f15060005160005560205160015560406000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
                 "code" : "0x60003560030260005260206000f3",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "250000"
+                "0x03d090"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "194f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x194f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stInitCodeTest/StackUnderFlowContractCreation.json b/GeneralStateTests/stInitCodeTest/StackUnderFlowContractCreation.json
index a49db618a..adfaa3707 100644
--- a/GeneralStateTests/stInitCodeTest/StackUnderFlowContractCreation.json
+++ b/GeneralStateTests/stInitCodeTest/StackUnderFlowContractCreation.json
@@ -1,17 +1,17 @@
 {
     "StackUnderFlowContractCreation" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "961c54e78bf240486182b172fbb7d740e2da28906ea11dcb1266cb20e8862b5a",
+                    "hash" : "0x961c54e78bf240486182b172fbb7d740e2da28906ea11dcb1266cb20e8862b5a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "961c54e78bf240486182b172fbb7d740e2da28906ea11dcb1266cb20e8862b5a",
+                    "hash" : "0x961c54e78bf240486182b172fbb7d740e2da28906ea11dcb1266cb20e8862b5a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "961c54e78bf240486182b172fbb7d740e2da28906ea11dcb1266cb20e8862b5a",
+                    "hash" : "0x961c54e78bf240486182b172fbb7d740e2da28906ea11dcb1266cb20e8862b5a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "961c54e78bf240486182b172fbb7d740e2da28906ea11dcb1266cb20e8862b5a",
+                    "hash" : "0x961c54e78bf240486182b172fbb7d740e2da28906ea11dcb1266cb20e8862b5a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "961c54e78bf240486182b172fbb7d740e2da28906ea11dcb1266cb20e8862b5a",
+                    "hash" : "0x961c54e78bf240486182b172fbb7d740e2da28906ea11dcb1266cb20e8862b5a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0124f8",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -74,14 +74,14 @@
                 "0x6000f1"
             ],
             "gasLimit" : [
-                "72000"
+                "0x011940"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stInitCodeTest/TransactionCreateAutoSuicideContract.json b/GeneralStateTests/stInitCodeTest/TransactionCreateAutoSuicideContract.json
index c70c0113d..9a5df5533 100644
--- a/GeneralStateTests/stInitCodeTest/TransactionCreateAutoSuicideContract.json
+++ b/GeneralStateTests/stInitCodeTest/TransactionCreateAutoSuicideContract.json
@@ -1,17 +1,17 @@
 {
     "TransactionCreateAutoSuicideContract" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b2f8ca928c2981cc192c854df4736810593c8fd90783416d84b4a0f1e0fea952",
+                    "hash" : "0xb2f8ca928c2981cc192c854df4736810593c8fd90783416d84b4a0f1e0fea952",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b2f8ca928c2981cc192c854df4736810593c8fd90783416d84b4a0f1e0fea952",
+                    "hash" : "0xb2f8ca928c2981cc192c854df4736810593c8fd90783416d84b4a0f1e0fea952",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5e2d18e12d28a412e04a57800ba998a10739ee10aa35127cfcb8e675c2bbd290",
+                    "hash" : "0x5e2d18e12d28a412e04a57800ba998a10739ee10aa35127cfcb8e675c2bbd290",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e0b65a3a37e8268cf5b5a41ef02bba89826e1a436636f182645214e5235c9c79",
+                    "hash" : "0xe0b65a3a37e8268cf5b5a41ef02bba89826e1a436636f182645214e5235c9c79",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b2f8ca928c2981cc192c854df4736810593c8fd90783416d84b4a0f1e0fea952",
+                    "hash" : "0xb2f8ca928c2981cc192c854df4736810593c8fd90783416d84b4a0f1e0fea952",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -74,14 +74,14 @@
                 "0x600a80600c6000396000fff2ffff600160008035811a81"
             ],
             "gasLimit" : [
-                "55000"
+                "0xd6d8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "15"
+                "0x0f"
             ]
         }
     }
diff --git a/GeneralStateTests/stInitCodeTest/TransactionCreateRandomInitCode.json b/GeneralStateTests/stInitCodeTest/TransactionCreateRandomInitCode.json
index 1a63a427f..7926203a4 100644
--- a/GeneralStateTests/stInitCodeTest/TransactionCreateRandomInitCode.json
+++ b/GeneralStateTests/stInitCodeTest/TransactionCreateRandomInitCode.json
@@ -1,17 +1,17 @@
 {
     "TransactionCreateRandomInitCode" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9e36cea9425d4207793943218f40eedc0c7b9505693c74e1c39b27b2de902d13",
+                    "hash" : "0x9e36cea9425d4207793943218f40eedc0c7b9505693c74e1c39b27b2de902d13",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9e36cea9425d4207793943218f40eedc0c7b9505693c74e1c39b27b2de902d13",
+                    "hash" : "0x9e36cea9425d4207793943218f40eedc0c7b9505693c74e1c39b27b2de902d13",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9e36cea9425d4207793943218f40eedc0c7b9505693c74e1c39b27b2de902d13",
+                    "hash" : "0x9e36cea9425d4207793943218f40eedc0c7b9505693c74e1c39b27b2de902d13",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9e36cea9425d4207793943218f40eedc0c7b9505693c74e1c39b27b2de902d13",
+                    "hash" : "0x9e36cea9425d4207793943218f40eedc0c7b9505693c74e1c39b27b2de902d13",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9e36cea9425d4207793943218f40eedc0c7b9505693c74e1c39b27b2de902d13",
+                    "hash" : "0x9e36cea9425d4207793943218f40eedc0c7b9505693c74e1c39b27b2de902d13",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -74,14 +74,14 @@
                 "0x600a80600c6000396000f200600160008035811a8100"
             ],
             "gasLimit" : [
-                "64599"
+                "0xfc57"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stInitCodeTest/TransactionCreateStopInInitcode.json b/GeneralStateTests/stInitCodeTest/TransactionCreateStopInInitcode.json
index 44defb809..53495163c 100644
--- a/GeneralStateTests/stInitCodeTest/TransactionCreateStopInInitcode.json
+++ b/GeneralStateTests/stInitCodeTest/TransactionCreateStopInInitcode.json
@@ -1,17 +1,17 @@
 {
     "TransactionCreateStopInInitcode" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "99f11d9bf8862c426bc510d7c6d2ed4c6f353411b782f8a3a268268319b9b689",
+                    "hash" : "0x99f11d9bf8862c426bc510d7c6d2ed4c6f353411b782f8a3a268268319b9b689",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "3c443f320c10ef9b6ecc4db0ac9e6bc184ef4d924d03bc9be54e8c0850ef9138",
+                    "hash" : "0x3c443f320c10ef9b6ecc4db0ac9e6bc184ef4d924d03bc9be54e8c0850ef9138",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b2de012ac480412426664a68a009920fb4ce8c9651543900c440070e8e286644",
+                    "hash" : "0xb2de012ac480412426664a68a009920fb4ce8c9651543900c440070e8e286644",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "99f11d9bf8862c426bc510d7c6d2ed4c6f353411b782f8a3a268268319b9b689",
+                    "hash" : "0x99f11d9bf8862c426bc510d7c6d2ed4c6f353411b782f8a3a268268319b9b689",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "3c443f320c10ef9b6ecc4db0ac9e6bc184ef4d924d03bc9be54e8c0850ef9138",
+                    "hash" : "0x3c443f320c10ef9b6ecc4db0ac9e6bc184ef4d924d03bc9be54e8c0850ef9138",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -74,14 +74,14 @@
                 "0x600a80600c600039600000f20000600160008035811a81"
             ],
             "gasLimit" : [
-                "55000"
+                "0xd6d8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stInitCodeTest/TransactionCreateSuicideInInitcode.json b/GeneralStateTests/stInitCodeTest/TransactionCreateSuicideInInitcode.json
index 73b36d7c7..961319b19 100644
--- a/GeneralStateTests/stInitCodeTest/TransactionCreateSuicideInInitcode.json
+++ b/GeneralStateTests/stInitCodeTest/TransactionCreateSuicideInInitcode.json
@@ -1,17 +1,17 @@
 {
     "TransactionCreateSuicideInInitcode" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b2f8ca928c2981cc192c854df4736810593c8fd90783416d84b4a0f1e0fea952",
+                    "hash" : "0xb2f8ca928c2981cc192c854df4736810593c8fd90783416d84b4a0f1e0fea952",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b2f8ca928c2981cc192c854df4736810593c8fd90783416d84b4a0f1e0fea952",
+                    "hash" : "0xb2f8ca928c2981cc192c854df4736810593c8fd90783416d84b4a0f1e0fea952",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b2f8ca928c2981cc192c854df4736810593c8fd90783416d84b4a0f1e0fea952",
+                    "hash" : "0xb2f8ca928c2981cc192c854df4736810593c8fd90783416d84b4a0f1e0fea952",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b2f8ca928c2981cc192c854df4736810593c8fd90783416d84b4a0f1e0fea952",
+                    "hash" : "0xb2f8ca928c2981cc192c854df4736810593c8fd90783416d84b4a0f1e0fea952",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b2f8ca928c2981cc192c854df4736810593c8fd90783416d84b4a0f1e0fea952",
+                    "hash" : "0xb2f8ca928c2981cc192c854df4736810593c8fd90783416d84b4a0f1e0fea952",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -74,14 +74,14 @@
                 "0x600a80600c6000396000f200ff600160008035811a81"
             ],
             "gasLimit" : [
-                "55000"
+                "0xd6d8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stLogTests/log0_emptyMem.json b/GeneralStateTests/stLogTests/log0_emptyMem.json
index f30ffe1e9..6bf287d29 100644
--- a/GeneralStateTests/stLogTests/log0_emptyMem.json
+++ b/GeneralStateTests/stLogTests/log0_emptyMem.json
@@ -1,17 +1,17 @@
 {
     "log0_emptyMem" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f55476a34dbeeae3ea7bb6a6d9c58ff100b4ca2a8c1a889ee609a4981664facc",
+                    "hash" : "0xf55476a34dbeeae3ea7bb6a6d9c58ff100b4ca2a8c1a889ee609a4981664facc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f55476a34dbeeae3ea7bb6a6d9c58ff100b4ca2a8c1a889ee609a4981664facc",
+                    "hash" : "0xf55476a34dbeeae3ea7bb6a6d9c58ff100b4ca2a8c1a889ee609a4981664facc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3d3859bbd67f0e8744dce0f4ad3c8dd36645445adcdc8caa2c4863758bf9e5a2",
+                    "hash" : "0x3d3859bbd67f0e8744dce0f4ad3c8dd36645445adcdc8caa2c4863758bf9e5a2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3d3859bbd67f0e8744dce0f4ad3c8dd36645445adcdc8caa2c4863758bf9e5a2",
+                    "hash" : "0x3d3859bbd67f0e8744dce0f4ad3c8dd36645445adcdc8caa2c4863758bf9e5a2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f55476a34dbeeae3ea7bb6a6d9c58ff100b4ca2a8c1a889ee609a4981664facc",
+                    "hash" : "0xf55476a34dbeeae3ea7bb6a6d9c58ff100b4ca2a8c1a889ee609a4981664facc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60006000600060006017730f572e5295c57f15886f9b263e2f6d2d6c7b5ec66103e8f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60006000a0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "210000"
+                "0x033450"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stLogTests/log0_logMemStartTooHigh.json b/GeneralStateTests/stLogTests/log0_logMemStartTooHigh.json
index e506df8a8..70b41614e 100644
--- a/GeneralStateTests/stLogTests/log0_logMemStartTooHigh.json
+++ b/GeneralStateTests/stLogTests/log0_logMemStartTooHigh.json
@@ -1,17 +1,17 @@
 {
     "log0_logMemStartTooHigh" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a7344ce6434f1777f47403ab4451f0290e120e1de611ce9f7bf42706b78b4431",
+                    "hash" : "0xa7344ce6434f1777f47403ab4451f0290e120e1de611ce9f7bf42706b78b4431",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a7344ce6434f1777f47403ab4451f0290e120e1de611ce9f7bf42706b78b4431",
+                    "hash" : "0xa7344ce6434f1777f47403ab4451f0290e120e1de611ce9f7bf42706b78b4431",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "59f374457333e9f8102f82a25863a6fd03e657d6938f68e5eee55ddd7b508d0b",
+                    "hash" : "0x59f374457333e9f8102f82a25863a6fd03e657d6938f68e5eee55ddd7b508d0b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "59f374457333e9f8102f82a25863a6fd03e657d6938f68e5eee55ddd7b508d0b",
+                    "hash" : "0x59f374457333e9f8102f82a25863a6fd03e657d6938f68e5eee55ddd7b508d0b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a7344ce6434f1777f47403ab4451f0290e120e1de611ce9f7bf42706b78b4431",
+                    "hash" : "0xa7344ce6434f1777f47403ab4451f0290e120e1de611ce9f7bf42706b78b4431",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60006000600060006017730f572e5295c57f15886f9b263e2f6d2d6c7b5ec66103e8f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7faabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd60005260017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "210000"
+                "0x033450"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stLogTests/log0_logMemsizeTooHigh.json b/GeneralStateTests/stLogTests/log0_logMemsizeTooHigh.json
index 5459638d5..93984cf8b 100644
--- a/GeneralStateTests/stLogTests/log0_logMemsizeTooHigh.json
+++ b/GeneralStateTests/stLogTests/log0_logMemsizeTooHigh.json
@@ -1,17 +1,17 @@
 {
     "log0_logMemsizeTooHigh" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "0a5b2e7586c8106d623797e8617da36ab0a18f4433eb12858806f81375d1bab1",
+                    "hash" : "0x0a5b2e7586c8106d623797e8617da36ab0a18f4433eb12858806f81375d1bab1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "0a5b2e7586c8106d623797e8617da36ab0a18f4433eb12858806f81375d1bab1",
+                    "hash" : "0x0a5b2e7586c8106d623797e8617da36ab0a18f4433eb12858806f81375d1bab1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "334a1c65ff108c7e67fca71547c8daacc84c7c4972ab4290c959c94f9e087597",
+                    "hash" : "0x334a1c65ff108c7e67fca71547c8daacc84c7c4972ab4290c959c94f9e087597",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "334a1c65ff108c7e67fca71547c8daacc84c7c4972ab4290c959c94f9e087597",
+                    "hash" : "0x334a1c65ff108c7e67fca71547c8daacc84c7c4972ab4290c959c94f9e087597",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0a5b2e7586c8106d623797e8617da36ab0a18f4433eb12858806f81375d1bab1",
+                    "hash" : "0x0a5b2e7586c8106d623797e8617da36ab0a18f4433eb12858806f81375d1bab1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60006000600060006017730f572e5295c57f15886f9b263e2f6d2d6c7b5ec66103e8f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7faabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd6000527fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001a0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "210000"
+                "0x033450"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stLogTests/log0_logMemsizeZero.json b/GeneralStateTests/stLogTests/log0_logMemsizeZero.json
index e45a77992..a2a74d298 100644
--- a/GeneralStateTests/stLogTests/log0_logMemsizeZero.json
+++ b/GeneralStateTests/stLogTests/log0_logMemsizeZero.json
@@ -1,17 +1,17 @@
 {
     "log0_logMemsizeZero" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1b6e42f7ff302cca4cac931038c13746fea598cd83a3871ecb6fc8db6719bf61",
+                    "hash" : "0x1b6e42f7ff302cca4cac931038c13746fea598cd83a3871ecb6fc8db6719bf61",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "1b6e42f7ff302cca4cac931038c13746fea598cd83a3871ecb6fc8db6719bf61",
+                    "hash" : "0x1b6e42f7ff302cca4cac931038c13746fea598cd83a3871ecb6fc8db6719bf61",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "0c2ada0f9b669899fa16ef4b4e185d5810472281c5ff26d281b99755d9351323",
+                    "hash" : "0x0c2ada0f9b669899fa16ef4b4e185d5810472281c5ff26d281b99755d9351323",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "0c2ada0f9b669899fa16ef4b4e185d5810472281c5ff26d281b99755d9351323",
+                    "hash" : "0x0c2ada0f9b669899fa16ef4b4e185d5810472281c5ff26d281b99755d9351323",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "1b6e42f7ff302cca4cac931038c13746fea598cd83a3871ecb6fc8db6719bf61",
+                    "hash" : "0x1b6e42f7ff302cca4cac931038c13746fea598cd83a3871ecb6fc8db6719bf61",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60006000600060006017730f572e5295c57f15886f9b263e2f6d2d6c7b5ec66103e8f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7faabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd60005260006001a0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "210000"
+                "0x033450"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stLogTests/log0_nonEmptyMem.json b/GeneralStateTests/stLogTests/log0_nonEmptyMem.json
index 5120fb29c..4620a486a 100644
--- a/GeneralStateTests/stLogTests/log0_nonEmptyMem.json
+++ b/GeneralStateTests/stLogTests/log0_nonEmptyMem.json
@@ -1,17 +1,17 @@
 {
     "log0_nonEmptyMem" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "3df9dd948daa68d6a9cd50f0e6aee29860f239e25a9108e6da17541f8e2e8287",
+                    "hash" : "0x3df9dd948daa68d6a9cd50f0e6aee29860f239e25a9108e6da17541f8e2e8287",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "3df9dd948daa68d6a9cd50f0e6aee29860f239e25a9108e6da17541f8e2e8287",
+                    "hash" : "0x3df9dd948daa68d6a9cd50f0e6aee29860f239e25a9108e6da17541f8e2e8287",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "aced3ad4beec7139daff9b67d286c29e54a900a690369c3034e660db8c05ee24",
+                    "hash" : "0xaced3ad4beec7139daff9b67d286c29e54a900a690369c3034e660db8c05ee24",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "aced3ad4beec7139daff9b67d286c29e54a900a690369c3034e660db8c05ee24",
+                    "hash" : "0xaced3ad4beec7139daff9b67d286c29e54a900a690369c3034e660db8c05ee24",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "3df9dd948daa68d6a9cd50f0e6aee29860f239e25a9108e6da17541f8e2e8287",
+                    "hash" : "0x3df9dd948daa68d6a9cd50f0e6aee29860f239e25a9108e6da17541f8e2e8287",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60006000600060006017730f572e5295c57f15886f9b263e2f6d2d6c7b5ec66103e8f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260206000a0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "210000"
+                "0x033450"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stLogTests/log0_nonEmptyMem_logMemSize1.json b/GeneralStateTests/stLogTests/log0_nonEmptyMem_logMemSize1.json
index 65a8b34e2..b8e020e5a 100644
--- a/GeneralStateTests/stLogTests/log0_nonEmptyMem_logMemSize1.json
+++ b/GeneralStateTests/stLogTests/log0_nonEmptyMem_logMemSize1.json
@@ -1,17 +1,17 @@
 {
     "log0_nonEmptyMem_logMemSize1" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b141dd55b8491834f4fadc3be3454f5062bfa137ebafab82714f527853b795c2",
+                    "hash" : "0xb141dd55b8491834f4fadc3be3454f5062bfa137ebafab82714f527853b795c2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b141dd55b8491834f4fadc3be3454f5062bfa137ebafab82714f527853b795c2",
+                    "hash" : "0xb141dd55b8491834f4fadc3be3454f5062bfa137ebafab82714f527853b795c2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "27468e59b891d655b941f547f54141b9eb4f5181cf41c833a6a486bd62279a63",
+                    "hash" : "0x27468e59b891d655b941f547f54141b9eb4f5181cf41c833a6a486bd62279a63",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "27468e59b891d655b941f547f54141b9eb4f5181cf41c833a6a486bd62279a63",
+                    "hash" : "0x27468e59b891d655b941f547f54141b9eb4f5181cf41c833a6a486bd62279a63",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b141dd55b8491834f4fadc3be3454f5062bfa137ebafab82714f527853b795c2",
+                    "hash" : "0xb141dd55b8491834f4fadc3be3454f5062bfa137ebafab82714f527853b795c2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60006000600060006017730f572e5295c57f15886f9b263e2f6d2d6c7b5ec66103e8f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7faabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd60005260016000a0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "210000"
+                "0x033450"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "2100000"
+                "0x200b20"
             ]
         }
     }
diff --git a/GeneralStateTests/stLogTests/log0_nonEmptyMem_logMemSize1_logMemStart31.json b/GeneralStateTests/stLogTests/log0_nonEmptyMem_logMemSize1_logMemStart31.json
index fbf2ad58c..33b69392d 100644
--- a/GeneralStateTests/stLogTests/log0_nonEmptyMem_logMemSize1_logMemStart31.json
+++ b/GeneralStateTests/stLogTests/log0_nonEmptyMem_logMemSize1_logMemStart31.json
@@ -1,17 +1,17 @@
 {
     "log0_nonEmptyMem_logMemSize1_logMemStart31" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "98f34dbe7adb9dc8afd88ddf6db6da2767f8ecf99802c72d42d1e0384f071712",
+                    "hash" : "0x98f34dbe7adb9dc8afd88ddf6db6da2767f8ecf99802c72d42d1e0384f071712",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "98f34dbe7adb9dc8afd88ddf6db6da2767f8ecf99802c72d42d1e0384f071712",
+                    "hash" : "0x98f34dbe7adb9dc8afd88ddf6db6da2767f8ecf99802c72d42d1e0384f071712",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "690a45ff15a07c98efc1cf26f2e8d72c27a2dd38c06492a26d837b156f776e69",
+                    "hash" : "0x690a45ff15a07c98efc1cf26f2e8d72c27a2dd38c06492a26d837b156f776e69",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "690a45ff15a07c98efc1cf26f2e8d72c27a2dd38c06492a26d837b156f776e69",
+                    "hash" : "0x690a45ff15a07c98efc1cf26f2e8d72c27a2dd38c06492a26d837b156f776e69",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "98f34dbe7adb9dc8afd88ddf6db6da2767f8ecf99802c72d42d1e0384f071712",
+                    "hash" : "0x98f34dbe7adb9dc8afd88ddf6db6da2767f8ecf99802c72d42d1e0384f071712",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60006000600060006017730f572e5295c57f15886f9b263e2f6d2d6c7b5ec66103e8f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7faabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd6000526001601fa0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "210000"
+                "0x033450"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stLogTests/log1_Caller.json b/GeneralStateTests/stLogTests/log1_Caller.json
index 1a6b5c92a..6e4af9cee 100644
--- a/GeneralStateTests/stLogTests/log1_Caller.json
+++ b/GeneralStateTests/stLogTests/log1_Caller.json
@@ -1,17 +1,17 @@
 {
     "log1_Caller" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7faaa6b174b824a735a925ae601e16f04191239cff38f31fbca9a88545dfaf42",
+                    "hash" : "0x7faaa6b174b824a735a925ae601e16f04191239cff38f31fbca9a88545dfaf42",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7faaa6b174b824a735a925ae601e16f04191239cff38f31fbca9a88545dfaf42",
+                    "hash" : "0x7faaa6b174b824a735a925ae601e16f04191239cff38f31fbca9a88545dfaf42",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "931ec75a3fed2751ac9f1adc4b53055844fc0a6cc1533a85db7fc8c67d40ca03",
+                    "hash" : "0x931ec75a3fed2751ac9f1adc4b53055844fc0a6cc1533a85db7fc8c67d40ca03",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "931ec75a3fed2751ac9f1adc4b53055844fc0a6cc1533a85db7fc8c67d40ca03",
+                    "hash" : "0x931ec75a3fed2751ac9f1adc4b53055844fc0a6cc1533a85db7fc8c67d40ca03",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7faaa6b174b824a735a925ae601e16f04191239cff38f31fbca9a88545dfaf42",
+                    "hash" : "0x7faaa6b174b824a735a925ae601e16f04191239cff38f31fbca9a88545dfaf42",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60006000600060006017730f572e5295c57f15886f9b263e2f6d2d6c7b5ec66103e8f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60ff6000533360206000a1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "210000"
+                "0x033450"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stLogTests/log1_MaxTopic.json b/GeneralStateTests/stLogTests/log1_MaxTopic.json
index b35e3cfd3..5eddfd1bc 100644
--- a/GeneralStateTests/stLogTests/log1_MaxTopic.json
+++ b/GeneralStateTests/stLogTests/log1_MaxTopic.json
@@ -1,17 +1,17 @@
 {
     "log1_MaxTopic" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "ddea2d5d953450ecfc7393fb0656719a321952ee4850ef30a1aa91a1954f9ca3",
+                    "hash" : "0xddea2d5d953450ecfc7393fb0656719a321952ee4850ef30a1aa91a1954f9ca3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "ddea2d5d953450ecfc7393fb0656719a321952ee4850ef30a1aa91a1954f9ca3",
+                    "hash" : "0xddea2d5d953450ecfc7393fb0656719a321952ee4850ef30a1aa91a1954f9ca3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "107e59b480c51aee3de2ef291f40230e14bbdb45f3dba4bbe5c9c6477949f3fd",
+                    "hash" : "0x107e59b480c51aee3de2ef291f40230e14bbdb45f3dba4bbe5c9c6477949f3fd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "107e59b480c51aee3de2ef291f40230e14bbdb45f3dba4bbe5c9c6477949f3fd",
+                    "hash" : "0x107e59b480c51aee3de2ef291f40230e14bbdb45f3dba4bbe5c9c6477949f3fd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "ddea2d5d953450ecfc7393fb0656719a321952ee4850ef30a1aa91a1954f9ca3",
+                    "hash" : "0xddea2d5d953450ecfc7393fb0656719a321952ee4850ef30a1aa91a1954f9ca3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60006000600060006017730f572e5295c57f15886f9b263e2f6d2d6c7b5ec66103e8f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7faabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd6000527fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60206000a1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "210000"
+                "0x033450"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stLogTests/log1_emptyMem.json b/GeneralStateTests/stLogTests/log1_emptyMem.json
index f9d502d43..baecf00e4 100644
--- a/GeneralStateTests/stLogTests/log1_emptyMem.json
+++ b/GeneralStateTests/stLogTests/log1_emptyMem.json
@@ -1,17 +1,17 @@
 {
     "log1_emptyMem" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6ba43d6a0fb49c971e58d559d1e776d9df8568d5321a6e573d5afa3a51a051ab",
+                    "hash" : "0x6ba43d6a0fb49c971e58d559d1e776d9df8568d5321a6e573d5afa3a51a051ab",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6ba43d6a0fb49c971e58d559d1e776d9df8568d5321a6e573d5afa3a51a051ab",
+                    "hash" : "0x6ba43d6a0fb49c971e58d559d1e776d9df8568d5321a6e573d5afa3a51a051ab",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "7763779a96aac04ec88f7b6b1fb8678b2244b022db7b1480328fe991e81ae7fc",
+                    "hash" : "0x7763779a96aac04ec88f7b6b1fb8678b2244b022db7b1480328fe991e81ae7fc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "7763779a96aac04ec88f7b6b1fb8678b2244b022db7b1480328fe991e81ae7fc",
+                    "hash" : "0x7763779a96aac04ec88f7b6b1fb8678b2244b022db7b1480328fe991e81ae7fc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6ba43d6a0fb49c971e58d559d1e776d9df8568d5321a6e573d5afa3a51a051ab",
+                    "hash" : "0x6ba43d6a0fb49c971e58d559d1e776d9df8568d5321a6e573d5afa3a51a051ab",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60006000600060006017730f572e5295c57f15886f9b263e2f6d2d6c7b5ec66103e8f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x600060006000a1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "210000"
+                "0x033450"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stLogTests/log1_logMemStartTooHigh.json b/GeneralStateTests/stLogTests/log1_logMemStartTooHigh.json
index dd963c0ac..4c7092da1 100644
--- a/GeneralStateTests/stLogTests/log1_logMemStartTooHigh.json
+++ b/GeneralStateTests/stLogTests/log1_logMemStartTooHigh.json
@@ -1,17 +1,17 @@
 {
     "log1_logMemStartTooHigh" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d4f985ae6c37f19379b898c88d64b203594b6731dff5f797ce7b4c0a2de6cdaf",
+                    "hash" : "0xd4f985ae6c37f19379b898c88d64b203594b6731dff5f797ce7b4c0a2de6cdaf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d4f985ae6c37f19379b898c88d64b203594b6731dff5f797ce7b4c0a2de6cdaf",
+                    "hash" : "0xd4f985ae6c37f19379b898c88d64b203594b6731dff5f797ce7b4c0a2de6cdaf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "db8bbf58f6a8612eb8a850c2bdbeebc1ce5fa0246aa8140d345ded8f55559915",
+                    "hash" : "0xdb8bbf58f6a8612eb8a850c2bdbeebc1ce5fa0246aa8140d345ded8f55559915",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "db8bbf58f6a8612eb8a850c2bdbeebc1ce5fa0246aa8140d345ded8f55559915",
+                    "hash" : "0xdb8bbf58f6a8612eb8a850c2bdbeebc1ce5fa0246aa8140d345ded8f55559915",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d4f985ae6c37f19379b898c88d64b203594b6731dff5f797ce7b4c0a2de6cdaf",
+                    "hash" : "0xd4f985ae6c37f19379b898c88d64b203594b6731dff5f797ce7b4c0a2de6cdaf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60006000600060006017730f572e5295c57f15886f9b263e2f6d2d6c7b5ec66103e8f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7faabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd600052600060017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "210000"
+                "0x033450"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stLogTests/log1_logMemsizeTooHigh.json b/GeneralStateTests/stLogTests/log1_logMemsizeTooHigh.json
index 190311e64..e65bbdcc7 100644
--- a/GeneralStateTests/stLogTests/log1_logMemsizeTooHigh.json
+++ b/GeneralStateTests/stLogTests/log1_logMemsizeTooHigh.json
@@ -1,17 +1,17 @@
 {
     "log1_logMemsizeTooHigh" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7929bf41e374682e39f04cc072c499e114cb107c73fcf4f31e08fae243c03e4e",
+                    "hash" : "0x7929bf41e374682e39f04cc072c499e114cb107c73fcf4f31e08fae243c03e4e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7929bf41e374682e39f04cc072c499e114cb107c73fcf4f31e08fae243c03e4e",
+                    "hash" : "0x7929bf41e374682e39f04cc072c499e114cb107c73fcf4f31e08fae243c03e4e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "8c38cb58578bab9ab3231715e26e219f4f9875c133130f43f915f2e0aaacc505",
+                    "hash" : "0x8c38cb58578bab9ab3231715e26e219f4f9875c133130f43f915f2e0aaacc505",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "8c38cb58578bab9ab3231715e26e219f4f9875c133130f43f915f2e0aaacc505",
+                    "hash" : "0x8c38cb58578bab9ab3231715e26e219f4f9875c133130f43f915f2e0aaacc505",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7929bf41e374682e39f04cc072c499e114cb107c73fcf4f31e08fae243c03e4e",
+                    "hash" : "0x7929bf41e374682e39f04cc072c499e114cb107c73fcf4f31e08fae243c03e4e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60006000600060006017730f572e5295c57f15886f9b263e2f6d2d6c7b5ec66103e8f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7faabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd60005260007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001a1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "210000"
+                "0x033450"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stLogTests/log1_logMemsizeZero.json b/GeneralStateTests/stLogTests/log1_logMemsizeZero.json
index ccbde3d63..d7894630b 100644
--- a/GeneralStateTests/stLogTests/log1_logMemsizeZero.json
+++ b/GeneralStateTests/stLogTests/log1_logMemsizeZero.json
@@ -1,17 +1,17 @@
 {
     "log1_logMemsizeZero" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e26ec7cbe2b9c8be44570de917bf66d408da7396753eca2ff424c7c9525ba4fd",
+                    "hash" : "0xe26ec7cbe2b9c8be44570de917bf66d408da7396753eca2ff424c7c9525ba4fd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e26ec7cbe2b9c8be44570de917bf66d408da7396753eca2ff424c7c9525ba4fd",
+                    "hash" : "0xe26ec7cbe2b9c8be44570de917bf66d408da7396753eca2ff424c7c9525ba4fd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "77e4eb82ab5aa6f1405875a4e06a19ef516c45362c8e63c5aa503c909e28d3cf",
+                    "hash" : "0x77e4eb82ab5aa6f1405875a4e06a19ef516c45362c8e63c5aa503c909e28d3cf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "77e4eb82ab5aa6f1405875a4e06a19ef516c45362c8e63c5aa503c909e28d3cf",
+                    "hash" : "0x77e4eb82ab5aa6f1405875a4e06a19ef516c45362c8e63c5aa503c909e28d3cf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e26ec7cbe2b9c8be44570de917bf66d408da7396753eca2ff424c7c9525ba4fd",
+                    "hash" : "0xe26ec7cbe2b9c8be44570de917bf66d408da7396753eca2ff424c7c9525ba4fd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60006000600060006017730f572e5295c57f15886f9b263e2f6d2d6c7b5ec66103e8f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7faabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd600052600060006001a1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "210000"
+                "0x033450"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stLogTests/log1_nonEmptyMem.json b/GeneralStateTests/stLogTests/log1_nonEmptyMem.json
index f0e262eb1..324f66382 100644
--- a/GeneralStateTests/stLogTests/log1_nonEmptyMem.json
+++ b/GeneralStateTests/stLogTests/log1_nonEmptyMem.json
@@ -1,17 +1,17 @@
 {
     "log1_nonEmptyMem" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "8d085a84675a7c1faa1ba717f1b3538efb88847d2d59c4d0e18cacb6c82b19bc",
+                    "hash" : "0x8d085a84675a7c1faa1ba717f1b3538efb88847d2d59c4d0e18cacb6c82b19bc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "8d085a84675a7c1faa1ba717f1b3538efb88847d2d59c4d0e18cacb6c82b19bc",
+                    "hash" : "0x8d085a84675a7c1faa1ba717f1b3538efb88847d2d59c4d0e18cacb6c82b19bc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b67c50fb99df15cef50a230f584742d3cfc79da986a70aaf070be16716794682",
+                    "hash" : "0xb67c50fb99df15cef50a230f584742d3cfc79da986a70aaf070be16716794682",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b67c50fb99df15cef50a230f584742d3cfc79da986a70aaf070be16716794682",
+                    "hash" : "0xb67c50fb99df15cef50a230f584742d3cfc79da986a70aaf070be16716794682",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "8d085a84675a7c1faa1ba717f1b3538efb88847d2d59c4d0e18cacb6c82b19bc",
+                    "hash" : "0x8d085a84675a7c1faa1ba717f1b3538efb88847d2d59c4d0e18cacb6c82b19bc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60006000600060006017730f572e5295c57f15886f9b263e2f6d2d6c7b5ec66103e8f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff600052600060206000a1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "210000"
+                "0x033450"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stLogTests/log1_nonEmptyMem_logMemSize1.json b/GeneralStateTests/stLogTests/log1_nonEmptyMem_logMemSize1.json
index cfdba1388..b53b4e847 100644
--- a/GeneralStateTests/stLogTests/log1_nonEmptyMem_logMemSize1.json
+++ b/GeneralStateTests/stLogTests/log1_nonEmptyMem_logMemSize1.json
@@ -1,17 +1,17 @@
 {
     "log1_nonEmptyMem_logMemSize1" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a71c31def00561a82f2c48444612fba542fe77c766caa67d59844c791b8a8cd3",
+                    "hash" : "0xa71c31def00561a82f2c48444612fba542fe77c766caa67d59844c791b8a8cd3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a71c31def00561a82f2c48444612fba542fe77c766caa67d59844c791b8a8cd3",
+                    "hash" : "0xa71c31def00561a82f2c48444612fba542fe77c766caa67d59844c791b8a8cd3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5bd591632910d38fa6c86b668f061826861442d4c116b46830e11468658fb9d7",
+                    "hash" : "0x5bd591632910d38fa6c86b668f061826861442d4c116b46830e11468658fb9d7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5bd591632910d38fa6c86b668f061826861442d4c116b46830e11468658fb9d7",
+                    "hash" : "0x5bd591632910d38fa6c86b668f061826861442d4c116b46830e11468658fb9d7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a71c31def00561a82f2c48444612fba542fe77c766caa67d59844c791b8a8cd3",
+                    "hash" : "0xa71c31def00561a82f2c48444612fba542fe77c766caa67d59844c791b8a8cd3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60006000600060006017730f572e5295c57f15886f9b263e2f6d2d6c7b5ec66103e8f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7faabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd600052600060016000a1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "210000"
+                "0x033450"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stLogTests/log1_nonEmptyMem_logMemSize1_logMemStart31.json b/GeneralStateTests/stLogTests/log1_nonEmptyMem_logMemSize1_logMemStart31.json
index ba42a8ec3..8c7050780 100644
--- a/GeneralStateTests/stLogTests/log1_nonEmptyMem_logMemSize1_logMemStart31.json
+++ b/GeneralStateTests/stLogTests/log1_nonEmptyMem_logMemSize1_logMemStart31.json
@@ -1,17 +1,17 @@
 {
     "log1_nonEmptyMem_logMemSize1_logMemStart31" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "760505c7d3c4d3e9beebf91f05196918dce83b639cbc3d599e5324cf0c7645ab",
+                    "hash" : "0x760505c7d3c4d3e9beebf91f05196918dce83b639cbc3d599e5324cf0c7645ab",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "760505c7d3c4d3e9beebf91f05196918dce83b639cbc3d599e5324cf0c7645ab",
+                    "hash" : "0x760505c7d3c4d3e9beebf91f05196918dce83b639cbc3d599e5324cf0c7645ab",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "431a274e4c27c3088bff78d49caf8f217eb533f146aa00d10170338e14856e26",
+                    "hash" : "0x431a274e4c27c3088bff78d49caf8f217eb533f146aa00d10170338e14856e26",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "431a274e4c27c3088bff78d49caf8f217eb533f146aa00d10170338e14856e26",
+                    "hash" : "0x431a274e4c27c3088bff78d49caf8f217eb533f146aa00d10170338e14856e26",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "760505c7d3c4d3e9beebf91f05196918dce83b639cbc3d599e5324cf0c7645ab",
+                    "hash" : "0x760505c7d3c4d3e9beebf91f05196918dce83b639cbc3d599e5324cf0c7645ab",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60006000600060006017730f572e5295c57f15886f9b263e2f6d2d6c7b5ec66103e8f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7faabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd60005260006001601fa1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "210000"
+                "0x033450"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stLogTests/log2_Caller.json b/GeneralStateTests/stLogTests/log2_Caller.json
index fac2cfb51..f16956861 100644
--- a/GeneralStateTests/stLogTests/log2_Caller.json
+++ b/GeneralStateTests/stLogTests/log2_Caller.json
@@ -1,17 +1,17 @@
 {
     "log2_Caller" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7e77314d9c21b624029a2857aa917c27b2c212561189cf4962b99451da513e15",
+                    "hash" : "0x7e77314d9c21b624029a2857aa917c27b2c212561189cf4962b99451da513e15",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7e77314d9c21b624029a2857aa917c27b2c212561189cf4962b99451da513e15",
+                    "hash" : "0x7e77314d9c21b624029a2857aa917c27b2c212561189cf4962b99451da513e15",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6f7a609f52e0615b627c25dc9d41e32ff1743deb404c37af5341eb0be7883992",
+                    "hash" : "0x6f7a609f52e0615b627c25dc9d41e32ff1743deb404c37af5341eb0be7883992",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6f7a609f52e0615b627c25dc9d41e32ff1743deb404c37af5341eb0be7883992",
+                    "hash" : "0x6f7a609f52e0615b627c25dc9d41e32ff1743deb404c37af5341eb0be7883992",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7e77314d9c21b624029a2857aa917c27b2c212561189cf4962b99451da513e15",
+                    "hash" : "0x7e77314d9c21b624029a2857aa917c27b2c212561189cf4962b99451da513e15",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60006000600060006017730f572e5295c57f15886f9b263e2f6d2d6c7b5ec66103e8f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60ff60005333600060206000a2",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "210000"
+                "0x033450"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stLogTests/log2_MaxTopic.json b/GeneralStateTests/stLogTests/log2_MaxTopic.json
index ecf61f7cd..caef8425a 100644
--- a/GeneralStateTests/stLogTests/log2_MaxTopic.json
+++ b/GeneralStateTests/stLogTests/log2_MaxTopic.json
@@ -1,17 +1,17 @@
 {
     "log2_MaxTopic" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c49fe228084a51e8ac2bc4146c6f260198f9e30d1bc692ea827cbbb2699bbce8",
+                    "hash" : "0xc49fe228084a51e8ac2bc4146c6f260198f9e30d1bc692ea827cbbb2699bbce8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c49fe228084a51e8ac2bc4146c6f260198f9e30d1bc692ea827cbbb2699bbce8",
+                    "hash" : "0xc49fe228084a51e8ac2bc4146c6f260198f9e30d1bc692ea827cbbb2699bbce8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "380d5354e367a5c9d9145d8341296aa81c54413021f2f6f124d7455a218d1dae",
+                    "hash" : "0x380d5354e367a5c9d9145d8341296aa81c54413021f2f6f124d7455a218d1dae",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "380d5354e367a5c9d9145d8341296aa81c54413021f2f6f124d7455a218d1dae",
+                    "hash" : "0x380d5354e367a5c9d9145d8341296aa81c54413021f2f6f124d7455a218d1dae",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c49fe228084a51e8ac2bc4146c6f260198f9e30d1bc692ea827cbbb2699bbce8",
+                    "hash" : "0xc49fe228084a51e8ac2bc4146c6f260198f9e30d1bc692ea827cbbb2699bbce8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60006000600060006017730f572e5295c57f15886f9b263e2f6d2d6c7b5ec66103e8f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7faabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd6000527fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60206000a2",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "210000"
+                "0x033450"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stLogTests/log2_emptyMem.json b/GeneralStateTests/stLogTests/log2_emptyMem.json
index fcdd2673f..364ec160f 100644
--- a/GeneralStateTests/stLogTests/log2_emptyMem.json
+++ b/GeneralStateTests/stLogTests/log2_emptyMem.json
@@ -1,17 +1,17 @@
 {
     "log2_emptyMem" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "be1965f84fe22c58047fcc3de6ab5c885caeb4e7b79f7cda8af40702490889c2",
+                    "hash" : "0xbe1965f84fe22c58047fcc3de6ab5c885caeb4e7b79f7cda8af40702490889c2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "be1965f84fe22c58047fcc3de6ab5c885caeb4e7b79f7cda8af40702490889c2",
+                    "hash" : "0xbe1965f84fe22c58047fcc3de6ab5c885caeb4e7b79f7cda8af40702490889c2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "05b08fc68a3228b576e8abea32c375f112fe116d064de7e26f48a3104c438355",
+                    "hash" : "0x05b08fc68a3228b576e8abea32c375f112fe116d064de7e26f48a3104c438355",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "05b08fc68a3228b576e8abea32c375f112fe116d064de7e26f48a3104c438355",
+                    "hash" : "0x05b08fc68a3228b576e8abea32c375f112fe116d064de7e26f48a3104c438355",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "be1965f84fe22c58047fcc3de6ab5c885caeb4e7b79f7cda8af40702490889c2",
+                    "hash" : "0xbe1965f84fe22c58047fcc3de6ab5c885caeb4e7b79f7cda8af40702490889c2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60006000600060006017730f572e5295c57f15886f9b263e2f6d2d6c7b5ec66103e8f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6000600060006000a2",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "210000"
+                "0x033450"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stLogTests/log2_logMemStartTooHigh.json b/GeneralStateTests/stLogTests/log2_logMemStartTooHigh.json
index 11c406721..aa6ae1187 100644
--- a/GeneralStateTests/stLogTests/log2_logMemStartTooHigh.json
+++ b/GeneralStateTests/stLogTests/log2_logMemStartTooHigh.json
@@ -1,17 +1,17 @@
 {
     "log2_logMemStartTooHigh" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "0348697008fa377f8970876bffe5681737634d9bd5ee63bd9a71fe6f53f8f329",
+                    "hash" : "0x0348697008fa377f8970876bffe5681737634d9bd5ee63bd9a71fe6f53f8f329",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "0348697008fa377f8970876bffe5681737634d9bd5ee63bd9a71fe6f53f8f329",
+                    "hash" : "0x0348697008fa377f8970876bffe5681737634d9bd5ee63bd9a71fe6f53f8f329",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "aad2118f86e87a27abe1460c034f3292505eb123e64575daa66866fef2b86cbc",
+                    "hash" : "0xaad2118f86e87a27abe1460c034f3292505eb123e64575daa66866fef2b86cbc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "aad2118f86e87a27abe1460c034f3292505eb123e64575daa66866fef2b86cbc",
+                    "hash" : "0xaad2118f86e87a27abe1460c034f3292505eb123e64575daa66866fef2b86cbc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0348697008fa377f8970876bffe5681737634d9bd5ee63bd9a71fe6f53f8f329",
+                    "hash" : "0x0348697008fa377f8970876bffe5681737634d9bd5ee63bd9a71fe6f53f8f329",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60006000600060006017730f572e5295c57f15886f9b263e2f6d2d6c7b5ec66103e8f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7faabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd6000526000600060017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa2",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "210000"
+                "0x033450"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stLogTests/log2_logMemsizeTooHigh.json b/GeneralStateTests/stLogTests/log2_logMemsizeTooHigh.json
index fd574bc81..34e0ef5d0 100644
--- a/GeneralStateTests/stLogTests/log2_logMemsizeTooHigh.json
+++ b/GeneralStateTests/stLogTests/log2_logMemsizeTooHigh.json
@@ -1,17 +1,17 @@
 {
     "log2_logMemsizeTooHigh" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "8fcbada0bbd946552d914910d7d2767661b4511a3615c5b7eef80890bef846b4",
+                    "hash" : "0x8fcbada0bbd946552d914910d7d2767661b4511a3615c5b7eef80890bef846b4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "8fcbada0bbd946552d914910d7d2767661b4511a3615c5b7eef80890bef846b4",
+                    "hash" : "0x8fcbada0bbd946552d914910d7d2767661b4511a3615c5b7eef80890bef846b4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "1134e89136d8bcf8c649cdb41bb86e5c29a72a8edf87db291232b4fd706a6c5d",
+                    "hash" : "0x1134e89136d8bcf8c649cdb41bb86e5c29a72a8edf87db291232b4fd706a6c5d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "1134e89136d8bcf8c649cdb41bb86e5c29a72a8edf87db291232b4fd706a6c5d",
+                    "hash" : "0x1134e89136d8bcf8c649cdb41bb86e5c29a72a8edf87db291232b4fd706a6c5d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "8fcbada0bbd946552d914910d7d2767661b4511a3615c5b7eef80890bef846b4",
+                    "hash" : "0x8fcbada0bbd946552d914910d7d2767661b4511a3615c5b7eef80890bef846b4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60006000600060006017730f572e5295c57f15886f9b263e2f6d2d6c7b5ec66103e8f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7faabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd600052600060007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001a2",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "210000"
+                "0x033450"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stLogTests/log2_logMemsizeZero.json b/GeneralStateTests/stLogTests/log2_logMemsizeZero.json
index a1c084cce..1719cb3b1 100644
--- a/GeneralStateTests/stLogTests/log2_logMemsizeZero.json
+++ b/GeneralStateTests/stLogTests/log2_logMemsizeZero.json
@@ -1,17 +1,17 @@
 {
     "log2_logMemsizeZero" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7d4ba274ced13ae05e0c68433cba0e2b9862f20879c5792e67a06c15df4a0ec1",
+                    "hash" : "0x7d4ba274ced13ae05e0c68433cba0e2b9862f20879c5792e67a06c15df4a0ec1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7d4ba274ced13ae05e0c68433cba0e2b9862f20879c5792e67a06c15df4a0ec1",
+                    "hash" : "0x7d4ba274ced13ae05e0c68433cba0e2b9862f20879c5792e67a06c15df4a0ec1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "cfb147451db31049bc7f3e1404e88992662fab062cda2466cba633e691cd3d1e",
+                    "hash" : "0xcfb147451db31049bc7f3e1404e88992662fab062cda2466cba633e691cd3d1e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "cfb147451db31049bc7f3e1404e88992662fab062cda2466cba633e691cd3d1e",
+                    "hash" : "0xcfb147451db31049bc7f3e1404e88992662fab062cda2466cba633e691cd3d1e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7d4ba274ced13ae05e0c68433cba0e2b9862f20879c5792e67a06c15df4a0ec1",
+                    "hash" : "0x7d4ba274ced13ae05e0c68433cba0e2b9862f20879c5792e67a06c15df4a0ec1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60006000600060006017730f572e5295c57f15886f9b263e2f6d2d6c7b5ec66103e8f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7faabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd6000526000600060006001a2",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "210000"
+                "0x033450"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stLogTests/log2_nonEmptyMem.json b/GeneralStateTests/stLogTests/log2_nonEmptyMem.json
index d3a5d145e..7d8e52ce4 100644
--- a/GeneralStateTests/stLogTests/log2_nonEmptyMem.json
+++ b/GeneralStateTests/stLogTests/log2_nonEmptyMem.json
@@ -1,17 +1,17 @@
 {
     "log2_nonEmptyMem" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "8e3a46128a8072da9c5d358f39e67ed7fbe5c1579396bd133c71fa4fdae274c1",
+                    "hash" : "0x8e3a46128a8072da9c5d358f39e67ed7fbe5c1579396bd133c71fa4fdae274c1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "8e3a46128a8072da9c5d358f39e67ed7fbe5c1579396bd133c71fa4fdae274c1",
+                    "hash" : "0x8e3a46128a8072da9c5d358f39e67ed7fbe5c1579396bd133c71fa4fdae274c1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "7b21aa96b6c64f14bc7bc0489230f23587a1ce40192bad7a7c6e1f8037053405",
+                    "hash" : "0x7b21aa96b6c64f14bc7bc0489230f23587a1ce40192bad7a7c6e1f8037053405",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "7b21aa96b6c64f14bc7bc0489230f23587a1ce40192bad7a7c6e1f8037053405",
+                    "hash" : "0x7b21aa96b6c64f14bc7bc0489230f23587a1ce40192bad7a7c6e1f8037053405",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "8e3a46128a8072da9c5d358f39e67ed7fbe5c1579396bd133c71fa4fdae274c1",
+                    "hash" : "0x8e3a46128a8072da9c5d358f39e67ed7fbe5c1579396bd133c71fa4fdae274c1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60006000600060006017730f572e5295c57f15886f9b263e2f6d2d6c7b5ec66103e8f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526000600060206000a2",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "210000"
+                "0x033450"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stLogTests/log2_nonEmptyMem_logMemSize1.json b/GeneralStateTests/stLogTests/log2_nonEmptyMem_logMemSize1.json
index 3a6dab8c6..cd9a7ae43 100644
--- a/GeneralStateTests/stLogTests/log2_nonEmptyMem_logMemSize1.json
+++ b/GeneralStateTests/stLogTests/log2_nonEmptyMem_logMemSize1.json
@@ -1,17 +1,17 @@
 {
     "log2_nonEmptyMem_logMemSize1" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "2374f9e6457745fde99fb9b5dbe1551ef75b16042d8cffebdb305a2f85672488",
+                    "hash" : "0x2374f9e6457745fde99fb9b5dbe1551ef75b16042d8cffebdb305a2f85672488",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "2374f9e6457745fde99fb9b5dbe1551ef75b16042d8cffebdb305a2f85672488",
+                    "hash" : "0x2374f9e6457745fde99fb9b5dbe1551ef75b16042d8cffebdb305a2f85672488",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6b1f8d1b37517af7152a79ed17bd0376825cb8b961bea5f347e9fb90f263d4ba",
+                    "hash" : "0x6b1f8d1b37517af7152a79ed17bd0376825cb8b961bea5f347e9fb90f263d4ba",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6b1f8d1b37517af7152a79ed17bd0376825cb8b961bea5f347e9fb90f263d4ba",
+                    "hash" : "0x6b1f8d1b37517af7152a79ed17bd0376825cb8b961bea5f347e9fb90f263d4ba",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "2374f9e6457745fde99fb9b5dbe1551ef75b16042d8cffebdb305a2f85672488",
+                    "hash" : "0x2374f9e6457745fde99fb9b5dbe1551ef75b16042d8cffebdb305a2f85672488",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60006000600060006017730f572e5295c57f15886f9b263e2f6d2d6c7b5ec66103e8f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7faabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd6000526000600060016000a2",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "210000"
+                "0x033450"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stLogTests/log2_nonEmptyMem_logMemSize1_logMemStart31.json b/GeneralStateTests/stLogTests/log2_nonEmptyMem_logMemSize1_logMemStart31.json
index 6f8866d10..ca1f49dbc 100644
--- a/GeneralStateTests/stLogTests/log2_nonEmptyMem_logMemSize1_logMemStart31.json
+++ b/GeneralStateTests/stLogTests/log2_nonEmptyMem_logMemSize1_logMemStart31.json
@@ -1,17 +1,17 @@
 {
     "log2_nonEmptyMem_logMemSize1_logMemStart31" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6d2aaf2d52f1a7762da37bbe2b2f181045bdc9839e8feba7c5b8aa019f57afc9",
+                    "hash" : "0x6d2aaf2d52f1a7762da37bbe2b2f181045bdc9839e8feba7c5b8aa019f57afc9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6d2aaf2d52f1a7762da37bbe2b2f181045bdc9839e8feba7c5b8aa019f57afc9",
+                    "hash" : "0x6d2aaf2d52f1a7762da37bbe2b2f181045bdc9839e8feba7c5b8aa019f57afc9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a5e5e455050c74632c6107634776dc94c85ee214e3cd6b9716004ea294c7167f",
+                    "hash" : "0xa5e5e455050c74632c6107634776dc94c85ee214e3cd6b9716004ea294c7167f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a5e5e455050c74632c6107634776dc94c85ee214e3cd6b9716004ea294c7167f",
+                    "hash" : "0xa5e5e455050c74632c6107634776dc94c85ee214e3cd6b9716004ea294c7167f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6d2aaf2d52f1a7762da37bbe2b2f181045bdc9839e8feba7c5b8aa019f57afc9",
+                    "hash" : "0x6d2aaf2d52f1a7762da37bbe2b2f181045bdc9839e8feba7c5b8aa019f57afc9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60006000600060006017730f572e5295c57f15886f9b263e2f6d2d6c7b5ec66103e8f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7faabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd600052600060006001601fa2",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "210000"
+                "0x033450"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stLogTests/log3_Caller.json b/GeneralStateTests/stLogTests/log3_Caller.json
index 7c4402fb7..3d6e0a24d 100644
--- a/GeneralStateTests/stLogTests/log3_Caller.json
+++ b/GeneralStateTests/stLogTests/log3_Caller.json
@@ -1,17 +1,17 @@
 {
     "log3_Caller" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "714f6ceefb919f48a4d2c0b10e66e42c2e1e28a57239e88172df912a3f5d0951",
+                    "hash" : "0x714f6ceefb919f48a4d2c0b10e66e42c2e1e28a57239e88172df912a3f5d0951",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "714f6ceefb919f48a4d2c0b10e66e42c2e1e28a57239e88172df912a3f5d0951",
+                    "hash" : "0x714f6ceefb919f48a4d2c0b10e66e42c2e1e28a57239e88172df912a3f5d0951",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e9dc88b8b3ad1f3336c883cabc27a5b8219154a3c231d389889eb51c409ee294",
+                    "hash" : "0xe9dc88b8b3ad1f3336c883cabc27a5b8219154a3c231d389889eb51c409ee294",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e9dc88b8b3ad1f3336c883cabc27a5b8219154a3c231d389889eb51c409ee294",
+                    "hash" : "0xe9dc88b8b3ad1f3336c883cabc27a5b8219154a3c231d389889eb51c409ee294",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "714f6ceefb919f48a4d2c0b10e66e42c2e1e28a57239e88172df912a3f5d0951",
+                    "hash" : "0x714f6ceefb919f48a4d2c0b10e66e42c2e1e28a57239e88172df912a3f5d0951",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60006000600060006017730f572e5295c57f15886f9b263e2f6d2d6c7b5ec66103e8f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60ff600053336000600060206000a3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "210000"
+                "0x033450"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stLogTests/log3_MaxTopic.json b/GeneralStateTests/stLogTests/log3_MaxTopic.json
index a857cc191..d0591f7df 100644
--- a/GeneralStateTests/stLogTests/log3_MaxTopic.json
+++ b/GeneralStateTests/stLogTests/log3_MaxTopic.json
@@ -1,17 +1,17 @@
 {
     "log3_MaxTopic" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "75f5f8982d16bf45265bda67c39a4f736fd6946237716dcdc502d40cbf6289e8",
+                    "hash" : "0x75f5f8982d16bf45265bda67c39a4f736fd6946237716dcdc502d40cbf6289e8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "75f5f8982d16bf45265bda67c39a4f736fd6946237716dcdc502d40cbf6289e8",
+                    "hash" : "0x75f5f8982d16bf45265bda67c39a4f736fd6946237716dcdc502d40cbf6289e8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "479c6506375645e6e64ea7787a020b909ce7549662a593d707967ec2ef310d0c",
+                    "hash" : "0x479c6506375645e6e64ea7787a020b909ce7549662a593d707967ec2ef310d0c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "479c6506375645e6e64ea7787a020b909ce7549662a593d707967ec2ef310d0c",
+                    "hash" : "0x479c6506375645e6e64ea7787a020b909ce7549662a593d707967ec2ef310d0c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "75f5f8982d16bf45265bda67c39a4f736fd6946237716dcdc502d40cbf6289e8",
+                    "hash" : "0x75f5f8982d16bf45265bda67c39a4f736fd6946237716dcdc502d40cbf6289e8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60006000600060006017730f572e5295c57f15886f9b263e2f6d2d6c7b5ec66103e8f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7faabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd6000527fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60206000a3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "210000"
+                "0x033450"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stLogTests/log3_PC.json b/GeneralStateTests/stLogTests/log3_PC.json
index 37b6c4310..b13e495a3 100644
--- a/GeneralStateTests/stLogTests/log3_PC.json
+++ b/GeneralStateTests/stLogTests/log3_PC.json
@@ -1,17 +1,17 @@
 {
     "log3_PC" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "cf69e00ed46c274cebd4031c9bca25bc3b3c099bb5be08b0f1facf5b57d5c130",
+                    "hash" : "0xcf69e00ed46c274cebd4031c9bca25bc3b3c099bb5be08b0f1facf5b57d5c130",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "cf69e00ed46c274cebd4031c9bca25bc3b3c099bb5be08b0f1facf5b57d5c130",
+                    "hash" : "0xcf69e00ed46c274cebd4031c9bca25bc3b3c099bb5be08b0f1facf5b57d5c130",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f9d0091c9074344a842e07ae89da3855e0a52403bbee72e13f4340bd183d1c77",
+                    "hash" : "0xf9d0091c9074344a842e07ae89da3855e0a52403bbee72e13f4340bd183d1c77",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f9d0091c9074344a842e07ae89da3855e0a52403bbee72e13f4340bd183d1c77",
+                    "hash" : "0xf9d0091c9074344a842e07ae89da3855e0a52403bbee72e13f4340bd183d1c77",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "cf69e00ed46c274cebd4031c9bca25bc3b3c099bb5be08b0f1facf5b57d5c130",
+                    "hash" : "0xcf69e00ed46c274cebd4031c9bca25bc3b3c099bb5be08b0f1facf5b57d5c130",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60006000600060006017730f572e5295c57f15886f9b263e2f6d2d6c7b5ec66103e8f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60ff60005358585860206000a3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "210000"
+                "0x033450"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stLogTests/log3_emptyMem.json b/GeneralStateTests/stLogTests/log3_emptyMem.json
index 6be5ac725..f914693d4 100644
--- a/GeneralStateTests/stLogTests/log3_emptyMem.json
+++ b/GeneralStateTests/stLogTests/log3_emptyMem.json
@@ -1,17 +1,17 @@
 {
     "log3_emptyMem" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9e0e9602fe6b036ad91002bafc852d4c2dd7b6cd9b37218fc2f7a8e21e9dfcbf",
+                    "hash" : "0x9e0e9602fe6b036ad91002bafc852d4c2dd7b6cd9b37218fc2f7a8e21e9dfcbf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9e0e9602fe6b036ad91002bafc852d4c2dd7b6cd9b37218fc2f7a8e21e9dfcbf",
+                    "hash" : "0x9e0e9602fe6b036ad91002bafc852d4c2dd7b6cd9b37218fc2f7a8e21e9dfcbf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "86d9c3ac4abb070ae19b49f249237cec3d50b2d6a65325e0564ce0064059f18c",
+                    "hash" : "0x86d9c3ac4abb070ae19b49f249237cec3d50b2d6a65325e0564ce0064059f18c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "86d9c3ac4abb070ae19b49f249237cec3d50b2d6a65325e0564ce0064059f18c",
+                    "hash" : "0x86d9c3ac4abb070ae19b49f249237cec3d50b2d6a65325e0564ce0064059f18c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9e0e9602fe6b036ad91002bafc852d4c2dd7b6cd9b37218fc2f7a8e21e9dfcbf",
+                    "hash" : "0x9e0e9602fe6b036ad91002bafc852d4c2dd7b6cd9b37218fc2f7a8e21e9dfcbf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60006000600060006017730f572e5295c57f15886f9b263e2f6d2d6c7b5ec66103e8f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60006000600060006000a3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "210000"
+                "0x033450"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stLogTests/log3_logMemStartTooHigh.json b/GeneralStateTests/stLogTests/log3_logMemStartTooHigh.json
index e8bbe61c6..28105a754 100644
--- a/GeneralStateTests/stLogTests/log3_logMemStartTooHigh.json
+++ b/GeneralStateTests/stLogTests/log3_logMemStartTooHigh.json
@@ -1,17 +1,17 @@
 {
     "log3_logMemStartTooHigh" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "ca5738f4b917b4b46d071b9e2fe3e3813f82d1f2534eed53ab215f3d347e9bc7",
+                    "hash" : "0xca5738f4b917b4b46d071b9e2fe3e3813f82d1f2534eed53ab215f3d347e9bc7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "ca5738f4b917b4b46d071b9e2fe3e3813f82d1f2534eed53ab215f3d347e9bc7",
+                    "hash" : "0xca5738f4b917b4b46d071b9e2fe3e3813f82d1f2534eed53ab215f3d347e9bc7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "0b2339d3e50474d3bd343623a4331622b3c9f14175d86fbbd48b0607bc8f2513",
+                    "hash" : "0x0b2339d3e50474d3bd343623a4331622b3c9f14175d86fbbd48b0607bc8f2513",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "0b2339d3e50474d3bd343623a4331622b3c9f14175d86fbbd48b0607bc8f2513",
+                    "hash" : "0x0b2339d3e50474d3bd343623a4331622b3c9f14175d86fbbd48b0607bc8f2513",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "ca5738f4b917b4b46d071b9e2fe3e3813f82d1f2534eed53ab215f3d347e9bc7",
+                    "hash" : "0xca5738f4b917b4b46d071b9e2fe3e3813f82d1f2534eed53ab215f3d347e9bc7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60006000600060006017730f572e5295c57f15886f9b263e2f6d2d6c7b5ec66103e8f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7faabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd60005260006000600060017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "210000"
+                "0x033450"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stLogTests/log3_logMemsizeTooHigh.json b/GeneralStateTests/stLogTests/log3_logMemsizeTooHigh.json
index 759b66be9..6c798f30d 100644
--- a/GeneralStateTests/stLogTests/log3_logMemsizeTooHigh.json
+++ b/GeneralStateTests/stLogTests/log3_logMemsizeTooHigh.json
@@ -1,17 +1,17 @@
 {
     "log3_logMemsizeTooHigh" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7f32b32b06efd9433f63d0bd45c7e5d78dc2987c8e25de39f628dc07102fef1c",
+                    "hash" : "0x7f32b32b06efd9433f63d0bd45c7e5d78dc2987c8e25de39f628dc07102fef1c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7f32b32b06efd9433f63d0bd45c7e5d78dc2987c8e25de39f628dc07102fef1c",
+                    "hash" : "0x7f32b32b06efd9433f63d0bd45c7e5d78dc2987c8e25de39f628dc07102fef1c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "efe92cb9472d77ffe5702d9bcd99ad9736fa3ba7992747eb64b06e0be2fb96b8",
+                    "hash" : "0xefe92cb9472d77ffe5702d9bcd99ad9736fa3ba7992747eb64b06e0be2fb96b8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "efe92cb9472d77ffe5702d9bcd99ad9736fa3ba7992747eb64b06e0be2fb96b8",
+                    "hash" : "0xefe92cb9472d77ffe5702d9bcd99ad9736fa3ba7992747eb64b06e0be2fb96b8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7f32b32b06efd9433f63d0bd45c7e5d78dc2987c8e25de39f628dc07102fef1c",
+                    "hash" : "0x7f32b32b06efd9433f63d0bd45c7e5d78dc2987c8e25de39f628dc07102fef1c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60006000600060006017730f572e5295c57f15886f9b263e2f6d2d6c7b5ec66103e8f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7faabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd6000526000600060007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001a3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "210000"
+                "0x033450"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stLogTests/log3_logMemsizeZero.json b/GeneralStateTests/stLogTests/log3_logMemsizeZero.json
index 0a5df67db..fd1f239c6 100644
--- a/GeneralStateTests/stLogTests/log3_logMemsizeZero.json
+++ b/GeneralStateTests/stLogTests/log3_logMemsizeZero.json
@@ -1,17 +1,17 @@
 {
     "log3_logMemsizeZero" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9f8f5804453dab6db1a8608b8ea4c1c1b70ddc9de6cd5749d4a758314bc1ea6b",
+                    "hash" : "0x9f8f5804453dab6db1a8608b8ea4c1c1b70ddc9de6cd5749d4a758314bc1ea6b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9f8f5804453dab6db1a8608b8ea4c1c1b70ddc9de6cd5749d4a758314bc1ea6b",
+                    "hash" : "0x9f8f5804453dab6db1a8608b8ea4c1c1b70ddc9de6cd5749d4a758314bc1ea6b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "bed679e39c69931838b71a5e4aa7cc8452170b3a3376b6204cb3cc30a3280d34",
+                    "hash" : "0xbed679e39c69931838b71a5e4aa7cc8452170b3a3376b6204cb3cc30a3280d34",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "bed679e39c69931838b71a5e4aa7cc8452170b3a3376b6204cb3cc30a3280d34",
+                    "hash" : "0xbed679e39c69931838b71a5e4aa7cc8452170b3a3376b6204cb3cc30a3280d34",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9f8f5804453dab6db1a8608b8ea4c1c1b70ddc9de6cd5749d4a758314bc1ea6b",
+                    "hash" : "0x9f8f5804453dab6db1a8608b8ea4c1c1b70ddc9de6cd5749d4a758314bc1ea6b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60006000600060006017730f572e5295c57f15886f9b263e2f6d2d6c7b5ec66103e8f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7faabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd60005260006000600060006001a3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "210000"
+                "0x033450"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stLogTests/log3_nonEmptyMem.json b/GeneralStateTests/stLogTests/log3_nonEmptyMem.json
index 3bc8ccc8c..8e02655ba 100644
--- a/GeneralStateTests/stLogTests/log3_nonEmptyMem.json
+++ b/GeneralStateTests/stLogTests/log3_nonEmptyMem.json
@@ -1,17 +1,17 @@
 {
     "log3_nonEmptyMem" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "fcbc865306fdc8cd726651d9d8bfd13d82e53695f1a8b1b1560c23759bb5f07e",
+                    "hash" : "0xfcbc865306fdc8cd726651d9d8bfd13d82e53695f1a8b1b1560c23759bb5f07e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "fcbc865306fdc8cd726651d9d8bfd13d82e53695f1a8b1b1560c23759bb5f07e",
+                    "hash" : "0xfcbc865306fdc8cd726651d9d8bfd13d82e53695f1a8b1b1560c23759bb5f07e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4d232efa9b709e619484527564f3c404b32ac50ebbe73933afcd78ad8b241f48",
+                    "hash" : "0x4d232efa9b709e619484527564f3c404b32ac50ebbe73933afcd78ad8b241f48",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4d232efa9b709e619484527564f3c404b32ac50ebbe73933afcd78ad8b241f48",
+                    "hash" : "0x4d232efa9b709e619484527564f3c404b32ac50ebbe73933afcd78ad8b241f48",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "fcbc865306fdc8cd726651d9d8bfd13d82e53695f1a8b1b1560c23759bb5f07e",
+                    "hash" : "0xfcbc865306fdc8cd726651d9d8bfd13d82e53695f1a8b1b1560c23759bb5f07e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60006000600060006017730f572e5295c57f15886f9b263e2f6d2d6c7b5ec66103e8f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260006000600060206000a3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "210000"
+                "0x033450"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stLogTests/log3_nonEmptyMem_logMemSize1.json b/GeneralStateTests/stLogTests/log3_nonEmptyMem_logMemSize1.json
index 29a7608c4..347a6a598 100644
--- a/GeneralStateTests/stLogTests/log3_nonEmptyMem_logMemSize1.json
+++ b/GeneralStateTests/stLogTests/log3_nonEmptyMem_logMemSize1.json
@@ -1,17 +1,17 @@
 {
     "log3_nonEmptyMem_logMemSize1" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1cfe34dd268dc981f3d3a3720d56cd08704d413bf6264dcce2b3cbaba6e93dc9",
+                    "hash" : "0x1cfe34dd268dc981f3d3a3720d56cd08704d413bf6264dcce2b3cbaba6e93dc9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "1cfe34dd268dc981f3d3a3720d56cd08704d413bf6264dcce2b3cbaba6e93dc9",
+                    "hash" : "0x1cfe34dd268dc981f3d3a3720d56cd08704d413bf6264dcce2b3cbaba6e93dc9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3f663dbf8a1adfd84258b01250c5211b2a3aab845ce806c00027261c486acf8b",
+                    "hash" : "0x3f663dbf8a1adfd84258b01250c5211b2a3aab845ce806c00027261c486acf8b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3f663dbf8a1adfd84258b01250c5211b2a3aab845ce806c00027261c486acf8b",
+                    "hash" : "0x3f663dbf8a1adfd84258b01250c5211b2a3aab845ce806c00027261c486acf8b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "1cfe34dd268dc981f3d3a3720d56cd08704d413bf6264dcce2b3cbaba6e93dc9",
+                    "hash" : "0x1cfe34dd268dc981f3d3a3720d56cd08704d413bf6264dcce2b3cbaba6e93dc9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60006000600060006017730f572e5295c57f15886f9b263e2f6d2d6c7b5ec66103e8f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7faabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd60005260006000600060016000a3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "210000"
+                "0x033450"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stLogTests/log3_nonEmptyMem_logMemSize1_logMemStart31.json b/GeneralStateTests/stLogTests/log3_nonEmptyMem_logMemSize1_logMemStart31.json
index 63d2456bf..81c0f5795 100644
--- a/GeneralStateTests/stLogTests/log3_nonEmptyMem_logMemSize1_logMemStart31.json
+++ b/GeneralStateTests/stLogTests/log3_nonEmptyMem_logMemSize1_logMemStart31.json
@@ -1,17 +1,17 @@
 {
     "log3_nonEmptyMem_logMemSize1_logMemStart31" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "cf956932d096a8508c2860b6f9707ae5dfdfd7f46c71e7a88b2073c9b8f98cc3",
+                    "hash" : "0xcf956932d096a8508c2860b6f9707ae5dfdfd7f46c71e7a88b2073c9b8f98cc3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "cf956932d096a8508c2860b6f9707ae5dfdfd7f46c71e7a88b2073c9b8f98cc3",
+                    "hash" : "0xcf956932d096a8508c2860b6f9707ae5dfdfd7f46c71e7a88b2073c9b8f98cc3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "00c02c3b441e01adcbe9e5e2c4083b63755c3db362a7151ddace19884d59bc9f",
+                    "hash" : "0x00c02c3b441e01adcbe9e5e2c4083b63755c3db362a7151ddace19884d59bc9f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "00c02c3b441e01adcbe9e5e2c4083b63755c3db362a7151ddace19884d59bc9f",
+                    "hash" : "0x00c02c3b441e01adcbe9e5e2c4083b63755c3db362a7151ddace19884d59bc9f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "cf956932d096a8508c2860b6f9707ae5dfdfd7f46c71e7a88b2073c9b8f98cc3",
+                    "hash" : "0xcf956932d096a8508c2860b6f9707ae5dfdfd7f46c71e7a88b2073c9b8f98cc3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60006000600060006017730f572e5295c57f15886f9b263e2f6d2d6c7b5ec66103e8f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7faabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd6000526000600060006001601fa3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "210000"
+                "0x033450"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stLogTests/log4_Caller.json b/GeneralStateTests/stLogTests/log4_Caller.json
index dcecdd3c9..a3db336d9 100644
--- a/GeneralStateTests/stLogTests/log4_Caller.json
+++ b/GeneralStateTests/stLogTests/log4_Caller.json
@@ -1,17 +1,17 @@
 {
     "log4_Caller" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "046aa4968a8cfb27016bbf96813794e68a16320ad9a328fa677237eaf6877e10",
+                    "hash" : "0x046aa4968a8cfb27016bbf96813794e68a16320ad9a328fa677237eaf6877e10",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "046aa4968a8cfb27016bbf96813794e68a16320ad9a328fa677237eaf6877e10",
+                    "hash" : "0x046aa4968a8cfb27016bbf96813794e68a16320ad9a328fa677237eaf6877e10",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "924029c6de9f6b7b59a95c13205b6b835ea27b685bbf249afb81de2bb6e32d22",
+                    "hash" : "0x924029c6de9f6b7b59a95c13205b6b835ea27b685bbf249afb81de2bb6e32d22",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "924029c6de9f6b7b59a95c13205b6b835ea27b685bbf249afb81de2bb6e32d22",
+                    "hash" : "0x924029c6de9f6b7b59a95c13205b6b835ea27b685bbf249afb81de2bb6e32d22",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "046aa4968a8cfb27016bbf96813794e68a16320ad9a328fa677237eaf6877e10",
+                    "hash" : "0x046aa4968a8cfb27016bbf96813794e68a16320ad9a328fa677237eaf6877e10",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60006000600060006017730f572e5295c57f15886f9b263e2f6d2d6c7b5ec66103e8f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60ff6000533360006000600060206000a4",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "210000"
+                "0x033450"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stLogTests/log4_MaxTopic.json b/GeneralStateTests/stLogTests/log4_MaxTopic.json
index b939e2d55..a23ad77eb 100644
--- a/GeneralStateTests/stLogTests/log4_MaxTopic.json
+++ b/GeneralStateTests/stLogTests/log4_MaxTopic.json
@@ -1,17 +1,17 @@
 {
     "log4_MaxTopic" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "600099af52739a6ba01fe896f1dbf815bb835a80397b57c146a806d23f5396be",
+                    "hash" : "0x600099af52739a6ba01fe896f1dbf815bb835a80397b57c146a806d23f5396be",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "600099af52739a6ba01fe896f1dbf815bb835a80397b57c146a806d23f5396be",
+                    "hash" : "0x600099af52739a6ba01fe896f1dbf815bb835a80397b57c146a806d23f5396be",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "ae442730cca96fe7eb0b68aebee181a1f3ff3ce8cb4cdf20193ff9414ef68418",
+                    "hash" : "0xae442730cca96fe7eb0b68aebee181a1f3ff3ce8cb4cdf20193ff9414ef68418",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ae442730cca96fe7eb0b68aebee181a1f3ff3ce8cb4cdf20193ff9414ef68418",
+                    "hash" : "0xae442730cca96fe7eb0b68aebee181a1f3ff3ce8cb4cdf20193ff9414ef68418",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "600099af52739a6ba01fe896f1dbf815bb835a80397b57c146a806d23f5396be",
+                    "hash" : "0x600099af52739a6ba01fe896f1dbf815bb835a80397b57c146a806d23f5396be",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60006000600060006017730f572e5295c57f15886f9b263e2f6d2d6c7b5ec66103e8f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7faabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd6000527fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60206000a4",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "210000"
+                "0x033450"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stLogTests/log4_PC.json b/GeneralStateTests/stLogTests/log4_PC.json
index 5d0022e26..5035e7c7b 100644
--- a/GeneralStateTests/stLogTests/log4_PC.json
+++ b/GeneralStateTests/stLogTests/log4_PC.json
@@ -1,17 +1,17 @@
 {
     "log4_PC" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "4021647fb7e0128609e6e10111def7f6c93f6709c6aad0396d1bb6934167746a",
+                    "hash" : "0x4021647fb7e0128609e6e10111def7f6c93f6709c6aad0396d1bb6934167746a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "4021647fb7e0128609e6e10111def7f6c93f6709c6aad0396d1bb6934167746a",
+                    "hash" : "0x4021647fb7e0128609e6e10111def7f6c93f6709c6aad0396d1bb6934167746a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "821b12dad8d27576f1457fd8b265afcaff6622650275e4471df40b7dd080ff74",
+                    "hash" : "0x821b12dad8d27576f1457fd8b265afcaff6622650275e4471df40b7dd080ff74",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "821b12dad8d27576f1457fd8b265afcaff6622650275e4471df40b7dd080ff74",
+                    "hash" : "0x821b12dad8d27576f1457fd8b265afcaff6622650275e4471df40b7dd080ff74",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "4021647fb7e0128609e6e10111def7f6c93f6709c6aad0396d1bb6934167746a",
+                    "hash" : "0x4021647fb7e0128609e6e10111def7f6c93f6709c6aad0396d1bb6934167746a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60006000600060006017730f572e5295c57f15886f9b263e2f6d2d6c7b5ec66103e8f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60ff6000535858585860206000a4",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "210000"
+                "0x033450"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stLogTests/log4_emptyMem.json b/GeneralStateTests/stLogTests/log4_emptyMem.json
index ad556d2b2..e910843b0 100644
--- a/GeneralStateTests/stLogTests/log4_emptyMem.json
+++ b/GeneralStateTests/stLogTests/log4_emptyMem.json
@@ -1,17 +1,17 @@
 {
     "log4_emptyMem" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "656d3ea57ad49a1a44fd455a1a9b46bf4568cb1981eb27f639561af4e240885c",
+                    "hash" : "0x656d3ea57ad49a1a44fd455a1a9b46bf4568cb1981eb27f639561af4e240885c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "656d3ea57ad49a1a44fd455a1a9b46bf4568cb1981eb27f639561af4e240885c",
+                    "hash" : "0x656d3ea57ad49a1a44fd455a1a9b46bf4568cb1981eb27f639561af4e240885c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "d74cc4c5e28da1430d7c6995c36a78148c2fa556000c2813b18481357a12b141",
+                    "hash" : "0xd74cc4c5e28da1430d7c6995c36a78148c2fa556000c2813b18481357a12b141",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "d74cc4c5e28da1430d7c6995c36a78148c2fa556000c2813b18481357a12b141",
+                    "hash" : "0xd74cc4c5e28da1430d7c6995c36a78148c2fa556000c2813b18481357a12b141",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "656d3ea57ad49a1a44fd455a1a9b46bf4568cb1981eb27f639561af4e240885c",
+                    "hash" : "0x656d3ea57ad49a1a44fd455a1a9b46bf4568cb1981eb27f639561af4e240885c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60006000600060006017730f572e5295c57f15886f9b263e2f6d2d6c7b5ec66103e8f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x600060006000600060006000a4",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "210000"
+                "0x033450"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stLogTests/log4_logMemStartTooHigh.json b/GeneralStateTests/stLogTests/log4_logMemStartTooHigh.json
index 98e6526a9..75bc86e27 100644
--- a/GeneralStateTests/stLogTests/log4_logMemStartTooHigh.json
+++ b/GeneralStateTests/stLogTests/log4_logMemStartTooHigh.json
@@ -1,17 +1,17 @@
 {
     "log4_logMemStartTooHigh" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "97e1497892dad551259b6b1e7fc0bed316f7f93bd9581db39015d6e20b5729b9",
+                    "hash" : "0x97e1497892dad551259b6b1e7fc0bed316f7f93bd9581db39015d6e20b5729b9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "97e1497892dad551259b6b1e7fc0bed316f7f93bd9581db39015d6e20b5729b9",
+                    "hash" : "0x97e1497892dad551259b6b1e7fc0bed316f7f93bd9581db39015d6e20b5729b9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "49a5a4f20c98bcc0609c45c48cb942b5f0de00882e5f0988b7853c7268547f4f",
+                    "hash" : "0x49a5a4f20c98bcc0609c45c48cb942b5f0de00882e5f0988b7853c7268547f4f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "49a5a4f20c98bcc0609c45c48cb942b5f0de00882e5f0988b7853c7268547f4f",
+                    "hash" : "0x49a5a4f20c98bcc0609c45c48cb942b5f0de00882e5f0988b7853c7268547f4f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "97e1497892dad551259b6b1e7fc0bed316f7f93bd9581db39015d6e20b5729b9",
+                    "hash" : "0x97e1497892dad551259b6b1e7fc0bed316f7f93bd9581db39015d6e20b5729b9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60006000600060006017730f572e5295c57f15886f9b263e2f6d2d6c7b5ec66103e8f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7faabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd600052600060006000600060017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa4",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "210000"
+                "0x033450"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stLogTests/log4_logMemsizeTooHigh.json b/GeneralStateTests/stLogTests/log4_logMemsizeTooHigh.json
index 15f836253..b5ef526d7 100644
--- a/GeneralStateTests/stLogTests/log4_logMemsizeTooHigh.json
+++ b/GeneralStateTests/stLogTests/log4_logMemsizeTooHigh.json
@@ -1,17 +1,17 @@
 {
     "log4_logMemsizeTooHigh" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "2a661367187bf31f5934e92024b253b8d9b17dbafc859e9ae513156c6870e72f",
+                    "hash" : "0x2a661367187bf31f5934e92024b253b8d9b17dbafc859e9ae513156c6870e72f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "2a661367187bf31f5934e92024b253b8d9b17dbafc859e9ae513156c6870e72f",
+                    "hash" : "0x2a661367187bf31f5934e92024b253b8d9b17dbafc859e9ae513156c6870e72f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6cdceaada2920deb32d534a6adc30f0cb2c1fe10002d1002a0739ca9d63fc632",
+                    "hash" : "0x6cdceaada2920deb32d534a6adc30f0cb2c1fe10002d1002a0739ca9d63fc632",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6cdceaada2920deb32d534a6adc30f0cb2c1fe10002d1002a0739ca9d63fc632",
+                    "hash" : "0x6cdceaada2920deb32d534a6adc30f0cb2c1fe10002d1002a0739ca9d63fc632",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "2a661367187bf31f5934e92024b253b8d9b17dbafc859e9ae513156c6870e72f",
+                    "hash" : "0x2a661367187bf31f5934e92024b253b8d9b17dbafc859e9ae513156c6870e72f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60006000600060006017730f572e5295c57f15886f9b263e2f6d2d6c7b5ec66103e8f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7faabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd60005260006000600060007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001a4",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "210000"
+                "0x033450"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stLogTests/log4_logMemsizeZero.json b/GeneralStateTests/stLogTests/log4_logMemsizeZero.json
index 7713d0b17..04dfc288a 100644
--- a/GeneralStateTests/stLogTests/log4_logMemsizeZero.json
+++ b/GeneralStateTests/stLogTests/log4_logMemsizeZero.json
@@ -1,17 +1,17 @@
 {
     "log4_logMemsizeZero" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "51af175d8af1aff46e6e555f372879d55c68eeb40d30978c805e5745ed608a67",
+                    "hash" : "0x51af175d8af1aff46e6e555f372879d55c68eeb40d30978c805e5745ed608a67",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "51af175d8af1aff46e6e555f372879d55c68eeb40d30978c805e5745ed608a67",
+                    "hash" : "0x51af175d8af1aff46e6e555f372879d55c68eeb40d30978c805e5745ed608a67",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a43b05c1042a916f1c6861d4da9bee76f1f049d5170153db0b8c3d4db7de7ef8",
+                    "hash" : "0xa43b05c1042a916f1c6861d4da9bee76f1f049d5170153db0b8c3d4db7de7ef8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a43b05c1042a916f1c6861d4da9bee76f1f049d5170153db0b8c3d4db7de7ef8",
+                    "hash" : "0xa43b05c1042a916f1c6861d4da9bee76f1f049d5170153db0b8c3d4db7de7ef8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "51af175d8af1aff46e6e555f372879d55c68eeb40d30978c805e5745ed608a67",
+                    "hash" : "0x51af175d8af1aff46e6e555f372879d55c68eeb40d30978c805e5745ed608a67",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60006000600060006017730f572e5295c57f15886f9b263e2f6d2d6c7b5ec66103e8f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7faabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd600052600060006000600060006001a4",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "210000"
+                "0x033450"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stLogTests/log4_nonEmptyMem.json b/GeneralStateTests/stLogTests/log4_nonEmptyMem.json
index 7cca07127..e8262523f 100644
--- a/GeneralStateTests/stLogTests/log4_nonEmptyMem.json
+++ b/GeneralStateTests/stLogTests/log4_nonEmptyMem.json
@@ -1,17 +1,17 @@
 {
     "log4_nonEmptyMem" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "258d671764a9c2c9e379e840b45b96f6301222c15c903c377d6fc4c67b023bdc",
+                    "hash" : "0x258d671764a9c2c9e379e840b45b96f6301222c15c903c377d6fc4c67b023bdc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "258d671764a9c2c9e379e840b45b96f6301222c15c903c377d6fc4c67b023bdc",
+                    "hash" : "0x258d671764a9c2c9e379e840b45b96f6301222c15c903c377d6fc4c67b023bdc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f0760c91eb96db3e327e8e33b84e2e123d31cb1e72fc1a17b01b9512175a9234",
+                    "hash" : "0xf0760c91eb96db3e327e8e33b84e2e123d31cb1e72fc1a17b01b9512175a9234",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f0760c91eb96db3e327e8e33b84e2e123d31cb1e72fc1a17b01b9512175a9234",
+                    "hash" : "0xf0760c91eb96db3e327e8e33b84e2e123d31cb1e72fc1a17b01b9512175a9234",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "258d671764a9c2c9e379e840b45b96f6301222c15c903c377d6fc4c67b023bdc",
+                    "hash" : "0x258d671764a9c2c9e379e840b45b96f6301222c15c903c377d6fc4c67b023bdc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60006000600060006017730f572e5295c57f15886f9b263e2f6d2d6c7b5ec66103e8f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff600052600060006000600060206000a4",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "210000"
+                "0x033450"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stLogTests/log4_nonEmptyMem_logMemSize1.json b/GeneralStateTests/stLogTests/log4_nonEmptyMem_logMemSize1.json
index b8afca6d8..5541d4c91 100644
--- a/GeneralStateTests/stLogTests/log4_nonEmptyMem_logMemSize1.json
+++ b/GeneralStateTests/stLogTests/log4_nonEmptyMem_logMemSize1.json
@@ -1,17 +1,17 @@
 {
     "log4_nonEmptyMem_logMemSize1" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e6338fc1942d03536c8fba06cb7c956c0800ee31ee8768076d4939b5678fad33",
+                    "hash" : "0xe6338fc1942d03536c8fba06cb7c956c0800ee31ee8768076d4939b5678fad33",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e6338fc1942d03536c8fba06cb7c956c0800ee31ee8768076d4939b5678fad33",
+                    "hash" : "0xe6338fc1942d03536c8fba06cb7c956c0800ee31ee8768076d4939b5678fad33",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "d48c959bdfb4f224e491eeec3e9be0e058754bf0cf3e4c1abc2ce13bb59f5f88",
+                    "hash" : "0xd48c959bdfb4f224e491eeec3e9be0e058754bf0cf3e4c1abc2ce13bb59f5f88",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "d48c959bdfb4f224e491eeec3e9be0e058754bf0cf3e4c1abc2ce13bb59f5f88",
+                    "hash" : "0xd48c959bdfb4f224e491eeec3e9be0e058754bf0cf3e4c1abc2ce13bb59f5f88",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e6338fc1942d03536c8fba06cb7c956c0800ee31ee8768076d4939b5678fad33",
+                    "hash" : "0xe6338fc1942d03536c8fba06cb7c956c0800ee31ee8768076d4939b5678fad33",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60006000600060006017730f572e5295c57f15886f9b263e2f6d2d6c7b5ec66103e8f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7faabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd600052600060006000600060016000a4",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "210000"
+                "0x033450"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stLogTests/log4_nonEmptyMem_logMemSize1_logMemStart31.json b/GeneralStateTests/stLogTests/log4_nonEmptyMem_logMemSize1_logMemStart31.json
index 628869e4a..047941535 100644
--- a/GeneralStateTests/stLogTests/log4_nonEmptyMem_logMemSize1_logMemStart31.json
+++ b/GeneralStateTests/stLogTests/log4_nonEmptyMem_logMemSize1_logMemStart31.json
@@ -1,17 +1,17 @@
 {
     "log4_nonEmptyMem_logMemSize1_logMemStart31" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a470a017243b427501c9b4b52f09262e66d10fa1c9c8ccfe7399e108eda928dd",
+                    "hash" : "0xa470a017243b427501c9b4b52f09262e66d10fa1c9c8ccfe7399e108eda928dd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a470a017243b427501c9b4b52f09262e66d10fa1c9c8ccfe7399e108eda928dd",
+                    "hash" : "0xa470a017243b427501c9b4b52f09262e66d10fa1c9c8ccfe7399e108eda928dd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "888ab2f7923c9955079b8e624444d2b51cda9663bee25032d448d93777adcd21",
+                    "hash" : "0x888ab2f7923c9955079b8e624444d2b51cda9663bee25032d448d93777adcd21",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "888ab2f7923c9955079b8e624444d2b51cda9663bee25032d448d93777adcd21",
+                    "hash" : "0x888ab2f7923c9955079b8e624444d2b51cda9663bee25032d448d93777adcd21",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a470a017243b427501c9b4b52f09262e66d10fa1c9c8ccfe7399e108eda928dd",
+                    "hash" : "0xa470a017243b427501c9b4b52f09262e66d10fa1c9c8ccfe7399e108eda928dd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60006000600060006017730f572e5295c57f15886f9b263e2f6d2d6c7b5ec66103e8f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7faabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd60005260006000600060006001601fa4",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "210000"
+                "0x033450"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stLogTests/logInOOG_Call.json b/GeneralStateTests/stLogTests/logInOOG_Call.json
index 7480a58a0..7dbe90305 100644
--- a/GeneralStateTests/stLogTests/logInOOG_Call.json
+++ b/GeneralStateTests/stLogTests/logInOOG_Call.json
@@ -1,17 +1,17 @@
 {
     "logInOOG_Call" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "529fc80d5ffb5ddddfdcf621a31defddc99c330d68b490b0949a9ca2ccfa0a5f",
+                    "hash" : "0x529fc80d5ffb5ddddfdcf621a31defddc99c330d68b490b0949a9ca2ccfa0a5f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "529fc80d5ffb5ddddfdcf621a31defddc99c330d68b490b0949a9ca2ccfa0a5f",
+                    "hash" : "0x529fc80d5ffb5ddddfdcf621a31defddc99c330d68b490b0949a9ca2ccfa0a5f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a22462b91b17b9e4343b3064d974bf6bf5b27705c6cc88dfbf55b2c85331f69b",
+                    "hash" : "0xa22462b91b17b9e4343b3064d974bf6bf5b27705c6cc88dfbf55b2c85331f69b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a22462b91b17b9e4343b3064d974bf6bf5b27705c6cc88dfbf55b2c85331f69b",
+                    "hash" : "0xa22462b91b17b9e4343b3064d974bf6bf5b27705c6cc88dfbf55b2c85331f69b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "529fc80d5ffb5ddddfdcf621a31defddc99c330d68b490b0949a9ca2ccfa0a5f",
+                    "hash" : "0x529fc80d5ffb5ddddfdcf621a31defddc99c330d68b490b0949a9ca2ccfa0a5f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60006000600060006017730f572e5295c57f15886f9b263e2f6d2d6c7b5ec6620186a0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60206000a067ffffffffffffffff51",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "210000"
+                "0x033450"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemExpandingEIP150Calls/CallAndCallcodeConsumeMoreGasThenTransactionHasWithMemExpandingCalls.json b/GeneralStateTests/stMemExpandingEIP150Calls/CallAndCallcodeConsumeMoreGasThenTransactionHasWithMemExpandingCalls.json
index b162ee865..640055af2 100644
--- a/GeneralStateTests/stMemExpandingEIP150Calls/CallAndCallcodeConsumeMoreGasThenTransactionHasWithMemExpandingCalls.json
+++ b/GeneralStateTests/stMemExpandingEIP150Calls/CallAndCallcodeConsumeMoreGasThenTransactionHasWithMemExpandingCalls.json
@@ -1,17 +1,17 @@
 {
     "CallAndCallcodeConsumeMoreGasThenTransactionHasWithMemExpandingCalls" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "3a47c0e593bb7e5efddd07e15e10b7dc504b52b53ed93a924c5a32ff4ef5c373",
+                    "hash" : "0x3a47c0e593bb7e5efddd07e15e10b7dc504b52b53ed93a924c5a32ff4ef5c373",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "3a47c0e593bb7e5efddd07e15e10b7dc504b52b53ed93a924c5a32ff4ef5c373",
+                    "hash" : "0x3a47c0e593bb7e5efddd07e15e10b7dc504b52b53ed93a924c5a32ff4ef5c373",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "1d6bfacf8c876797594943ff7a8d91c46d2ce8d1741fbc86d1efd5f223abff10",
+                    "hash" : "0x1d6bfacf8c876797594943ff7a8d91c46d2ce8d1741fbc86d1efd5f223abff10",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "1d6bfacf8c876797594943ff7a8d91c46d2ce8d1741fbc86d1efd5f223abff10",
+                    "hash" : "0x1d6bfacf8c876797594943ff7a8d91c46d2ce8d1741fbc86d1efd5f223abff10",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "3a47c0e593bb7e5efddd07e15e10b7dc504b52b53ed93a924c5a32ff4ef5c373",
+                    "hash" : "0x3a47c0e593bb7e5efddd07e15e10b7dc504b52b53ed93a924c5a32ff4ef5c373",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000103" : {
+            "0x1000000000000000000000000000000000000103" : {
                 "balance" : "0x00",
                 "code" : "0x6012600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a60085560ff60ff60ff60ff6000731000000000000000000000000000000000000103620927c0f160095560ff60ff60ff60ff6000731000000000000000000000000000000000000103620927c0f2600a55",
                 "nonce" : "0x00",
@@ -92,10 +92,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemExpandingEIP150Calls/CallAskMoreGasOnDepth2ThenTransactionHasWithMemExpandingCalls.json b/GeneralStateTests/stMemExpandingEIP150Calls/CallAskMoreGasOnDepth2ThenTransactionHasWithMemExpandingCalls.json
index de2e7bd6c..63035d8b4 100644
--- a/GeneralStateTests/stMemExpandingEIP150Calls/CallAskMoreGasOnDepth2ThenTransactionHasWithMemExpandingCalls.json
+++ b/GeneralStateTests/stMemExpandingEIP150Calls/CallAskMoreGasOnDepth2ThenTransactionHasWithMemExpandingCalls.json
@@ -1,17 +1,17 @@
 {
     "CallAskMoreGasOnDepth2ThenTransactionHasWithMemExpandingCalls" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c8d3489ab7b0e7016720dc3b3bb467d3413baf8c4309a37a90a0fd355ad931db",
+                    "hash" : "0xc8d3489ab7b0e7016720dc3b3bb467d3413baf8c4309a37a90a0fd355ad931db",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c8d3489ab7b0e7016720dc3b3bb467d3413baf8c4309a37a90a0fd355ad931db",
+                    "hash" : "0xc8d3489ab7b0e7016720dc3b3bb467d3413baf8c4309a37a90a0fd355ad931db",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "653879f51080262e4762e0c116802c72b702b4c7179dd2f21ed393c0d284f247",
+                    "hash" : "0x653879f51080262e4762e0c116802c72b702b4c7179dd2f21ed393c0d284f247",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "653879f51080262e4762e0c116802c72b702b4c7179dd2f21ed393c0d284f247",
+                    "hash" : "0x653879f51080262e4762e0c116802c72b702b4c7179dd2f21ed393c0d284f247",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c8d3489ab7b0e7016720dc3b3bb467d3413baf8c4309a37a90a0fd355ad931db",
+                    "hash" : "0xc8d3489ab7b0e7016720dc3b3bb467d3413baf8c4309a37a90a0fd355ad931db",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,28 +61,28 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000107" : {
+            "0x1000000000000000000000000000000000000107" : {
                 "balance" : "0x00",
                 "code" : "0x5a60085560ff60ff60ff60ff6000731000000000000000000000000000000000000108620927c0f1600955",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000108" : {
+            "0x1000000000000000000000000000000000000108" : {
                 "balance" : "0x00",
                 "code" : "0x5a600855",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a60085560ff60ff60ff60ff600073100000000000000000000000000000000000010762030d40f1600955",
                 "nonce" : "0x00",
@@ -99,10 +99,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevel2WithMemExpandingCalls.json b/GeneralStateTests/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevel2WithMemExpandingCalls.json
index 7269d25d8..f424f8fc8 100644
--- a/GeneralStateTests/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevel2WithMemExpandingCalls.json
+++ b/GeneralStateTests/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevel2WithMemExpandingCalls.json
@@ -1,17 +1,17 @@
 {
     "CallGoesOOGOnSecondLevel2WithMemExpandingCalls" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c53380bbe4ce6faf67f118f60693db4bc55ad222bca864a691d72de50432e1b2",
+                    "hash" : "0xc53380bbe4ce6faf67f118f60693db4bc55ad222bca864a691d72de50432e1b2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c53380bbe4ce6faf67f118f60693db4bc55ad222bca864a691d72de50432e1b2",
+                    "hash" : "0xc53380bbe4ce6faf67f118f60693db4bc55ad222bca864a691d72de50432e1b2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "c53380bbe4ce6faf67f118f60693db4bc55ad222bca864a691d72de50432e1b2",
+                    "hash" : "0xc53380bbe4ce6faf67f118f60693db4bc55ad222bca864a691d72de50432e1b2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c53380bbe4ce6faf67f118f60693db4bc55ad222bca864a691d72de50432e1b2",
+                    "hash" : "0xc53380bbe4ce6faf67f118f60693db4bc55ad222bca864a691d72de50432e1b2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c53380bbe4ce6faf67f118f60693db4bc55ad222bca864a691d72de50432e1b2",
+                    "hash" : "0xc53380bbe4ce6faf67f118f60693db4bc55ad222bca864a691d72de50432e1b2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,28 +61,28 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000113" : {
+            "0x1000000000000000000000000000000000000113" : {
                 "balance" : "0x00",
                 "code" : "0x5a60085560ff60ff60ff60ff6000731000000000000000000000000000000000000114620927c0f1600955",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000114" : {
+            "0x1000000000000000000000000000000000000114" : {
                 "balance" : "0x00",
                 "code" : "0x5a6008555a6009555a600a55",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a60085560ff60ff60ff60ff6000731000000000000000000000000000000000000113620927c0f1600955",
                 "nonce" : "0x00",
@@ -99,10 +99,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevelWithMemExpandingCalls.json b/GeneralStateTests/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevelWithMemExpandingCalls.json
index af25249d6..7b940b631 100644
--- a/GeneralStateTests/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevelWithMemExpandingCalls.json
+++ b/GeneralStateTests/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevelWithMemExpandingCalls.json
@@ -1,17 +1,17 @@
 {
     "CallGoesOOGOnSecondLevelWithMemExpandingCalls" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f29c645d8735ceb8bc618a4069db255bdf77c23ece151cf0822c1613e8227c00",
+                    "hash" : "0xf29c645d8735ceb8bc618a4069db255bdf77c23ece151cf0822c1613e8227c00",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f29c645d8735ceb8bc618a4069db255bdf77c23ece151cf0822c1613e8227c00",
+                    "hash" : "0xf29c645d8735ceb8bc618a4069db255bdf77c23ece151cf0822c1613e8227c00",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f29c645d8735ceb8bc618a4069db255bdf77c23ece151cf0822c1613e8227c00",
+                    "hash" : "0xf29c645d8735ceb8bc618a4069db255bdf77c23ece151cf0822c1613e8227c00",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f29c645d8735ceb8bc618a4069db255bdf77c23ece151cf0822c1613e8227c00",
+                    "hash" : "0xf29c645d8735ceb8bc618a4069db255bdf77c23ece151cf0822c1613e8227c00",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f29c645d8735ceb8bc618a4069db255bdf77c23ece151cf0822c1613e8227c00",
+                    "hash" : "0xf29c645d8735ceb8bc618a4069db255bdf77c23ece151cf0822c1613e8227c00",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,28 +61,28 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000110" : {
+            "0x1000000000000000000000000000000000000110" : {
                 "balance" : "0x00",
                 "code" : "0x5a60085560ff60ff60ff60ff6000731000000000000000000000000000000000000111620927c0f1600955",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000111" : {
+            "0x1000000000000000000000000000000000000111" : {
                 "balance" : "0x00",
                 "code" : "0x5a600855600060006000f050600060006000f0505a6009555a600a55",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a60085560ff60ff60ff60ff6000731000000000000000000000000000000000000110620927c0f1600955",
                 "nonce" : "0x00",
@@ -99,10 +99,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemExpandingEIP150Calls/CreateAndGasInsideCreateWithMemExpandingCalls.json b/GeneralStateTests/stMemExpandingEIP150Calls/CreateAndGasInsideCreateWithMemExpandingCalls.json
index 2e7dbda68..763e5b4c7 100644
--- a/GeneralStateTests/stMemExpandingEIP150Calls/CreateAndGasInsideCreateWithMemExpandingCalls.json
+++ b/GeneralStateTests/stMemExpandingEIP150Calls/CreateAndGasInsideCreateWithMemExpandingCalls.json
@@ -1,17 +1,17 @@
 {
     "CreateAndGasInsideCreateWithMemExpandingCalls" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "3ca082f6185a3019aea75573a032dd81b0e99f7b7f464b1a84e55eae4513baf5",
+                    "hash" : "0x3ca082f6185a3019aea75573a032dd81b0e99f7b7f464b1a84e55eae4513baf5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "4bd8b2a14dc113c65caabef1a52808b711e65ef0eadb38e72a7d0527fbddf1aa",
+                    "hash" : "0x4bd8b2a14dc113c65caabef1a52808b711e65ef0eadb38e72a7d0527fbddf1aa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "0a54e84b6282918bc9e9ec50464ca2edf2e4e3f4ef2ce08fb8660e05b2b0cb02",
+                    "hash" : "0x0a54e84b6282918bc9e9ec50464ca2edf2e4e3f4ef2ce08fb8660e05b2b0cb02",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "0a54e84b6282918bc9e9ec50464ca2edf2e4e3f4ef2ce08fb8660e05b2b0cb02",
+                    "hash" : "0x0a54e84b6282918bc9e9ec50464ca2edf2e4e3f4ef2ce08fb8660e05b2b0cb02",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "4bd8b2a14dc113c65caabef1a52808b711e65ef0eadb38e72a7d0527fbddf1aa",
+                    "hash" : "0x4bd8b2a14dc113c65caabef1a52808b711e65ef0eadb38e72a7d0527fbddf1aa",
                     "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" : "0x5a600a55635a60fd556000526004601c6000f0600b555a600955",
                 "nonce" : "0x00",
@@ -85,10 +85,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemExpandingEIP150Calls/DelegateCallOnEIPWithMemExpandingCalls.json b/GeneralStateTests/stMemExpandingEIP150Calls/DelegateCallOnEIPWithMemExpandingCalls.json
index c4453a316..104752304 100644
--- a/GeneralStateTests/stMemExpandingEIP150Calls/DelegateCallOnEIPWithMemExpandingCalls.json
+++ b/GeneralStateTests/stMemExpandingEIP150Calls/DelegateCallOnEIPWithMemExpandingCalls.json
@@ -1,17 +1,17 @@
 {
     "DelegateCallOnEIPWithMemExpandingCalls" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a5c328fefa9c88698bc8874c177e30b327354c21d0fc4e8798f311f98ad9ac6c",
+                    "hash" : "0xa5c328fefa9c88698bc8874c177e30b327354c21d0fc4e8798f311f98ad9ac6c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a5c328fefa9c88698bc8874c177e30b327354c21d0fc4e8798f311f98ad9ac6c",
+                    "hash" : "0xa5c328fefa9c88698bc8874c177e30b327354c21d0fc4e8798f311f98ad9ac6c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "31ee439cef3e374eb3430278ed326d6114a4218a033843fdddf2edd8a7f994f5",
+                    "hash" : "0x31ee439cef3e374eb3430278ed326d6114a4218a033843fdddf2edd8a7f994f5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "31ee439cef3e374eb3430278ed326d6114a4218a033843fdddf2edd8a7f994f5",
+                    "hash" : "0x31ee439cef3e374eb3430278ed326d6114a4218a033843fdddf2edd8a7f994f5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a5c328fefa9c88698bc8874c177e30b327354c21d0fc4e8798f311f98ad9ac6c",
+                    "hash" : "0xa5c328fefa9c88698bc8874c177e30b327354c21d0fc4e8798f311f98ad9ac6c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000105" : {
+            "0x1000000000000000000000000000000000000105" : {
                 "balance" : "0x00",
                 "code" : "0x6012600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a60085560ff60ff60ff60ff731000000000000000000000000000000000000105620927c0f4600955",
                 "nonce" : "0x00",
@@ -92,10 +92,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemExpandingEIP150Calls/ExecuteCallThatAskMoreGasThenTransactionHasWithMemExpandingCalls.json b/GeneralStateTests/stMemExpandingEIP150Calls/ExecuteCallThatAskMoreGasThenTransactionHasWithMemExpandingCalls.json
index cecd14fd7..596067705 100644
--- a/GeneralStateTests/stMemExpandingEIP150Calls/ExecuteCallThatAskMoreGasThenTransactionHasWithMemExpandingCalls.json
+++ b/GeneralStateTests/stMemExpandingEIP150Calls/ExecuteCallThatAskMoreGasThenTransactionHasWithMemExpandingCalls.json
@@ -1,17 +1,17 @@
 {
     "ExecuteCallThatAskMoreGasThenTransactionHasWithMemExpandingCalls" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "94b4df76c833bb02bfeb6b63427db966e368c23d3a41baf0c06ca6d6c29368d5",
+                    "hash" : "0x94b4df76c833bb02bfeb6b63427db966e368c23d3a41baf0c06ca6d6c29368d5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "94b4df76c833bb02bfeb6b63427db966e368c23d3a41baf0c06ca6d6c29368d5",
+                    "hash" : "0x94b4df76c833bb02bfeb6b63427db966e368c23d3a41baf0c06ca6d6c29368d5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "c6ceff6d4e61b8fa03745e08a6250ec800ca8be50a5c7a1605a85c3a4197fec9",
+                    "hash" : "0xc6ceff6d4e61b8fa03745e08a6250ec800ca8be50a5c7a1605a85c3a4197fec9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c6ceff6d4e61b8fa03745e08a6250ec800ca8be50a5c7a1605a85c3a4197fec9",
+                    "hash" : "0xc6ceff6d4e61b8fa03745e08a6250ec800ca8be50a5c7a1605a85c3a4197fec9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "94b4df76c833bb02bfeb6b63427db966e368c23d3a41baf0c06ca6d6c29368d5",
+                    "hash" : "0x94b4df76c833bb02bfeb6b63427db966e368c23d3a41baf0c06ca6d6c29368d5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0186a0",
                 "code" : "0x600c600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x60ff60ff60ff60ff6000731000000000000000000000000000000000000001620927c0f1600155",
                 "nonce" : "0x00",
@@ -92,10 +92,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemExpandingEIP150Calls/NewGasPriceForCodesWithMemExpandingCalls.json b/GeneralStateTests/stMemExpandingEIP150Calls/NewGasPriceForCodesWithMemExpandingCalls.json
index 2a8f7e75c..bd5e894a3 100644
--- a/GeneralStateTests/stMemExpandingEIP150Calls/NewGasPriceForCodesWithMemExpandingCalls.json
+++ b/GeneralStateTests/stMemExpandingEIP150Calls/NewGasPriceForCodesWithMemExpandingCalls.json
@@ -1,17 +1,17 @@
 {
     "NewGasPriceForCodesWithMemExpandingCalls" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "479fef1d31182ab6f401423f71268b338d5ab64cf0134b1d00429fbbb2681bc8",
+                    "hash" : "0x479fef1d31182ab6f401423f71268b338d5ab64cf0134b1d00429fbbb2681bc8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "3c5bae587cde223b9fa96b488a8d11e43d9b52243a0ff8cb16e9e688add81211",
+                    "hash" : "0x3c5bae587cde223b9fa96b488a8d11e43d9b52243a0ff8cb16e9e688add81211",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "55d3f32c0cb176382fbd4970701b62a8e9b01e83c9e83b203b1aceeef65ca3ea",
+                    "hash" : "0x55d3f32c0cb176382fbd4970701b62a8e9b01e83c9e83b203b1aceeef65ca3ea",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a70ebcc9693ee6433f20def41c872b787d82673ab6d421a80174e8b5968d3a62",
+                    "hash" : "0xa70ebcc9693ee6433f20def41c872b787d82673ab6d421a80174e8b5968d3a62",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "3c5bae587cde223b9fa96b488a8d11e43d9b52243a0ff8cb16e9e688add81211",
+                    "hash" : "0x3c5bae587cde223b9fa96b488a8d11e43d9b52243a0ff8cb16e9e688add81211",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,28 +61,28 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000010" : {
+            "0x1000000000000000000000000000000000000010" : {
                 "balance" : "0x6f",
                 "code" : "0x1122334455667788991011121314151617181920212223242526272829303132",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000011" : {
+            "0x1000000000000000000000000000000000000011" : {
                 "balance" : "0x00",
                 "code" : "0x6011606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x7310000000000000000000000000000000000000103b6001556014600060007310000000000000000000000000000000000000103c60005160025560005460045560ff60ff60ff60ff6001731000000000000000000000000000000000000011617530f160055560ff60ff60ff60ff6001731000000000000000000000000000000000000011617530f260065560ff60ff60ff60ff731000000000000000000000000000000000000011617530f460075560ff60ff60ff60ff6000731000000000000000000000000000000000000013617530f160085573a94f5374fce5edbc8e2a8697c15331677e6ebf0b316003555a600a55",
                 "nonce" : "0x00",
@@ -100,10 +100,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/calldatacopy_dejavu.json b/GeneralStateTests/stMemoryTest/calldatacopy_dejavu.json
index 3cbd64642..2ba1d3326 100644
--- a/GeneralStateTests/stMemoryTest/calldatacopy_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/calldatacopy_dejavu.json
@@ -1,17 +1,17 @@
 {
     "calldatacopy_dejavu " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "fb0eef5366c4b1d9bd479557e0cbf35f0b1512f3f6cfea8fd2853933ec3c3d23",
+                    "hash" : "0xfb0eef5366c4b1d9bd479557e0cbf35f0b1512f3f6cfea8fd2853933ec3c3d23",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "fb0eef5366c4b1d9bd479557e0cbf35f0b1512f3f6cfea8fd2853933ec3c3d23",
+                    "hash" : "0xfb0eef5366c4b1d9bd479557e0cbf35f0b1512f3f6cfea8fd2853933ec3c3d23",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "fb0eef5366c4b1d9bd479557e0cbf35f0b1512f3f6cfea8fd2853933ec3c3d23",
+                    "hash" : "0xfb0eef5366c4b1d9bd479557e0cbf35f0b1512f3f6cfea8fd2853933ec3c3d23",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "fb0eef5366c4b1d9bd479557e0cbf35f0b1512f3f6cfea8fd2853933ec3c3d23",
+                    "hash" : "0xfb0eef5366c4b1d9bd479557e0cbf35f0b1512f3f6cfea8fd2853933ec3c3d23",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "fb0eef5366c4b1d9bd479557e0cbf35f0b1512f3f6cfea8fd2853933ec3c3d23",
+                    "hash" : "0xfb0eef5366c4b1d9bd479557e0cbf35f0b1512f3f6cfea8fd2853933ec3c3d23",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60ff60ff630fffffff630fffffff37",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "42949672960"
+                "0x0a00000000"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/calldatacopy_dejavu2.json b/GeneralStateTests/stMemoryTest/calldatacopy_dejavu2.json
index 0a7e0f579..669b3d4ee 100644
--- a/GeneralStateTests/stMemoryTest/calldatacopy_dejavu2.json
+++ b/GeneralStateTests/stMemoryTest/calldatacopy_dejavu2.json
@@ -1,17 +1,17 @@
 {
     "calldatacopy_dejavu2 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "74ee79796297a4556e905da5bc59648da679f19b3884a1a383e5b0c7a91c9e05",
+                    "hash" : "0x74ee79796297a4556e905da5bc59648da679f19b3884a1a383e5b0c7a91c9e05",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "74ee79796297a4556e905da5bc59648da679f19b3884a1a383e5b0c7a91c9e05",
+                    "hash" : "0x74ee79796297a4556e905da5bc59648da679f19b3884a1a383e5b0c7a91c9e05",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "74ee79796297a4556e905da5bc59648da679f19b3884a1a383e5b0c7a91c9e05",
+                    "hash" : "0x74ee79796297a4556e905da5bc59648da679f19b3884a1a383e5b0c7a91c9e05",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "74ee79796297a4556e905da5bc59648da679f19b3884a1a383e5b0c7a91c9e05",
+                    "hash" : "0x74ee79796297a4556e905da5bc59648da679f19b3884a1a383e5b0c7a91c9e05",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "74ee79796297a4556e905da5bc59648da679f19b3884a1a383e5b0c7a91c9e05",
+                    "hash" : "0x74ee79796297a4556e905da5bc59648da679f19b3884a1a383e5b0c7a91c9e05",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6005565b005b6042601f536101036000601f3760005180606014600357640badc0ffee60ff55",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "42949672960"
+                "0x0a00000000"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/codecopy_dejavu.json b/GeneralStateTests/stMemoryTest/codecopy_dejavu.json
index 44fb1ee72..f3918bd85 100644
--- a/GeneralStateTests/stMemoryTest/codecopy_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/codecopy_dejavu.json
@@ -1,17 +1,17 @@
 {
     "codecopy_dejavu " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "5e3bd4dc78514c1999c1d83a89bad70d4596bf2f1a8a53c406078f208257c174",
+                    "hash" : "0x5e3bd4dc78514c1999c1d83a89bad70d4596bf2f1a8a53c406078f208257c174",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "5e3bd4dc78514c1999c1d83a89bad70d4596bf2f1a8a53c406078f208257c174",
+                    "hash" : "0x5e3bd4dc78514c1999c1d83a89bad70d4596bf2f1a8a53c406078f208257c174",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5e3bd4dc78514c1999c1d83a89bad70d4596bf2f1a8a53c406078f208257c174",
+                    "hash" : "0x5e3bd4dc78514c1999c1d83a89bad70d4596bf2f1a8a53c406078f208257c174",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5e3bd4dc78514c1999c1d83a89bad70d4596bf2f1a8a53c406078f208257c174",
+                    "hash" : "0x5e3bd4dc78514c1999c1d83a89bad70d4596bf2f1a8a53c406078f208257c174",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "5e3bd4dc78514c1999c1d83a89bad70d4596bf2f1a8a53c406078f208257c174",
+                    "hash" : "0x5e3bd4dc78514c1999c1d83a89bad70d4596bf2f1a8a53c406078f208257c174",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60ff60ff630fffffff630fffffff39",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "42949672960"
+                "0x0a00000000"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/codecopy_dejavu2.json b/GeneralStateTests/stMemoryTest/codecopy_dejavu2.json
index a3f50cd0d..13eb724e2 100644
--- a/GeneralStateTests/stMemoryTest/codecopy_dejavu2.json
+++ b/GeneralStateTests/stMemoryTest/codecopy_dejavu2.json
@@ -1,17 +1,17 @@
 {
     "codecopy_dejavu2 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "368b88a2614b03725ac64cec0ef73009aaa11390385f0273541932e152f03900",
+                    "hash" : "0x368b88a2614b03725ac64cec0ef73009aaa11390385f0273541932e152f03900",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "368b88a2614b03725ac64cec0ef73009aaa11390385f0273541932e152f03900",
+                    "hash" : "0x368b88a2614b03725ac64cec0ef73009aaa11390385f0273541932e152f03900",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "368b88a2614b03725ac64cec0ef73009aaa11390385f0273541932e152f03900",
+                    "hash" : "0x368b88a2614b03725ac64cec0ef73009aaa11390385f0273541932e152f03900",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "368b88a2614b03725ac64cec0ef73009aaa11390385f0273541932e152f03900",
+                    "hash" : "0x368b88a2614b03725ac64cec0ef73009aaa11390385f0273541932e152f03900",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "368b88a2614b03725ac64cec0ef73009aaa11390385f0273541932e152f03900",
+                    "hash" : "0x368b88a2614b03725ac64cec0ef73009aaa11390385f0273541932e152f03900",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6005565b005b600a68010000000000000001601f3960005180600014600357640badc0ffee60",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "42949672960"
+                "0x0a00000000"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/extcodecopy_dejavu.json b/GeneralStateTests/stMemoryTest/extcodecopy_dejavu.json
index 0da123061..63ec58284 100644
--- a/GeneralStateTests/stMemoryTest/extcodecopy_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/extcodecopy_dejavu.json
@@ -1,17 +1,17 @@
 {
     "extcodecopy_dejavu " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7db301c0754d4f94248fcc32e831c45b1a730331848fe6b51d1381b3b08ba403",
+                    "hash" : "0x7db301c0754d4f94248fcc32e831c45b1a730331848fe6b51d1381b3b08ba403",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7db301c0754d4f94248fcc32e831c45b1a730331848fe6b51d1381b3b08ba403",
+                    "hash" : "0x7db301c0754d4f94248fcc32e831c45b1a730331848fe6b51d1381b3b08ba403",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "7db301c0754d4f94248fcc32e831c45b1a730331848fe6b51d1381b3b08ba403",
+                    "hash" : "0x7db301c0754d4f94248fcc32e831c45b1a730331848fe6b51d1381b3b08ba403",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "7db301c0754d4f94248fcc32e831c45b1a730331848fe6b51d1381b3b08ba403",
+                    "hash" : "0x7db301c0754d4f94248fcc32e831c45b1a730331848fe6b51d1381b3b08ba403",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7db301c0754d4f94248fcc32e831c45b1a730331848fe6b51d1381b3b08ba403",
+                    "hash" : "0x7db301c0754d4f94248fcc32e831c45b1a730331848fe6b51d1381b3b08ba403",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60ff60ff630fffffff630fffffff3c",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "42949672960"
+                "0x0a00000000"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/log1_dejavu.json b/GeneralStateTests/stMemoryTest/log1_dejavu.json
index 45503d85f..18ff5667b 100644
--- a/GeneralStateTests/stMemoryTest/log1_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/log1_dejavu.json
@@ -1,17 +1,17 @@
 {
     "log1_dejavu " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "236e71ab7e9bce4137b479cabfe2691738eb87b7e9221f69feab810e8d2d5def",
+                    "hash" : "0x236e71ab7e9bce4137b479cabfe2691738eb87b7e9221f69feab810e8d2d5def",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "236e71ab7e9bce4137b479cabfe2691738eb87b7e9221f69feab810e8d2d5def",
+                    "hash" : "0x236e71ab7e9bce4137b479cabfe2691738eb87b7e9221f69feab810e8d2d5def",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "236e71ab7e9bce4137b479cabfe2691738eb87b7e9221f69feab810e8d2d5def",
+                    "hash" : "0x236e71ab7e9bce4137b479cabfe2691738eb87b7e9221f69feab810e8d2d5def",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "236e71ab7e9bce4137b479cabfe2691738eb87b7e9221f69feab810e8d2d5def",
+                    "hash" : "0x236e71ab7e9bce4137b479cabfe2691738eb87b7e9221f69feab810e8d2d5def",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "236e71ab7e9bce4137b479cabfe2691738eb87b7e9221f69feab810e8d2d5def",
+                    "hash" : "0x236e71ab7e9bce4137b479cabfe2691738eb87b7e9221f69feab810e8d2d5def",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60ff60ff630fffffffa1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "42949672960"
+                "0x0a00000000"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/log2_dejavu.json b/GeneralStateTests/stMemoryTest/log2_dejavu.json
index 30e665102..d2f7757c7 100644
--- a/GeneralStateTests/stMemoryTest/log2_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/log2_dejavu.json
@@ -1,17 +1,17 @@
 {
     "log2_dejavu " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "4f5d3d8ba03ebe57a1ae72c00c7604c85a67edd03cc3b86ecbf3dbc760c17383",
+                    "hash" : "0x4f5d3d8ba03ebe57a1ae72c00c7604c85a67edd03cc3b86ecbf3dbc760c17383",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "4f5d3d8ba03ebe57a1ae72c00c7604c85a67edd03cc3b86ecbf3dbc760c17383",
+                    "hash" : "0x4f5d3d8ba03ebe57a1ae72c00c7604c85a67edd03cc3b86ecbf3dbc760c17383",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4f5d3d8ba03ebe57a1ae72c00c7604c85a67edd03cc3b86ecbf3dbc760c17383",
+                    "hash" : "0x4f5d3d8ba03ebe57a1ae72c00c7604c85a67edd03cc3b86ecbf3dbc760c17383",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4f5d3d8ba03ebe57a1ae72c00c7604c85a67edd03cc3b86ecbf3dbc760c17383",
+                    "hash" : "0x4f5d3d8ba03ebe57a1ae72c00c7604c85a67edd03cc3b86ecbf3dbc760c17383",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "4f5d3d8ba03ebe57a1ae72c00c7604c85a67edd03cc3b86ecbf3dbc760c17383",
+                    "hash" : "0x4f5d3d8ba03ebe57a1ae72c00c7604c85a67edd03cc3b86ecbf3dbc760c17383",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60ff60ff630fffffffa2",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "42949672960"
+                "0x0a00000000"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/log3_dejavu.json b/GeneralStateTests/stMemoryTest/log3_dejavu.json
index 4787c8c11..b42817fa9 100644
--- a/GeneralStateTests/stMemoryTest/log3_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/log3_dejavu.json
@@ -1,17 +1,17 @@
 {
     "log3_dejavu " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9fc7f149800e24882ebf620c5be1aa59d621b38accc418df88bba08aec37e6a1",
+                    "hash" : "0x9fc7f149800e24882ebf620c5be1aa59d621b38accc418df88bba08aec37e6a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9fc7f149800e24882ebf620c5be1aa59d621b38accc418df88bba08aec37e6a1",
+                    "hash" : "0x9fc7f149800e24882ebf620c5be1aa59d621b38accc418df88bba08aec37e6a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9fc7f149800e24882ebf620c5be1aa59d621b38accc418df88bba08aec37e6a1",
+                    "hash" : "0x9fc7f149800e24882ebf620c5be1aa59d621b38accc418df88bba08aec37e6a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9fc7f149800e24882ebf620c5be1aa59d621b38accc418df88bba08aec37e6a1",
+                    "hash" : "0x9fc7f149800e24882ebf620c5be1aa59d621b38accc418df88bba08aec37e6a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9fc7f149800e24882ebf620c5be1aa59d621b38accc418df88bba08aec37e6a1",
+                    "hash" : "0x9fc7f149800e24882ebf620c5be1aa59d621b38accc418df88bba08aec37e6a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60ff60ff60ff630fffffffa2",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "42949672960"
+                "0x0a00000000"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/log4_dejavu.json b/GeneralStateTests/stMemoryTest/log4_dejavu.json
index 6f9070d1f..6b40fbd29 100644
--- a/GeneralStateTests/stMemoryTest/log4_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/log4_dejavu.json
@@ -1,17 +1,17 @@
 {
     "log4_dejavu " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9fc7f149800e24882ebf620c5be1aa59d621b38accc418df88bba08aec37e6a1",
+                    "hash" : "0x9fc7f149800e24882ebf620c5be1aa59d621b38accc418df88bba08aec37e6a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9fc7f149800e24882ebf620c5be1aa59d621b38accc418df88bba08aec37e6a1",
+                    "hash" : "0x9fc7f149800e24882ebf620c5be1aa59d621b38accc418df88bba08aec37e6a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9fc7f149800e24882ebf620c5be1aa59d621b38accc418df88bba08aec37e6a1",
+                    "hash" : "0x9fc7f149800e24882ebf620c5be1aa59d621b38accc418df88bba08aec37e6a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9fc7f149800e24882ebf620c5be1aa59d621b38accc418df88bba08aec37e6a1",
+                    "hash" : "0x9fc7f149800e24882ebf620c5be1aa59d621b38accc418df88bba08aec37e6a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9fc7f149800e24882ebf620c5be1aa59d621b38accc418df88bba08aec37e6a1",
+                    "hash" : "0x9fc7f149800e24882ebf620c5be1aa59d621b38accc418df88bba08aec37e6a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60ff60ff60ff630fffffffa2",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "42949672960"
+                "0x0a00000000"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem0b_singleByte.json b/GeneralStateTests/stMemoryTest/mem0b_singleByte.json
index 5c41eea53..dc3f0c32d 100644
--- a/GeneralStateTests/stMemoryTest/mem0b_singleByte.json
+++ b/GeneralStateTests/stMemoryTest/mem0b_singleByte.json
@@ -1,17 +1,17 @@
 {
     "mem0b_singleByte " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e0efa836f999455740148dc120dc5f2344ad3b3c1323dca3852268d7b243d0ec",
+                    "hash" : "0xe0efa836f999455740148dc120dc5f2344ad3b3c1323dca3852268d7b243d0ec",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e0efa836f999455740148dc120dc5f2344ad3b3c1323dca3852268d7b243d0ec",
+                    "hash" : "0xe0efa836f999455740148dc120dc5f2344ad3b3c1323dca3852268d7b243d0ec",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e0efa836f999455740148dc120dc5f2344ad3b3c1323dca3852268d7b243d0ec",
+                    "hash" : "0xe0efa836f999455740148dc120dc5f2344ad3b3c1323dca3852268d7b243d0ec",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e0efa836f999455740148dc120dc5f2344ad3b3c1323dca3852268d7b243d0ec",
+                    "hash" : "0xe0efa836f999455740148dc120dc5f2344ad3b3c1323dca3852268d7b243d0ec",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e0efa836f999455740148dc120dc5f2344ad3b3c1323dca3852268d7b243d0ec",
+                    "hash" : "0xe0efa836f999455740148dc120dc5f2344ad3b3c1323dca3852268d7b243d0ec",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a60005359600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem31b_singleByte.json b/GeneralStateTests/stMemoryTest/mem31b_singleByte.json
index fa7015799..23ad4f3ad 100644
--- a/GeneralStateTests/stMemoryTest/mem31b_singleByte.json
+++ b/GeneralStateTests/stMemoryTest/mem31b_singleByte.json
@@ -1,17 +1,17 @@
 {
     "mem31b_singleByte " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "604b731508388ec89df1d255944de348916844d5bd6c301ddc9cda6b78587154",
+                    "hash" : "0x604b731508388ec89df1d255944de348916844d5bd6c301ddc9cda6b78587154",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "604b731508388ec89df1d255944de348916844d5bd6c301ddc9cda6b78587154",
+                    "hash" : "0x604b731508388ec89df1d255944de348916844d5bd6c301ddc9cda6b78587154",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "604b731508388ec89df1d255944de348916844d5bd6c301ddc9cda6b78587154",
+                    "hash" : "0x604b731508388ec89df1d255944de348916844d5bd6c301ddc9cda6b78587154",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "604b731508388ec89df1d255944de348916844d5bd6c301ddc9cda6b78587154",
+                    "hash" : "0x604b731508388ec89df1d255944de348916844d5bd6c301ddc9cda6b78587154",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "604b731508388ec89df1d255944de348916844d5bd6c301ddc9cda6b78587154",
+                    "hash" : "0x604b731508388ec89df1d255944de348916844d5bd6c301ddc9cda6b78587154",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a601e5359600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem32b_singleByte.json b/GeneralStateTests/stMemoryTest/mem32b_singleByte.json
index e55b20315..17a10d5a5 100644
--- a/GeneralStateTests/stMemoryTest/mem32b_singleByte.json
+++ b/GeneralStateTests/stMemoryTest/mem32b_singleByte.json
@@ -1,17 +1,17 @@
 {
     "mem32b_singleByte " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "37091fe21c4e51aec98d8c91dd43221caa0299562e7e6408f30a26c7d3f42b3e",
+                    "hash" : "0x37091fe21c4e51aec98d8c91dd43221caa0299562e7e6408f30a26c7d3f42b3e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "37091fe21c4e51aec98d8c91dd43221caa0299562e7e6408f30a26c7d3f42b3e",
+                    "hash" : "0x37091fe21c4e51aec98d8c91dd43221caa0299562e7e6408f30a26c7d3f42b3e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "37091fe21c4e51aec98d8c91dd43221caa0299562e7e6408f30a26c7d3f42b3e",
+                    "hash" : "0x37091fe21c4e51aec98d8c91dd43221caa0299562e7e6408f30a26c7d3f42b3e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "37091fe21c4e51aec98d8c91dd43221caa0299562e7e6408f30a26c7d3f42b3e",
+                    "hash" : "0x37091fe21c4e51aec98d8c91dd43221caa0299562e7e6408f30a26c7d3f42b3e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "37091fe21c4e51aec98d8c91dd43221caa0299562e7e6408f30a26c7d3f42b3e",
+                    "hash" : "0x37091fe21c4e51aec98d8c91dd43221caa0299562e7e6408f30a26c7d3f42b3e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a601f5359600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem32kb+1.json b/GeneralStateTests/stMemoryTest/mem32kb+1.json
index a8858d242..b36685c4b 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb+1.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb+1.json
@@ -1,17 +1,17 @@
 {
     "mem32kb+1 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "171d90f0d7d4dc497acbb9ae9293ab906ace85e65f13fb3088bdbd021e46097e",
+                    "hash" : "0x171d90f0d7d4dc497acbb9ae9293ab906ace85e65f13fb3088bdbd021e46097e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "171d90f0d7d4dc497acbb9ae9293ab906ace85e65f13fb3088bdbd021e46097e",
+                    "hash" : "0x171d90f0d7d4dc497acbb9ae9293ab906ace85e65f13fb3088bdbd021e46097e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "171d90f0d7d4dc497acbb9ae9293ab906ace85e65f13fb3088bdbd021e46097e",
+                    "hash" : "0x171d90f0d7d4dc497acbb9ae9293ab906ace85e65f13fb3088bdbd021e46097e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "171d90f0d7d4dc497acbb9ae9293ab906ace85e65f13fb3088bdbd021e46097e",
+                    "hash" : "0x171d90f0d7d4dc497acbb9ae9293ab906ace85e65f13fb3088bdbd021e46097e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "171d90f0d7d4dc497acbb9ae9293ab906ace85e65f13fb3088bdbd021e46097e",
+                    "hash" : "0x171d90f0d7d4dc497acbb9ae9293ab906ace85e65f13fb3088bdbd021e46097e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a617ce152617ce15160015559600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem32kb+31.json b/GeneralStateTests/stMemoryTest/mem32kb+31.json
index 3776277ed..6ecd66490 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb+31.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb+31.json
@@ -1,17 +1,17 @@
 {
     "mem32kb+31 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "431025fb6f5dfd2375add19f1c807edbde060fc825224234b00c1e6bed33693b",
+                    "hash" : "0x431025fb6f5dfd2375add19f1c807edbde060fc825224234b00c1e6bed33693b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "431025fb6f5dfd2375add19f1c807edbde060fc825224234b00c1e6bed33693b",
+                    "hash" : "0x431025fb6f5dfd2375add19f1c807edbde060fc825224234b00c1e6bed33693b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "431025fb6f5dfd2375add19f1c807edbde060fc825224234b00c1e6bed33693b",
+                    "hash" : "0x431025fb6f5dfd2375add19f1c807edbde060fc825224234b00c1e6bed33693b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "431025fb6f5dfd2375add19f1c807edbde060fc825224234b00c1e6bed33693b",
+                    "hash" : "0x431025fb6f5dfd2375add19f1c807edbde060fc825224234b00c1e6bed33693b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "431025fb6f5dfd2375add19f1c807edbde060fc825224234b00c1e6bed33693b",
+                    "hash" : "0x431025fb6f5dfd2375add19f1c807edbde060fc825224234b00c1e6bed33693b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a617cff52617cff5160015559600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem32kb+32.json b/GeneralStateTests/stMemoryTest/mem32kb+32.json
index 1c9ed4e46..218397cfa 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb+32.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb+32.json
@@ -1,17 +1,17 @@
 {
     "mem32kb+32 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "8300e03f4530881e7bf38b31e76bf0ea8b0661b8999bb5c6ed79d548a250fd3f",
+                    "hash" : "0x8300e03f4530881e7bf38b31e76bf0ea8b0661b8999bb5c6ed79d548a250fd3f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "8300e03f4530881e7bf38b31e76bf0ea8b0661b8999bb5c6ed79d548a250fd3f",
+                    "hash" : "0x8300e03f4530881e7bf38b31e76bf0ea8b0661b8999bb5c6ed79d548a250fd3f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "8300e03f4530881e7bf38b31e76bf0ea8b0661b8999bb5c6ed79d548a250fd3f",
+                    "hash" : "0x8300e03f4530881e7bf38b31e76bf0ea8b0661b8999bb5c6ed79d548a250fd3f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "8300e03f4530881e7bf38b31e76bf0ea8b0661b8999bb5c6ed79d548a250fd3f",
+                    "hash" : "0x8300e03f4530881e7bf38b31e76bf0ea8b0661b8999bb5c6ed79d548a250fd3f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "8300e03f4530881e7bf38b31e76bf0ea8b0661b8999bb5c6ed79d548a250fd3f",
+                    "hash" : "0x8300e03f4530881e7bf38b31e76bf0ea8b0661b8999bb5c6ed79d548a250fd3f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a617d0052617d005160015559600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem32kb+33.json b/GeneralStateTests/stMemoryTest/mem32kb+33.json
index 0546c1cb9..a3198d753 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb+33.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb+33.json
@@ -1,17 +1,17 @@
 {
     "mem32kb+33 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "5aeebda7bc76659e25766c04d5e1d33ca3330a057e443093c675cba86c8eba22",
+                    "hash" : "0x5aeebda7bc76659e25766c04d5e1d33ca3330a057e443093c675cba86c8eba22",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "5aeebda7bc76659e25766c04d5e1d33ca3330a057e443093c675cba86c8eba22",
+                    "hash" : "0x5aeebda7bc76659e25766c04d5e1d33ca3330a057e443093c675cba86c8eba22",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5aeebda7bc76659e25766c04d5e1d33ca3330a057e443093c675cba86c8eba22",
+                    "hash" : "0x5aeebda7bc76659e25766c04d5e1d33ca3330a057e443093c675cba86c8eba22",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5aeebda7bc76659e25766c04d5e1d33ca3330a057e443093c675cba86c8eba22",
+                    "hash" : "0x5aeebda7bc76659e25766c04d5e1d33ca3330a057e443093c675cba86c8eba22",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "5aeebda7bc76659e25766c04d5e1d33ca3330a057e443093c675cba86c8eba22",
+                    "hash" : "0x5aeebda7bc76659e25766c04d5e1d33ca3330a057e443093c675cba86c8eba22",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a617d0152617d015160015559600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem32kb-1.json b/GeneralStateTests/stMemoryTest/mem32kb-1.json
index 34781fbde..327c40bda 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb-1.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb-1.json
@@ -1,17 +1,17 @@
 {
     "mem32kb-1 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "74214f4526e90cf38bfaf0df1b0dde9bdde8f28ff7018eb82efba1a27d46df37",
+                    "hash" : "0x74214f4526e90cf38bfaf0df1b0dde9bdde8f28ff7018eb82efba1a27d46df37",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "74214f4526e90cf38bfaf0df1b0dde9bdde8f28ff7018eb82efba1a27d46df37",
+                    "hash" : "0x74214f4526e90cf38bfaf0df1b0dde9bdde8f28ff7018eb82efba1a27d46df37",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "74214f4526e90cf38bfaf0df1b0dde9bdde8f28ff7018eb82efba1a27d46df37",
+                    "hash" : "0x74214f4526e90cf38bfaf0df1b0dde9bdde8f28ff7018eb82efba1a27d46df37",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "74214f4526e90cf38bfaf0df1b0dde9bdde8f28ff7018eb82efba1a27d46df37",
+                    "hash" : "0x74214f4526e90cf38bfaf0df1b0dde9bdde8f28ff7018eb82efba1a27d46df37",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "74214f4526e90cf38bfaf0df1b0dde9bdde8f28ff7018eb82efba1a27d46df37",
+                    "hash" : "0x74214f4526e90cf38bfaf0df1b0dde9bdde8f28ff7018eb82efba1a27d46df37",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a617cdf52617cdf5160015559600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem32kb-31.json b/GeneralStateTests/stMemoryTest/mem32kb-31.json
index 32dbfed25..93e1e87b0 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb-31.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb-31.json
@@ -1,17 +1,17 @@
 {
     "mem32kb-31 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f8d026ebbc585731386c6ea601053567cc8a61cb5d6f914b2ca998434fcaf08d",
+                    "hash" : "0xf8d026ebbc585731386c6ea601053567cc8a61cb5d6f914b2ca998434fcaf08d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f8d026ebbc585731386c6ea601053567cc8a61cb5d6f914b2ca998434fcaf08d",
+                    "hash" : "0xf8d026ebbc585731386c6ea601053567cc8a61cb5d6f914b2ca998434fcaf08d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f8d026ebbc585731386c6ea601053567cc8a61cb5d6f914b2ca998434fcaf08d",
+                    "hash" : "0xf8d026ebbc585731386c6ea601053567cc8a61cb5d6f914b2ca998434fcaf08d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f8d026ebbc585731386c6ea601053567cc8a61cb5d6f914b2ca998434fcaf08d",
+                    "hash" : "0xf8d026ebbc585731386c6ea601053567cc8a61cb5d6f914b2ca998434fcaf08d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f8d026ebbc585731386c6ea601053567cc8a61cb5d6f914b2ca998434fcaf08d",
+                    "hash" : "0xf8d026ebbc585731386c6ea601053567cc8a61cb5d6f914b2ca998434fcaf08d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a617cc152617cc15160015559600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem32kb-32.json b/GeneralStateTests/stMemoryTest/mem32kb-32.json
index e287cb286..f7c8ba5e4 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb-32.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb-32.json
@@ -1,17 +1,17 @@
 {
     "mem32kb-32 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f2ccd3bdd3afd712768712179ccd506a4711ceee3a6903be053399a74077ac61",
+                    "hash" : "0xf2ccd3bdd3afd712768712179ccd506a4711ceee3a6903be053399a74077ac61",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f2ccd3bdd3afd712768712179ccd506a4711ceee3a6903be053399a74077ac61",
+                    "hash" : "0xf2ccd3bdd3afd712768712179ccd506a4711ceee3a6903be053399a74077ac61",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f2ccd3bdd3afd712768712179ccd506a4711ceee3a6903be053399a74077ac61",
+                    "hash" : "0xf2ccd3bdd3afd712768712179ccd506a4711ceee3a6903be053399a74077ac61",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f2ccd3bdd3afd712768712179ccd506a4711ceee3a6903be053399a74077ac61",
+                    "hash" : "0xf2ccd3bdd3afd712768712179ccd506a4711ceee3a6903be053399a74077ac61",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f2ccd3bdd3afd712768712179ccd506a4711ceee3a6903be053399a74077ac61",
+                    "hash" : "0xf2ccd3bdd3afd712768712179ccd506a4711ceee3a6903be053399a74077ac61",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a617cc052617cc05160015559600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem32kb-33.json b/GeneralStateTests/stMemoryTest/mem32kb-33.json
index 9c10fc8f7..89d2f0080 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb-33.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb-33.json
@@ -1,17 +1,17 @@
 {
     "mem32kb-33 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "55bd72cef2f9d05ec55e05fd8117ddab58ef72135d61be72e3a346d262c9f078",
+                    "hash" : "0x55bd72cef2f9d05ec55e05fd8117ddab58ef72135d61be72e3a346d262c9f078",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "55bd72cef2f9d05ec55e05fd8117ddab58ef72135d61be72e3a346d262c9f078",
+                    "hash" : "0x55bd72cef2f9d05ec55e05fd8117ddab58ef72135d61be72e3a346d262c9f078",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "55bd72cef2f9d05ec55e05fd8117ddab58ef72135d61be72e3a346d262c9f078",
+                    "hash" : "0x55bd72cef2f9d05ec55e05fd8117ddab58ef72135d61be72e3a346d262c9f078",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "55bd72cef2f9d05ec55e05fd8117ddab58ef72135d61be72e3a346d262c9f078",
+                    "hash" : "0x55bd72cef2f9d05ec55e05fd8117ddab58ef72135d61be72e3a346d262c9f078",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "55bd72cef2f9d05ec55e05fd8117ddab58ef72135d61be72e3a346d262c9f078",
+                    "hash" : "0x55bd72cef2f9d05ec55e05fd8117ddab58ef72135d61be72e3a346d262c9f078",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a617cbf52617cbf5160015559600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem32kb.json b/GeneralStateTests/stMemoryTest/mem32kb.json
index 245c58c6e..6e5ab827b 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb.json
@@ -1,17 +1,17 @@
 {
     "mem32kb " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "89e9ff8359f5e43c9c09a84961d7ab11f4d939c1aa4698f86324e13a3b2cb60f",
+                    "hash" : "0x89e9ff8359f5e43c9c09a84961d7ab11f4d939c1aa4698f86324e13a3b2cb60f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "89e9ff8359f5e43c9c09a84961d7ab11f4d939c1aa4698f86324e13a3b2cb60f",
+                    "hash" : "0x89e9ff8359f5e43c9c09a84961d7ab11f4d939c1aa4698f86324e13a3b2cb60f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "89e9ff8359f5e43c9c09a84961d7ab11f4d939c1aa4698f86324e13a3b2cb60f",
+                    "hash" : "0x89e9ff8359f5e43c9c09a84961d7ab11f4d939c1aa4698f86324e13a3b2cb60f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "89e9ff8359f5e43c9c09a84961d7ab11f4d939c1aa4698f86324e13a3b2cb60f",
+                    "hash" : "0x89e9ff8359f5e43c9c09a84961d7ab11f4d939c1aa4698f86324e13a3b2cb60f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "89e9ff8359f5e43c9c09a84961d7ab11f4d939c1aa4698f86324e13a3b2cb60f",
+                    "hash" : "0x89e9ff8359f5e43c9c09a84961d7ab11f4d939c1aa4698f86324e13a3b2cb60f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a617ce052617ce05160015559600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem32kb_singleByte+1.json b/GeneralStateTests/stMemoryTest/mem32kb_singleByte+1.json
index ab9687af0..ce3c2e92f 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb_singleByte+1.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb_singleByte+1.json
@@ -1,17 +1,17 @@
 {
     "mem32kb_singleByte+1 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "bce6091d727ff3b6b29ce187a343cf270ecb87fde937d65d32d41d5c4a7d7119",
+                    "hash" : "0xbce6091d727ff3b6b29ce187a343cf270ecb87fde937d65d32d41d5c4a7d7119",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "bce6091d727ff3b6b29ce187a343cf270ecb87fde937d65d32d41d5c4a7d7119",
+                    "hash" : "0xbce6091d727ff3b6b29ce187a343cf270ecb87fde937d65d32d41d5c4a7d7119",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "bce6091d727ff3b6b29ce187a343cf270ecb87fde937d65d32d41d5c4a7d7119",
+                    "hash" : "0xbce6091d727ff3b6b29ce187a343cf270ecb87fde937d65d32d41d5c4a7d7119",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "bce6091d727ff3b6b29ce187a343cf270ecb87fde937d65d32d41d5c4a7d7119",
+                    "hash" : "0xbce6091d727ff3b6b29ce187a343cf270ecb87fde937d65d32d41d5c4a7d7119",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "bce6091d727ff3b6b29ce187a343cf270ecb87fde937d65d32d41d5c4a7d7119",
+                    "hash" : "0xbce6091d727ff3b6b29ce187a343cf270ecb87fde937d65d32d41d5c4a7d7119",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a617d005359600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem32kb_singleByte+31.json b/GeneralStateTests/stMemoryTest/mem32kb_singleByte+31.json
index 952f02bde..300517af9 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb_singleByte+31.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb_singleByte+31.json
@@ -1,17 +1,17 @@
 {
     "mem32kb_singleByte+31 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1cab92d6e5feda6736ef0b0714a018652323598895059e9e36da278c45c871a8",
+                    "hash" : "0x1cab92d6e5feda6736ef0b0714a018652323598895059e9e36da278c45c871a8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "1cab92d6e5feda6736ef0b0714a018652323598895059e9e36da278c45c871a8",
+                    "hash" : "0x1cab92d6e5feda6736ef0b0714a018652323598895059e9e36da278c45c871a8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "1cab92d6e5feda6736ef0b0714a018652323598895059e9e36da278c45c871a8",
+                    "hash" : "0x1cab92d6e5feda6736ef0b0714a018652323598895059e9e36da278c45c871a8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "1cab92d6e5feda6736ef0b0714a018652323598895059e9e36da278c45c871a8",
+                    "hash" : "0x1cab92d6e5feda6736ef0b0714a018652323598895059e9e36da278c45c871a8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "1cab92d6e5feda6736ef0b0714a018652323598895059e9e36da278c45c871a8",
+                    "hash" : "0x1cab92d6e5feda6736ef0b0714a018652323598895059e9e36da278c45c871a8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a617d1e5359600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem32kb_singleByte+32.json b/GeneralStateTests/stMemoryTest/mem32kb_singleByte+32.json
index c6e0c3e3d..430043534 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb_singleByte+32.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb_singleByte+32.json
@@ -1,17 +1,17 @@
 {
     "mem32kb_singleByte+32 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "75efddbdc85b42ff3c7550bf024c89151a8ea87d117ecadedfd6e7581e5f358d",
+                    "hash" : "0x75efddbdc85b42ff3c7550bf024c89151a8ea87d117ecadedfd6e7581e5f358d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "75efddbdc85b42ff3c7550bf024c89151a8ea87d117ecadedfd6e7581e5f358d",
+                    "hash" : "0x75efddbdc85b42ff3c7550bf024c89151a8ea87d117ecadedfd6e7581e5f358d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "75efddbdc85b42ff3c7550bf024c89151a8ea87d117ecadedfd6e7581e5f358d",
+                    "hash" : "0x75efddbdc85b42ff3c7550bf024c89151a8ea87d117ecadedfd6e7581e5f358d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "75efddbdc85b42ff3c7550bf024c89151a8ea87d117ecadedfd6e7581e5f358d",
+                    "hash" : "0x75efddbdc85b42ff3c7550bf024c89151a8ea87d117ecadedfd6e7581e5f358d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "75efddbdc85b42ff3c7550bf024c89151a8ea87d117ecadedfd6e7581e5f358d",
+                    "hash" : "0x75efddbdc85b42ff3c7550bf024c89151a8ea87d117ecadedfd6e7581e5f358d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a617d1f5359600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem32kb_singleByte+33.json b/GeneralStateTests/stMemoryTest/mem32kb_singleByte+33.json
index 03aa6b5d0..04b5ccadb 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb_singleByte+33.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb_singleByte+33.json
@@ -1,17 +1,17 @@
 {
     "mem32kb_singleByte+33 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "07b152dfa501fa5581f636f29e759de90c51922b9d2b7cc92ddb8d284049a911",
+                    "hash" : "0x07b152dfa501fa5581f636f29e759de90c51922b9d2b7cc92ddb8d284049a911",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "07b152dfa501fa5581f636f29e759de90c51922b9d2b7cc92ddb8d284049a911",
+                    "hash" : "0x07b152dfa501fa5581f636f29e759de90c51922b9d2b7cc92ddb8d284049a911",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "07b152dfa501fa5581f636f29e759de90c51922b9d2b7cc92ddb8d284049a911",
+                    "hash" : "0x07b152dfa501fa5581f636f29e759de90c51922b9d2b7cc92ddb8d284049a911",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "07b152dfa501fa5581f636f29e759de90c51922b9d2b7cc92ddb8d284049a911",
+                    "hash" : "0x07b152dfa501fa5581f636f29e759de90c51922b9d2b7cc92ddb8d284049a911",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "07b152dfa501fa5581f636f29e759de90c51922b9d2b7cc92ddb8d284049a911",
+                    "hash" : "0x07b152dfa501fa5581f636f29e759de90c51922b9d2b7cc92ddb8d284049a911",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a617d205359600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem32kb_singleByte-1.json b/GeneralStateTests/stMemoryTest/mem32kb_singleByte-1.json
index b5da53e09..90e06527e 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb_singleByte-1.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb_singleByte-1.json
@@ -1,17 +1,17 @@
 {
     "mem32kb_singleByte-1 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "dfaacf050276c37e00aa5cbbcdc87a77cedf780556330796cb6dd775498c7585",
+                    "hash" : "0xdfaacf050276c37e00aa5cbbcdc87a77cedf780556330796cb6dd775498c7585",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "dfaacf050276c37e00aa5cbbcdc87a77cedf780556330796cb6dd775498c7585",
+                    "hash" : "0xdfaacf050276c37e00aa5cbbcdc87a77cedf780556330796cb6dd775498c7585",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "dfaacf050276c37e00aa5cbbcdc87a77cedf780556330796cb6dd775498c7585",
+                    "hash" : "0xdfaacf050276c37e00aa5cbbcdc87a77cedf780556330796cb6dd775498c7585",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "dfaacf050276c37e00aa5cbbcdc87a77cedf780556330796cb6dd775498c7585",
+                    "hash" : "0xdfaacf050276c37e00aa5cbbcdc87a77cedf780556330796cb6dd775498c7585",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "dfaacf050276c37e00aa5cbbcdc87a77cedf780556330796cb6dd775498c7585",
+                    "hash" : "0xdfaacf050276c37e00aa5cbbcdc87a77cedf780556330796cb6dd775498c7585",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a617cfe5359600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem32kb_singleByte-31.json b/GeneralStateTests/stMemoryTest/mem32kb_singleByte-31.json
index 1922693a1..3a77bd255 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb_singleByte-31.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb_singleByte-31.json
@@ -1,17 +1,17 @@
 {
     "mem32kb_singleByte-31 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "91e686a5caf72969cc88c885746cefa69b3089a80543eb9c75f2f2ce822b1e08",
+                    "hash" : "0x91e686a5caf72969cc88c885746cefa69b3089a80543eb9c75f2f2ce822b1e08",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "91e686a5caf72969cc88c885746cefa69b3089a80543eb9c75f2f2ce822b1e08",
+                    "hash" : "0x91e686a5caf72969cc88c885746cefa69b3089a80543eb9c75f2f2ce822b1e08",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "91e686a5caf72969cc88c885746cefa69b3089a80543eb9c75f2f2ce822b1e08",
+                    "hash" : "0x91e686a5caf72969cc88c885746cefa69b3089a80543eb9c75f2f2ce822b1e08",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "91e686a5caf72969cc88c885746cefa69b3089a80543eb9c75f2f2ce822b1e08",
+                    "hash" : "0x91e686a5caf72969cc88c885746cefa69b3089a80543eb9c75f2f2ce822b1e08",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "91e686a5caf72969cc88c885746cefa69b3089a80543eb9c75f2f2ce822b1e08",
+                    "hash" : "0x91e686a5caf72969cc88c885746cefa69b3089a80543eb9c75f2f2ce822b1e08",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a617ce05359600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem32kb_singleByte-32.json b/GeneralStateTests/stMemoryTest/mem32kb_singleByte-32.json
index b430b2360..cd6d3b1d6 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb_singleByte-32.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb_singleByte-32.json
@@ -1,17 +1,17 @@
 {
     "mem32kb_singleByte-32 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "656252dfd066c252bc1a9c8b26fd3872596a192ce72b2fa09eb7148deef623a1",
+                    "hash" : "0x656252dfd066c252bc1a9c8b26fd3872596a192ce72b2fa09eb7148deef623a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "656252dfd066c252bc1a9c8b26fd3872596a192ce72b2fa09eb7148deef623a1",
+                    "hash" : "0x656252dfd066c252bc1a9c8b26fd3872596a192ce72b2fa09eb7148deef623a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "656252dfd066c252bc1a9c8b26fd3872596a192ce72b2fa09eb7148deef623a1",
+                    "hash" : "0x656252dfd066c252bc1a9c8b26fd3872596a192ce72b2fa09eb7148deef623a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "656252dfd066c252bc1a9c8b26fd3872596a192ce72b2fa09eb7148deef623a1",
+                    "hash" : "0x656252dfd066c252bc1a9c8b26fd3872596a192ce72b2fa09eb7148deef623a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "656252dfd066c252bc1a9c8b26fd3872596a192ce72b2fa09eb7148deef623a1",
+                    "hash" : "0x656252dfd066c252bc1a9c8b26fd3872596a192ce72b2fa09eb7148deef623a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a617cdf5359600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem32kb_singleByte-33.json b/GeneralStateTests/stMemoryTest/mem32kb_singleByte-33.json
index 6919485bf..31c07b5b2 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb_singleByte-33.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb_singleByte-33.json
@@ -1,17 +1,17 @@
 {
     "mem32kb_singleByte-33 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "176a30044205d80912efbb8c7ce308991823647e10a9bc68059ec54f086472f5",
+                    "hash" : "0x176a30044205d80912efbb8c7ce308991823647e10a9bc68059ec54f086472f5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "176a30044205d80912efbb8c7ce308991823647e10a9bc68059ec54f086472f5",
+                    "hash" : "0x176a30044205d80912efbb8c7ce308991823647e10a9bc68059ec54f086472f5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "176a30044205d80912efbb8c7ce308991823647e10a9bc68059ec54f086472f5",
+                    "hash" : "0x176a30044205d80912efbb8c7ce308991823647e10a9bc68059ec54f086472f5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "176a30044205d80912efbb8c7ce308991823647e10a9bc68059ec54f086472f5",
+                    "hash" : "0x176a30044205d80912efbb8c7ce308991823647e10a9bc68059ec54f086472f5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "176a30044205d80912efbb8c7ce308991823647e10a9bc68059ec54f086472f5",
+                    "hash" : "0x176a30044205d80912efbb8c7ce308991823647e10a9bc68059ec54f086472f5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a617cde5359600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem32kb_singleByte.json b/GeneralStateTests/stMemoryTest/mem32kb_singleByte.json
index 321b4b06c..275d47391 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb_singleByte.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb_singleByte.json
@@ -1,17 +1,17 @@
 {
     "mem32kb_singleByte " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "40285d734359495522cfab98a87348a90ecc13735492c974c58ffa9965e39b21",
+                    "hash" : "0x40285d734359495522cfab98a87348a90ecc13735492c974c58ffa9965e39b21",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "40285d734359495522cfab98a87348a90ecc13735492c974c58ffa9965e39b21",
+                    "hash" : "0x40285d734359495522cfab98a87348a90ecc13735492c974c58ffa9965e39b21",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "40285d734359495522cfab98a87348a90ecc13735492c974c58ffa9965e39b21",
+                    "hash" : "0x40285d734359495522cfab98a87348a90ecc13735492c974c58ffa9965e39b21",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "40285d734359495522cfab98a87348a90ecc13735492c974c58ffa9965e39b21",
+                    "hash" : "0x40285d734359495522cfab98a87348a90ecc13735492c974c58ffa9965e39b21",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "40285d734359495522cfab98a87348a90ecc13735492c974c58ffa9965e39b21",
+                    "hash" : "0x40285d734359495522cfab98a87348a90ecc13735492c974c58ffa9965e39b21",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a617cff5359600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem33b_singleByte.json b/GeneralStateTests/stMemoryTest/mem33b_singleByte.json
index 3abac6366..18cf6e2e2 100644
--- a/GeneralStateTests/stMemoryTest/mem33b_singleByte.json
+++ b/GeneralStateTests/stMemoryTest/mem33b_singleByte.json
@@ -1,17 +1,17 @@
 {
     "mem33b_singleByte " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "8c85aa000727196f46d60276a9d5f7e5f1fa3c227564037d4e67f485acc28143",
+                    "hash" : "0x8c85aa000727196f46d60276a9d5f7e5f1fa3c227564037d4e67f485acc28143",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "8c85aa000727196f46d60276a9d5f7e5f1fa3c227564037d4e67f485acc28143",
+                    "hash" : "0x8c85aa000727196f46d60276a9d5f7e5f1fa3c227564037d4e67f485acc28143",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "8c85aa000727196f46d60276a9d5f7e5f1fa3c227564037d4e67f485acc28143",
+                    "hash" : "0x8c85aa000727196f46d60276a9d5f7e5f1fa3c227564037d4e67f485acc28143",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "8c85aa000727196f46d60276a9d5f7e5f1fa3c227564037d4e67f485acc28143",
+                    "hash" : "0x8c85aa000727196f46d60276a9d5f7e5f1fa3c227564037d4e67f485acc28143",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "8c85aa000727196f46d60276a9d5f7e5f1fa3c227564037d4e67f485acc28143",
+                    "hash" : "0x8c85aa000727196f46d60276a9d5f7e5f1fa3c227564037d4e67f485acc28143",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a60205359600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem64kb+1.json b/GeneralStateTests/stMemoryTest/mem64kb+1.json
index 63426d14f..2c05fd1f5 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb+1.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb+1.json
@@ -1,17 +1,17 @@
 {
     "mem64kb+1 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "3fd0c39dc30723b802d138155edd2d9799d1a5a9f099188e93a177fdaf230b9a",
+                    "hash" : "0x3fd0c39dc30723b802d138155edd2d9799d1a5a9f099188e93a177fdaf230b9a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "3fd0c39dc30723b802d138155edd2d9799d1a5a9f099188e93a177fdaf230b9a",
+                    "hash" : "0x3fd0c39dc30723b802d138155edd2d9799d1a5a9f099188e93a177fdaf230b9a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3fd0c39dc30723b802d138155edd2d9799d1a5a9f099188e93a177fdaf230b9a",
+                    "hash" : "0x3fd0c39dc30723b802d138155edd2d9799d1a5a9f099188e93a177fdaf230b9a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3fd0c39dc30723b802d138155edd2d9799d1a5a9f099188e93a177fdaf230b9a",
+                    "hash" : "0x3fd0c39dc30723b802d138155edd2d9799d1a5a9f099188e93a177fdaf230b9a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "3fd0c39dc30723b802d138155edd2d9799d1a5a9f099188e93a177fdaf230b9a",
+                    "hash" : "0x3fd0c39dc30723b802d138155edd2d9799d1a5a9f099188e93a177fdaf230b9a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a61f9e15261f9e15160015559600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem64kb+31.json b/GeneralStateTests/stMemoryTest/mem64kb+31.json
index 819042436..cdfdef202 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb+31.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb+31.json
@@ -1,17 +1,17 @@
 {
     "mem64kb+31 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "4672c61dc31cdc14f6549392777b8e6be4290c41b4d49d76f9928843d8d6020b",
+                    "hash" : "0x4672c61dc31cdc14f6549392777b8e6be4290c41b4d49d76f9928843d8d6020b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "4672c61dc31cdc14f6549392777b8e6be4290c41b4d49d76f9928843d8d6020b",
+                    "hash" : "0x4672c61dc31cdc14f6549392777b8e6be4290c41b4d49d76f9928843d8d6020b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4672c61dc31cdc14f6549392777b8e6be4290c41b4d49d76f9928843d8d6020b",
+                    "hash" : "0x4672c61dc31cdc14f6549392777b8e6be4290c41b4d49d76f9928843d8d6020b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4672c61dc31cdc14f6549392777b8e6be4290c41b4d49d76f9928843d8d6020b",
+                    "hash" : "0x4672c61dc31cdc14f6549392777b8e6be4290c41b4d49d76f9928843d8d6020b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "4672c61dc31cdc14f6549392777b8e6be4290c41b4d49d76f9928843d8d6020b",
+                    "hash" : "0x4672c61dc31cdc14f6549392777b8e6be4290c41b4d49d76f9928843d8d6020b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a61f9ff5261f9ff5160015559600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem64kb+32.json b/GeneralStateTests/stMemoryTest/mem64kb+32.json
index 6df5f38b6..ad871eba0 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb+32.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb+32.json
@@ -1,17 +1,17 @@
 {
     "mem64kb+32 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "749757456f4bf99685777d121180aa1b8824cfe2096fed7fa98220e5f3043fda",
+                    "hash" : "0x749757456f4bf99685777d121180aa1b8824cfe2096fed7fa98220e5f3043fda",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "749757456f4bf99685777d121180aa1b8824cfe2096fed7fa98220e5f3043fda",
+                    "hash" : "0x749757456f4bf99685777d121180aa1b8824cfe2096fed7fa98220e5f3043fda",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "749757456f4bf99685777d121180aa1b8824cfe2096fed7fa98220e5f3043fda",
+                    "hash" : "0x749757456f4bf99685777d121180aa1b8824cfe2096fed7fa98220e5f3043fda",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "749757456f4bf99685777d121180aa1b8824cfe2096fed7fa98220e5f3043fda",
+                    "hash" : "0x749757456f4bf99685777d121180aa1b8824cfe2096fed7fa98220e5f3043fda",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "749757456f4bf99685777d121180aa1b8824cfe2096fed7fa98220e5f3043fda",
+                    "hash" : "0x749757456f4bf99685777d121180aa1b8824cfe2096fed7fa98220e5f3043fda",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a61fa005261fa005160015559600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem64kb+33.json b/GeneralStateTests/stMemoryTest/mem64kb+33.json
index c825cbed7..f27e5b451 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb+33.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb+33.json
@@ -1,17 +1,17 @@
 {
     "mem64kb+33 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "2b3c2cfc0fe0a279d8198025a6b6e4d840a4e93308276e89a52ab4d047bbfd24",
+                    "hash" : "0x2b3c2cfc0fe0a279d8198025a6b6e4d840a4e93308276e89a52ab4d047bbfd24",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "2b3c2cfc0fe0a279d8198025a6b6e4d840a4e93308276e89a52ab4d047bbfd24",
+                    "hash" : "0x2b3c2cfc0fe0a279d8198025a6b6e4d840a4e93308276e89a52ab4d047bbfd24",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2b3c2cfc0fe0a279d8198025a6b6e4d840a4e93308276e89a52ab4d047bbfd24",
+                    "hash" : "0x2b3c2cfc0fe0a279d8198025a6b6e4d840a4e93308276e89a52ab4d047bbfd24",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "2b3c2cfc0fe0a279d8198025a6b6e4d840a4e93308276e89a52ab4d047bbfd24",
+                    "hash" : "0x2b3c2cfc0fe0a279d8198025a6b6e4d840a4e93308276e89a52ab4d047bbfd24",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "2b3c2cfc0fe0a279d8198025a6b6e4d840a4e93308276e89a52ab4d047bbfd24",
+                    "hash" : "0x2b3c2cfc0fe0a279d8198025a6b6e4d840a4e93308276e89a52ab4d047bbfd24",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a61fa015261fa015160015559600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem64kb-1.json b/GeneralStateTests/stMemoryTest/mem64kb-1.json
index 3f54a319e..989dd37b5 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb-1.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb-1.json
@@ -1,17 +1,17 @@
 {
     "mem64kb-1 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9865c60dd34920cc8b049c244fbfbe6a5525290ba78b323680ee9e6ee44d302a",
+                    "hash" : "0x9865c60dd34920cc8b049c244fbfbe6a5525290ba78b323680ee9e6ee44d302a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9865c60dd34920cc8b049c244fbfbe6a5525290ba78b323680ee9e6ee44d302a",
+                    "hash" : "0x9865c60dd34920cc8b049c244fbfbe6a5525290ba78b323680ee9e6ee44d302a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9865c60dd34920cc8b049c244fbfbe6a5525290ba78b323680ee9e6ee44d302a",
+                    "hash" : "0x9865c60dd34920cc8b049c244fbfbe6a5525290ba78b323680ee9e6ee44d302a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9865c60dd34920cc8b049c244fbfbe6a5525290ba78b323680ee9e6ee44d302a",
+                    "hash" : "0x9865c60dd34920cc8b049c244fbfbe6a5525290ba78b323680ee9e6ee44d302a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9865c60dd34920cc8b049c244fbfbe6a5525290ba78b323680ee9e6ee44d302a",
+                    "hash" : "0x9865c60dd34920cc8b049c244fbfbe6a5525290ba78b323680ee9e6ee44d302a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a61f9df5261f9df5160015559600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183640"
+                "0x500018d8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem64kb-31.json b/GeneralStateTests/stMemoryTest/mem64kb-31.json
index ee171d486..6cfd20981 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb-31.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb-31.json
@@ -1,17 +1,17 @@
 {
     "mem64kb-31 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "fd3557635cb0b3fc93f76329006b2358ed056c1d8e63ae95fd218e5d77a34c97",
+                    "hash" : "0xfd3557635cb0b3fc93f76329006b2358ed056c1d8e63ae95fd218e5d77a34c97",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "fd3557635cb0b3fc93f76329006b2358ed056c1d8e63ae95fd218e5d77a34c97",
+                    "hash" : "0xfd3557635cb0b3fc93f76329006b2358ed056c1d8e63ae95fd218e5d77a34c97",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "fd3557635cb0b3fc93f76329006b2358ed056c1d8e63ae95fd218e5d77a34c97",
+                    "hash" : "0xfd3557635cb0b3fc93f76329006b2358ed056c1d8e63ae95fd218e5d77a34c97",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "fd3557635cb0b3fc93f76329006b2358ed056c1d8e63ae95fd218e5d77a34c97",
+                    "hash" : "0xfd3557635cb0b3fc93f76329006b2358ed056c1d8e63ae95fd218e5d77a34c97",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "fd3557635cb0b3fc93f76329006b2358ed056c1d8e63ae95fd218e5d77a34c97",
+                    "hash" : "0xfd3557635cb0b3fc93f76329006b2358ed056c1d8e63ae95fd218e5d77a34c97",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a61f9c15261f9c15160015559600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183640"
+                "0x500018d8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem64kb-32.json b/GeneralStateTests/stMemoryTest/mem64kb-32.json
index 474111524..da74cdb16 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb-32.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb-32.json
@@ -1,17 +1,17 @@
 {
     "mem64kb-32 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "bb8997f7b498ae27647ba01f44e89446b901ccb9cc31167c2c980a420aaa7ff1",
+                    "hash" : "0xbb8997f7b498ae27647ba01f44e89446b901ccb9cc31167c2c980a420aaa7ff1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "bb8997f7b498ae27647ba01f44e89446b901ccb9cc31167c2c980a420aaa7ff1",
+                    "hash" : "0xbb8997f7b498ae27647ba01f44e89446b901ccb9cc31167c2c980a420aaa7ff1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "bb8997f7b498ae27647ba01f44e89446b901ccb9cc31167c2c980a420aaa7ff1",
+                    "hash" : "0xbb8997f7b498ae27647ba01f44e89446b901ccb9cc31167c2c980a420aaa7ff1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "bb8997f7b498ae27647ba01f44e89446b901ccb9cc31167c2c980a420aaa7ff1",
+                    "hash" : "0xbb8997f7b498ae27647ba01f44e89446b901ccb9cc31167c2c980a420aaa7ff1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "bb8997f7b498ae27647ba01f44e89446b901ccb9cc31167c2c980a420aaa7ff1",
+                    "hash" : "0xbb8997f7b498ae27647ba01f44e89446b901ccb9cc31167c2c980a420aaa7ff1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a61f9c05261f9c05160015559600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183640"
+                "0x500018d8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem64kb-33.json b/GeneralStateTests/stMemoryTest/mem64kb-33.json
index 58c156040..a2362e1c9 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb-33.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb-33.json
@@ -1,17 +1,17 @@
 {
     "mem64kb-33 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a631dedf42e2d3c1716243107eb5e916b9a24c36dae8943bf785bda6b9f07607",
+                    "hash" : "0xa631dedf42e2d3c1716243107eb5e916b9a24c36dae8943bf785bda6b9f07607",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a631dedf42e2d3c1716243107eb5e916b9a24c36dae8943bf785bda6b9f07607",
+                    "hash" : "0xa631dedf42e2d3c1716243107eb5e916b9a24c36dae8943bf785bda6b9f07607",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a631dedf42e2d3c1716243107eb5e916b9a24c36dae8943bf785bda6b9f07607",
+                    "hash" : "0xa631dedf42e2d3c1716243107eb5e916b9a24c36dae8943bf785bda6b9f07607",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a631dedf42e2d3c1716243107eb5e916b9a24c36dae8943bf785bda6b9f07607",
+                    "hash" : "0xa631dedf42e2d3c1716243107eb5e916b9a24c36dae8943bf785bda6b9f07607",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a631dedf42e2d3c1716243107eb5e916b9a24c36dae8943bf785bda6b9f07607",
+                    "hash" : "0xa631dedf42e2d3c1716243107eb5e916b9a24c36dae8943bf785bda6b9f07607",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a61f9bf5261f9bf5160015559600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem64kb.json b/GeneralStateTests/stMemoryTest/mem64kb.json
index 1adbb39e4..39342d69d 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb.json
@@ -1,17 +1,17 @@
 {
     "mem64kb " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "bae3c3d010418555a351cd124aa6260c2b97744a53c3f69239099e890e03183c",
+                    "hash" : "0xbae3c3d010418555a351cd124aa6260c2b97744a53c3f69239099e890e03183c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "bae3c3d010418555a351cd124aa6260c2b97744a53c3f69239099e890e03183c",
+                    "hash" : "0xbae3c3d010418555a351cd124aa6260c2b97744a53c3f69239099e890e03183c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "bae3c3d010418555a351cd124aa6260c2b97744a53c3f69239099e890e03183c",
+                    "hash" : "0xbae3c3d010418555a351cd124aa6260c2b97744a53c3f69239099e890e03183c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "bae3c3d010418555a351cd124aa6260c2b97744a53c3f69239099e890e03183c",
+                    "hash" : "0xbae3c3d010418555a351cd124aa6260c2b97744a53c3f69239099e890e03183c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "bae3c3d010418555a351cd124aa6260c2b97744a53c3f69239099e890e03183c",
+                    "hash" : "0xbae3c3d010418555a351cd124aa6260c2b97744a53c3f69239099e890e03183c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a61f9e05261f9e05160015559600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183640"
+                "0x500018d8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem64kb_singleByte+1.json b/GeneralStateTests/stMemoryTest/mem64kb_singleByte+1.json
index 3d49ca0b7..dc43607ff 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb_singleByte+1.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb_singleByte+1.json
@@ -1,17 +1,17 @@
 {
     "mem64kb_singleByte+1 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "fc23dd420b833dbfcf772497eff7a70a6bc226629092097461cac9ce73cdc67a",
+                    "hash" : "0xfc23dd420b833dbfcf772497eff7a70a6bc226629092097461cac9ce73cdc67a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "fc23dd420b833dbfcf772497eff7a70a6bc226629092097461cac9ce73cdc67a",
+                    "hash" : "0xfc23dd420b833dbfcf772497eff7a70a6bc226629092097461cac9ce73cdc67a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "fc23dd420b833dbfcf772497eff7a70a6bc226629092097461cac9ce73cdc67a",
+                    "hash" : "0xfc23dd420b833dbfcf772497eff7a70a6bc226629092097461cac9ce73cdc67a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "fc23dd420b833dbfcf772497eff7a70a6bc226629092097461cac9ce73cdc67a",
+                    "hash" : "0xfc23dd420b833dbfcf772497eff7a70a6bc226629092097461cac9ce73cdc67a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "fc23dd420b833dbfcf772497eff7a70a6bc226629092097461cac9ce73cdc67a",
+                    "hash" : "0xfc23dd420b833dbfcf772497eff7a70a6bc226629092097461cac9ce73cdc67a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a61fa005359600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem64kb_singleByte+31.json b/GeneralStateTests/stMemoryTest/mem64kb_singleByte+31.json
index f82e400ce..5b2cea0e4 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb_singleByte+31.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb_singleByte+31.json
@@ -1,17 +1,17 @@
 {
     "mem64kb_singleByte+31 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "3c64f6daf9a82afa20b701121f233c206266672f7c31483c2d1c6b672dcce3a4",
+                    "hash" : "0x3c64f6daf9a82afa20b701121f233c206266672f7c31483c2d1c6b672dcce3a4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "3c64f6daf9a82afa20b701121f233c206266672f7c31483c2d1c6b672dcce3a4",
+                    "hash" : "0x3c64f6daf9a82afa20b701121f233c206266672f7c31483c2d1c6b672dcce3a4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3c64f6daf9a82afa20b701121f233c206266672f7c31483c2d1c6b672dcce3a4",
+                    "hash" : "0x3c64f6daf9a82afa20b701121f233c206266672f7c31483c2d1c6b672dcce3a4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3c64f6daf9a82afa20b701121f233c206266672f7c31483c2d1c6b672dcce3a4",
+                    "hash" : "0x3c64f6daf9a82afa20b701121f233c206266672f7c31483c2d1c6b672dcce3a4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "3c64f6daf9a82afa20b701121f233c206266672f7c31483c2d1c6b672dcce3a4",
+                    "hash" : "0x3c64f6daf9a82afa20b701121f233c206266672f7c31483c2d1c6b672dcce3a4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a61fa1e5359600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem64kb_singleByte+32.json b/GeneralStateTests/stMemoryTest/mem64kb_singleByte+32.json
index 79ff63f8d..80a54f704 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb_singleByte+32.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb_singleByte+32.json
@@ -1,17 +1,17 @@
 {
     "mem64kb_singleByte+32 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "df6fea74bff863af3b7cad335c92752c62a8f98ca94608d9976d841fc4125978",
+                    "hash" : "0xdf6fea74bff863af3b7cad335c92752c62a8f98ca94608d9976d841fc4125978",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "df6fea74bff863af3b7cad335c92752c62a8f98ca94608d9976d841fc4125978",
+                    "hash" : "0xdf6fea74bff863af3b7cad335c92752c62a8f98ca94608d9976d841fc4125978",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "df6fea74bff863af3b7cad335c92752c62a8f98ca94608d9976d841fc4125978",
+                    "hash" : "0xdf6fea74bff863af3b7cad335c92752c62a8f98ca94608d9976d841fc4125978",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "df6fea74bff863af3b7cad335c92752c62a8f98ca94608d9976d841fc4125978",
+                    "hash" : "0xdf6fea74bff863af3b7cad335c92752c62a8f98ca94608d9976d841fc4125978",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "df6fea74bff863af3b7cad335c92752c62a8f98ca94608d9976d841fc4125978",
+                    "hash" : "0xdf6fea74bff863af3b7cad335c92752c62a8f98ca94608d9976d841fc4125978",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a61fa1f5359600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem64kb_singleByte+33.json b/GeneralStateTests/stMemoryTest/mem64kb_singleByte+33.json
index 927c5e706..63631d044 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb_singleByte+33.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb_singleByte+33.json
@@ -1,17 +1,17 @@
 {
     "mem64kb_singleByte+33 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "dc9d2ddccb9a13e924b6792d42425ac4315003cc25d99ca08babfd650bb011c7",
+                    "hash" : "0xdc9d2ddccb9a13e924b6792d42425ac4315003cc25d99ca08babfd650bb011c7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "dc9d2ddccb9a13e924b6792d42425ac4315003cc25d99ca08babfd650bb011c7",
+                    "hash" : "0xdc9d2ddccb9a13e924b6792d42425ac4315003cc25d99ca08babfd650bb011c7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "dc9d2ddccb9a13e924b6792d42425ac4315003cc25d99ca08babfd650bb011c7",
+                    "hash" : "0xdc9d2ddccb9a13e924b6792d42425ac4315003cc25d99ca08babfd650bb011c7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "dc9d2ddccb9a13e924b6792d42425ac4315003cc25d99ca08babfd650bb011c7",
+                    "hash" : "0xdc9d2ddccb9a13e924b6792d42425ac4315003cc25d99ca08babfd650bb011c7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "dc9d2ddccb9a13e924b6792d42425ac4315003cc25d99ca08babfd650bb011c7",
+                    "hash" : "0xdc9d2ddccb9a13e924b6792d42425ac4315003cc25d99ca08babfd650bb011c7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a61fa205359600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem64kb_singleByte-1.json b/GeneralStateTests/stMemoryTest/mem64kb_singleByte-1.json
index 9e87dede6..fe4ea1ff1 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb_singleByte-1.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb_singleByte-1.json
@@ -1,17 +1,17 @@
 {
     "mem64kb_singleByte-1 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "3134bbc4d51a887ad390a20299609bc4ce33dce55ae5a93cb2f438c9574ee6ba",
+                    "hash" : "0x3134bbc4d51a887ad390a20299609bc4ce33dce55ae5a93cb2f438c9574ee6ba",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "3134bbc4d51a887ad390a20299609bc4ce33dce55ae5a93cb2f438c9574ee6ba",
+                    "hash" : "0x3134bbc4d51a887ad390a20299609bc4ce33dce55ae5a93cb2f438c9574ee6ba",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3134bbc4d51a887ad390a20299609bc4ce33dce55ae5a93cb2f438c9574ee6ba",
+                    "hash" : "0x3134bbc4d51a887ad390a20299609bc4ce33dce55ae5a93cb2f438c9574ee6ba",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3134bbc4d51a887ad390a20299609bc4ce33dce55ae5a93cb2f438c9574ee6ba",
+                    "hash" : "0x3134bbc4d51a887ad390a20299609bc4ce33dce55ae5a93cb2f438c9574ee6ba",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "3134bbc4d51a887ad390a20299609bc4ce33dce55ae5a93cb2f438c9574ee6ba",
+                    "hash" : "0x3134bbc4d51a887ad390a20299609bc4ce33dce55ae5a93cb2f438c9574ee6ba",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a61f9fe5359600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem64kb_singleByte-31.json b/GeneralStateTests/stMemoryTest/mem64kb_singleByte-31.json
index 02e9c4691..72a70a351 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb_singleByte-31.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb_singleByte-31.json
@@ -1,17 +1,17 @@
 {
     "mem64kb_singleByte-31 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "18f01239fc57124bb4ea01c93cc534a790b83e7a15dbb4a7e6b0e078e6c2e389",
+                    "hash" : "0x18f01239fc57124bb4ea01c93cc534a790b83e7a15dbb4a7e6b0e078e6c2e389",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "18f01239fc57124bb4ea01c93cc534a790b83e7a15dbb4a7e6b0e078e6c2e389",
+                    "hash" : "0x18f01239fc57124bb4ea01c93cc534a790b83e7a15dbb4a7e6b0e078e6c2e389",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "18f01239fc57124bb4ea01c93cc534a790b83e7a15dbb4a7e6b0e078e6c2e389",
+                    "hash" : "0x18f01239fc57124bb4ea01c93cc534a790b83e7a15dbb4a7e6b0e078e6c2e389",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "18f01239fc57124bb4ea01c93cc534a790b83e7a15dbb4a7e6b0e078e6c2e389",
+                    "hash" : "0x18f01239fc57124bb4ea01c93cc534a790b83e7a15dbb4a7e6b0e078e6c2e389",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "18f01239fc57124bb4ea01c93cc534a790b83e7a15dbb4a7e6b0e078e6c2e389",
+                    "hash" : "0x18f01239fc57124bb4ea01c93cc534a790b83e7a15dbb4a7e6b0e078e6c2e389",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a61f9e05359600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem64kb_singleByte-32.json b/GeneralStateTests/stMemoryTest/mem64kb_singleByte-32.json
index d964d9d6d..b4fb0a4b5 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb_singleByte-32.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb_singleByte-32.json
@@ -1,17 +1,17 @@
 {
     "mem64kb_singleByte-32 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1642f55308622bc1a705dc5c3cc62816d433ad263ec5847b62dd51af677930a7",
+                    "hash" : "0x1642f55308622bc1a705dc5c3cc62816d433ad263ec5847b62dd51af677930a7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "1642f55308622bc1a705dc5c3cc62816d433ad263ec5847b62dd51af677930a7",
+                    "hash" : "0x1642f55308622bc1a705dc5c3cc62816d433ad263ec5847b62dd51af677930a7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "1642f55308622bc1a705dc5c3cc62816d433ad263ec5847b62dd51af677930a7",
+                    "hash" : "0x1642f55308622bc1a705dc5c3cc62816d433ad263ec5847b62dd51af677930a7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "1642f55308622bc1a705dc5c3cc62816d433ad263ec5847b62dd51af677930a7",
+                    "hash" : "0x1642f55308622bc1a705dc5c3cc62816d433ad263ec5847b62dd51af677930a7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "1642f55308622bc1a705dc5c3cc62816d433ad263ec5847b62dd51af677930a7",
+                    "hash" : "0x1642f55308622bc1a705dc5c3cc62816d433ad263ec5847b62dd51af677930a7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a61f9df5359600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem64kb_singleByte-33.json b/GeneralStateTests/stMemoryTest/mem64kb_singleByte-33.json
index 1dc9eb1f2..8893f67e5 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb_singleByte-33.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb_singleByte-33.json
@@ -1,17 +1,17 @@
 {
     "mem64kb_singleByte-33 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "01c97ed590df6f0773df08a1fd59b4bfd7771a755443d1c01f17d563b9999bdf",
+                    "hash" : "0x01c97ed590df6f0773df08a1fd59b4bfd7771a755443d1c01f17d563b9999bdf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "01c97ed590df6f0773df08a1fd59b4bfd7771a755443d1c01f17d563b9999bdf",
+                    "hash" : "0x01c97ed590df6f0773df08a1fd59b4bfd7771a755443d1c01f17d563b9999bdf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "01c97ed590df6f0773df08a1fd59b4bfd7771a755443d1c01f17d563b9999bdf",
+                    "hash" : "0x01c97ed590df6f0773df08a1fd59b4bfd7771a755443d1c01f17d563b9999bdf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "01c97ed590df6f0773df08a1fd59b4bfd7771a755443d1c01f17d563b9999bdf",
+                    "hash" : "0x01c97ed590df6f0773df08a1fd59b4bfd7771a755443d1c01f17d563b9999bdf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "01c97ed590df6f0773df08a1fd59b4bfd7771a755443d1c01f17d563b9999bdf",
+                    "hash" : "0x01c97ed590df6f0773df08a1fd59b4bfd7771a755443d1c01f17d563b9999bdf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a61f9de5359600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem64kb_singleByte.json b/GeneralStateTests/stMemoryTest/mem64kb_singleByte.json
index 1cb4e78e0..d8465595e 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb_singleByte.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb_singleByte.json
@@ -1,17 +1,17 @@
 {
     "mem64kb_singleByte " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "59bf1a3821d2430a3d3104bc474eb8937c974be0f1d730dd31afcb6993572d50",
+                    "hash" : "0x59bf1a3821d2430a3d3104bc474eb8937c974be0f1d730dd31afcb6993572d50",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "59bf1a3821d2430a3d3104bc474eb8937c974be0f1d730dd31afcb6993572d50",
+                    "hash" : "0x59bf1a3821d2430a3d3104bc474eb8937c974be0f1d730dd31afcb6993572d50",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "59bf1a3821d2430a3d3104bc474eb8937c974be0f1d730dd31afcb6993572d50",
+                    "hash" : "0x59bf1a3821d2430a3d3104bc474eb8937c974be0f1d730dd31afcb6993572d50",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "59bf1a3821d2430a3d3104bc474eb8937c974be0f1d730dd31afcb6993572d50",
+                    "hash" : "0x59bf1a3821d2430a3d3104bc474eb8937c974be0f1d730dd31afcb6993572d50",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "59bf1a3821d2430a3d3104bc474eb8937c974be0f1d730dd31afcb6993572d50",
+                    "hash" : "0x59bf1a3821d2430a3d3104bc474eb8937c974be0f1d730dd31afcb6993572d50",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a61f9ff5359600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/memReturn.json b/GeneralStateTests/stMemoryTest/memReturn.json
index 35074923c..dd364cfc1 100644
--- a/GeneralStateTests/stMemoryTest/memReturn.json
+++ b/GeneralStateTests/stMemoryTest/memReturn.json
@@ -1,17 +1,17 @@
 {
     "memReturn " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "4ac120a0f842cd106b0b5affaec87476b7e0f14376ecb87bbefc001a695f3582",
+                    "hash" : "0x4ac120a0f842cd106b0b5affaec87476b7e0f14376ecb87bbefc001a695f3582",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "4ac120a0f842cd106b0b5affaec87476b7e0f14376ecb87bbefc001a695f3582",
+                    "hash" : "0x4ac120a0f842cd106b0b5affaec87476b7e0f14376ecb87bbefc001a695f3582",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4ac120a0f842cd106b0b5affaec87476b7e0f14376ecb87bbefc001a695f3582",
+                    "hash" : "0x4ac120a0f842cd106b0b5affaec87476b7e0f14376ecb87bbefc001a695f3582",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4ac120a0f842cd106b0b5affaec87476b7e0f14376ecb87bbefc001a695f3582",
+                    "hash" : "0x4ac120a0f842cd106b0b5affaec87476b7e0f14376ecb87bbefc001a695f3582",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "4ac120a0f842cd106b0b5affaec87476b7e0f14376ecb87bbefc001a695f3582",
+                    "hash" : "0x4ac120a0f842cd106b0b5affaec87476b7e0f14376ecb87bbefc001a695f3582",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x366000600037596000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 "0xff55883355001144bbccddffeeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mload16bitBound.json b/GeneralStateTests/stMemoryTest/mload16bitBound.json
index b2a89d2dc..c42b8fda2 100644
--- a/GeneralStateTests/stMemoryTest/mload16bitBound.json
+++ b/GeneralStateTests/stMemoryTest/mload16bitBound.json
@@ -1,17 +1,17 @@
 {
     "mload16bitBound " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x10000804025c",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "753bf8da2d26f11acfc8e3865eb40093071187f028ca996632d60b0af47a27a9",
+                    "hash" : "0x753bf8da2d26f11acfc8e3865eb40093071187f028ca996632d60b0af47a27a9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "753bf8da2d26f11acfc8e3865eb40093071187f028ca996632d60b0af47a27a9",
+                    "hash" : "0x753bf8da2d26f11acfc8e3865eb40093071187f028ca996632d60b0af47a27a9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "753bf8da2d26f11acfc8e3865eb40093071187f028ca996632d60b0af47a27a9",
+                    "hash" : "0x753bf8da2d26f11acfc8e3865eb40093071187f028ca996632d60b0af47a27a9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "753bf8da2d26f11acfc8e3865eb40093071187f028ca996632d60b0af47a27a9",
+                    "hash" : "0x753bf8da2d26f11acfc8e3865eb40093071187f028ca996632d60b0af47a27a9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "753bf8da2d26f11acfc8e3865eb40093071187f028ca996632d60b0af47a27a9",
+                    "hash" : "0x753bf8da2d26f11acfc8e3865eb40093071187f028ca996632d60b0af47a27a9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6201000051600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xa00050281798",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "17592320524892"
+                "0x10000804025c"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mload8bitBound.json b/GeneralStateTests/stMemoryTest/mload8bitBound.json
index c4a3255db..76941167c 100644
--- a/GeneralStateTests/stMemoryTest/mload8bitBound.json
+++ b/GeneralStateTests/stMemoryTest/mload8bitBound.json
@@ -1,17 +1,17 @@
 {
     "mload8bitBound " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "68d0d02b58a7f988070b0e7f1a256be642aaccfd8bd91e18996c35611cfa054d",
+                    "hash" : "0x68d0d02b58a7f988070b0e7f1a256be642aaccfd8bd91e18996c35611cfa054d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "68d0d02b58a7f988070b0e7f1a256be642aaccfd8bd91e18996c35611cfa054d",
+                    "hash" : "0x68d0d02b58a7f988070b0e7f1a256be642aaccfd8bd91e18996c35611cfa054d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "68d0d02b58a7f988070b0e7f1a256be642aaccfd8bd91e18996c35611cfa054d",
+                    "hash" : "0x68d0d02b58a7f988070b0e7f1a256be642aaccfd8bd91e18996c35611cfa054d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "68d0d02b58a7f988070b0e7f1a256be642aaccfd8bd91e18996c35611cfa054d",
+                    "hash" : "0x68d0d02b58a7f988070b0e7f1a256be642aaccfd8bd91e18996c35611cfa054d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "68d0d02b58a7f988070b0e7f1a256be642aaccfd8bd91e18996c35611cfa054d",
+                    "hash" : "0x68d0d02b58a7f988070b0e7f1a256be642aaccfd8bd91e18996c35611cfa054d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x61010051600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "220000"
+                "0x035b60"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mload_dejavu.json b/GeneralStateTests/stMemoryTest/mload_dejavu.json
index c21de0538..3ec6fa1fe 100644
--- a/GeneralStateTests/stMemoryTest/mload_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/mload_dejavu.json
@@ -1,17 +1,17 @@
 {
     "mload_dejavu " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f1d720915cb0fba8d8688069483837e45cb53d4cfb2f0496db2ce3bde64bf12f",
+                    "hash" : "0xf1d720915cb0fba8d8688069483837e45cb53d4cfb2f0496db2ce3bde64bf12f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f1d720915cb0fba8d8688069483837e45cb53d4cfb2f0496db2ce3bde64bf12f",
+                    "hash" : "0xf1d720915cb0fba8d8688069483837e45cb53d4cfb2f0496db2ce3bde64bf12f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f1d720915cb0fba8d8688069483837e45cb53d4cfb2f0496db2ce3bde64bf12f",
+                    "hash" : "0xf1d720915cb0fba8d8688069483837e45cb53d4cfb2f0496db2ce3bde64bf12f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f1d720915cb0fba8d8688069483837e45cb53d4cfb2f0496db2ce3bde64bf12f",
+                    "hash" : "0xf1d720915cb0fba8d8688069483837e45cb53d4cfb2f0496db2ce3bde64bf12f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f1d720915cb0fba8d8688069483837e45cb53d4cfb2f0496db2ce3bde64bf12f",
+                    "hash" : "0xf1d720915cb0fba8d8688069483837e45cb53d4cfb2f0496db2ce3bde64bf12f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x630fffffff51",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "42949672960"
+                "0x0a00000000"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mstore_dejavu.json b/GeneralStateTests/stMemoryTest/mstore_dejavu.json
index f7986a4af..0c1092a83 100644
--- a/GeneralStateTests/stMemoryTest/mstore_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/mstore_dejavu.json
@@ -1,17 +1,17 @@
 {
     "mstore_dejavu " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e2c1656a205e46816a957285a55655a1a039d5d65d3e02b6252f6e934573dae4",
+                    "hash" : "0xe2c1656a205e46816a957285a55655a1a039d5d65d3e02b6252f6e934573dae4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e2c1656a205e46816a957285a55655a1a039d5d65d3e02b6252f6e934573dae4",
+                    "hash" : "0xe2c1656a205e46816a957285a55655a1a039d5d65d3e02b6252f6e934573dae4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e2c1656a205e46816a957285a55655a1a039d5d65d3e02b6252f6e934573dae4",
+                    "hash" : "0xe2c1656a205e46816a957285a55655a1a039d5d65d3e02b6252f6e934573dae4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e2c1656a205e46816a957285a55655a1a039d5d65d3e02b6252f6e934573dae4",
+                    "hash" : "0xe2c1656a205e46816a957285a55655a1a039d5d65d3e02b6252f6e934573dae4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e2c1656a205e46816a957285a55655a1a039d5d65d3e02b6252f6e934573dae4",
+                    "hash" : "0xe2c1656a205e46816a957285a55655a1a039d5d65d3e02b6252f6e934573dae4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60f1630fffffff52",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "42949672960"
+                "0x0a00000000"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mstroe8_dejavu.json b/GeneralStateTests/stMemoryTest/mstroe8_dejavu.json
index 19d470730..82f616cb2 100644
--- a/GeneralStateTests/stMemoryTest/mstroe8_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/mstroe8_dejavu.json
@@ -1,17 +1,17 @@
 {
     "mstroe8_dejavu " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1dec281f3d5384490d22a942941948d3d5453bf19a0855c81e60a722803f0043",
+                    "hash" : "0x1dec281f3d5384490d22a942941948d3d5453bf19a0855c81e60a722803f0043",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "1dec281f3d5384490d22a942941948d3d5453bf19a0855c81e60a722803f0043",
+                    "hash" : "0x1dec281f3d5384490d22a942941948d3d5453bf19a0855c81e60a722803f0043",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "1dec281f3d5384490d22a942941948d3d5453bf19a0855c81e60a722803f0043",
+                    "hash" : "0x1dec281f3d5384490d22a942941948d3d5453bf19a0855c81e60a722803f0043",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "1dec281f3d5384490d22a942941948d3d5453bf19a0855c81e60a722803f0043",
+                    "hash" : "0x1dec281f3d5384490d22a942941948d3d5453bf19a0855c81e60a722803f0043",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "1dec281f3d5384490d22a942941948d3d5453bf19a0855c81e60a722803f0043",
+                    "hash" : "0x1dec281f3d5384490d22a942941948d3d5453bf19a0855c81e60a722803f0043",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60f1630fffffff53",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "42949672960"
+                "0x0a00000000"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/sha3_dejavu.json b/GeneralStateTests/stMemoryTest/sha3_dejavu.json
index b0b516ea1..6a757e7fc 100644
--- a/GeneralStateTests/stMemoryTest/sha3_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/sha3_dejavu.json
@@ -1,17 +1,17 @@
 {
     "sha3_dejavu " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "37302f4388dcbe3d2a8c109b8670bd595291270a170d76dea20460515d95909e",
+                    "hash" : "0x37302f4388dcbe3d2a8c109b8670bd595291270a170d76dea20460515d95909e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "37302f4388dcbe3d2a8c109b8670bd595291270a170d76dea20460515d95909e",
+                    "hash" : "0x37302f4388dcbe3d2a8c109b8670bd595291270a170d76dea20460515d95909e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "37302f4388dcbe3d2a8c109b8670bd595291270a170d76dea20460515d95909e",
+                    "hash" : "0x37302f4388dcbe3d2a8c109b8670bd595291270a170d76dea20460515d95909e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "37302f4388dcbe3d2a8c109b8670bd595291270a170d76dea20460515d95909e",
+                    "hash" : "0x37302f4388dcbe3d2a8c109b8670bd595291270a170d76dea20460515d95909e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "37302f4388dcbe3d2a8c109b8670bd595291270a170d76dea20460515d95909e",
+                    "hash" : "0x37302f4388dcbe3d2a8c109b8670bd595291270a170d76dea20460515d95909e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60ff630fffffff20",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "42949672960"
+                "0x0a00000000"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/stackLimitGas_1023.json b/GeneralStateTests/stMemoryTest/stackLimitGas_1023.json
index 5df7d3a4b..9de347e91 100644
--- a/GeneralStateTests/stMemoryTest/stackLimitGas_1023.json
+++ b/GeneralStateTests/stMemoryTest/stackLimitGas_1023.json
@@ -1,17 +1,17 @@
 {
     "stackLimitGas_1023 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "2e0e076db6976344c9662b3f3226fda27aff53e348bd5609e4a7154a2b20fd01",
+                    "hash" : "0x2e0e076db6976344c9662b3f3226fda27aff53e348bd5609e4a7154a2b20fd01",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "2e0e076db6976344c9662b3f3226fda27aff53e348bd5609e4a7154a2b20fd01",
+                    "hash" : "0x2e0e076db6976344c9662b3f3226fda27aff53e348bd5609e4a7154a2b20fd01",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2e0e076db6976344c9662b3f3226fda27aff53e348bd5609e4a7154a2b20fd01",
+                    "hash" : "0x2e0e076db6976344c9662b3f3226fda27aff53e348bd5609e4a7154a2b20fd01",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "2e0e076db6976344c9662b3f3226fda27aff53e348bd5609e4a7154a2b20fd01",
+                    "hash" : "0x2e0e076db6976344c9662b3f3226fda27aff53e348bd5609e4a7154a2b20fd01",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "2e0e076db6976344c9662b3f3226fda27aff53e348bd5609e4a7154a2b20fd01",
+                    "hash" : "0x2e0e076db6976344c9662b3f3226fda27aff53e348bd5609e4a7154a2b20fd01",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6103fd6000525b5a60016000510360005260005160065700",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "100000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/stackLimitGas_1024.json b/GeneralStateTests/stMemoryTest/stackLimitGas_1024.json
index 0b5ba361b..949455a5a 100644
--- a/GeneralStateTests/stMemoryTest/stackLimitGas_1024.json
+++ b/GeneralStateTests/stMemoryTest/stackLimitGas_1024.json
@@ -1,17 +1,17 @@
 {
     "stackLimitGas_1024 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a7c41770a298ad62de3c3216658fecaa16550b911fe62265c9cce6e3a55adad6",
+                    "hash" : "0xa7c41770a298ad62de3c3216658fecaa16550b911fe62265c9cce6e3a55adad6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a7c41770a298ad62de3c3216658fecaa16550b911fe62265c9cce6e3a55adad6",
+                    "hash" : "0xa7c41770a298ad62de3c3216658fecaa16550b911fe62265c9cce6e3a55adad6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a7c41770a298ad62de3c3216658fecaa16550b911fe62265c9cce6e3a55adad6",
+                    "hash" : "0xa7c41770a298ad62de3c3216658fecaa16550b911fe62265c9cce6e3a55adad6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a7c41770a298ad62de3c3216658fecaa16550b911fe62265c9cce6e3a55adad6",
+                    "hash" : "0xa7c41770a298ad62de3c3216658fecaa16550b911fe62265c9cce6e3a55adad6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a7c41770a298ad62de3c3216658fecaa16550b911fe62265c9cce6e3a55adad6",
+                    "hash" : "0xa7c41770a298ad62de3c3216658fecaa16550b911fe62265c9cce6e3a55adad6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6103fe6000525b5a60016000510360005260005160065700",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "100000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/stackLimitGas_1025.json b/GeneralStateTests/stMemoryTest/stackLimitGas_1025.json
index dca5fd515..29647efcc 100644
--- a/GeneralStateTests/stMemoryTest/stackLimitGas_1025.json
+++ b/GeneralStateTests/stMemoryTest/stackLimitGas_1025.json
@@ -1,17 +1,17 @@
 {
     "stackLimitGas_1025 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "0bf698140781a243586d4b8a3b5af5e3d9196a961215295e15d4a21fb9405983",
+                    "hash" : "0x0bf698140781a243586d4b8a3b5af5e3d9196a961215295e15d4a21fb9405983",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "0bf698140781a243586d4b8a3b5af5e3d9196a961215295e15d4a21fb9405983",
+                    "hash" : "0x0bf698140781a243586d4b8a3b5af5e3d9196a961215295e15d4a21fb9405983",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "0bf698140781a243586d4b8a3b5af5e3d9196a961215295e15d4a21fb9405983",
+                    "hash" : "0x0bf698140781a243586d4b8a3b5af5e3d9196a961215295e15d4a21fb9405983",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "0bf698140781a243586d4b8a3b5af5e3d9196a961215295e15d4a21fb9405983",
+                    "hash" : "0x0bf698140781a243586d4b8a3b5af5e3d9196a961215295e15d4a21fb9405983",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0bf698140781a243586d4b8a3b5af5e3d9196a961215295e15d4a21fb9405983",
+                    "hash" : "0x0bf698140781a243586d4b8a3b5af5e3d9196a961215295e15d4a21fb9405983",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6103ff6000525b5a60016000510360005260005160065700",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "100000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/stackLimitPush31_1023.json b/GeneralStateTests/stMemoryTest/stackLimitPush31_1023.json
index 744c638da..b89e4f826 100644
--- a/GeneralStateTests/stMemoryTest/stackLimitPush31_1023.json
+++ b/GeneralStateTests/stMemoryTest/stackLimitPush31_1023.json
@@ -1,17 +1,17 @@
 {
     "stackLimitPush31_1023 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "012034963f12ba01a075eaf2399fe9903fce7de6875eb5b4060e722850743041",
+                    "hash" : "0x012034963f12ba01a075eaf2399fe9903fce7de6875eb5b4060e722850743041",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "012034963f12ba01a075eaf2399fe9903fce7de6875eb5b4060e722850743041",
+                    "hash" : "0x012034963f12ba01a075eaf2399fe9903fce7de6875eb5b4060e722850743041",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "012034963f12ba01a075eaf2399fe9903fce7de6875eb5b4060e722850743041",
+                    "hash" : "0x012034963f12ba01a075eaf2399fe9903fce7de6875eb5b4060e722850743041",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "012034963f12ba01a075eaf2399fe9903fce7de6875eb5b4060e722850743041",
+                    "hash" : "0x012034963f12ba01a075eaf2399fe9903fce7de6875eb5b4060e722850743041",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "012034963f12ba01a075eaf2399fe9903fce7de6875eb5b4060e722850743041",
+                    "hash" : "0x012034963f12ba01a075eaf2399fe9903fce7de6875eb5b4060e722850743041",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6103fd6000525b7e0102030405060708090a0102030405060708090a0102030405060708090a0160016000510360005260005160065700",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "100000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/stackLimitPush31_1024.json b/GeneralStateTests/stMemoryTest/stackLimitPush31_1024.json
index c476dc597..bf4aff189 100644
--- a/GeneralStateTests/stMemoryTest/stackLimitPush31_1024.json
+++ b/GeneralStateTests/stMemoryTest/stackLimitPush31_1024.json
@@ -1,17 +1,17 @@
 {
     "stackLimitPush31_1024 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9c9fd8f67a6af918d96deccd3a0e96fc0a4496af936ec9f542be019f985ea528",
+                    "hash" : "0x9c9fd8f67a6af918d96deccd3a0e96fc0a4496af936ec9f542be019f985ea528",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9c9fd8f67a6af918d96deccd3a0e96fc0a4496af936ec9f542be019f985ea528",
+                    "hash" : "0x9c9fd8f67a6af918d96deccd3a0e96fc0a4496af936ec9f542be019f985ea528",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9c9fd8f67a6af918d96deccd3a0e96fc0a4496af936ec9f542be019f985ea528",
+                    "hash" : "0x9c9fd8f67a6af918d96deccd3a0e96fc0a4496af936ec9f542be019f985ea528",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9c9fd8f67a6af918d96deccd3a0e96fc0a4496af936ec9f542be019f985ea528",
+                    "hash" : "0x9c9fd8f67a6af918d96deccd3a0e96fc0a4496af936ec9f542be019f985ea528",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9c9fd8f67a6af918d96deccd3a0e96fc0a4496af936ec9f542be019f985ea528",
+                    "hash" : "0x9c9fd8f67a6af918d96deccd3a0e96fc0a4496af936ec9f542be019f985ea528",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6103fe6000525b7e0102030405060708090a0102030405060708090a0102030405060708090a0160016000510360005260005160065700",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "100000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/stackLimitPush31_1025.json b/GeneralStateTests/stMemoryTest/stackLimitPush31_1025.json
index 78778eb60..b7619d076 100644
--- a/GeneralStateTests/stMemoryTest/stackLimitPush31_1025.json
+++ b/GeneralStateTests/stMemoryTest/stackLimitPush31_1025.json
@@ -1,17 +1,17 @@
 {
     "stackLimitPush31_1025 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "4aac593c435cf2fa2b0ff6596215af980e85c185a6d115884cf7e4d7d9d36321",
+                    "hash" : "0x4aac593c435cf2fa2b0ff6596215af980e85c185a6d115884cf7e4d7d9d36321",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "4aac593c435cf2fa2b0ff6596215af980e85c185a6d115884cf7e4d7d9d36321",
+                    "hash" : "0x4aac593c435cf2fa2b0ff6596215af980e85c185a6d115884cf7e4d7d9d36321",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4aac593c435cf2fa2b0ff6596215af980e85c185a6d115884cf7e4d7d9d36321",
+                    "hash" : "0x4aac593c435cf2fa2b0ff6596215af980e85c185a6d115884cf7e4d7d9d36321",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4aac593c435cf2fa2b0ff6596215af980e85c185a6d115884cf7e4d7d9d36321",
+                    "hash" : "0x4aac593c435cf2fa2b0ff6596215af980e85c185a6d115884cf7e4d7d9d36321",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "4aac593c435cf2fa2b0ff6596215af980e85c185a6d115884cf7e4d7d9d36321",
+                    "hash" : "0x4aac593c435cf2fa2b0ff6596215af980e85c185a6d115884cf7e4d7d9d36321",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6103ff6000525b7e0102030405060708090a0102030405060708090a0102030405060708090a0160016000510360005260005160065700",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "100000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/stackLimitPush32_1023.json b/GeneralStateTests/stMemoryTest/stackLimitPush32_1023.json
index 7a9013fe4..528552d06 100644
--- a/GeneralStateTests/stMemoryTest/stackLimitPush32_1023.json
+++ b/GeneralStateTests/stMemoryTest/stackLimitPush32_1023.json
@@ -1,17 +1,17 @@
 {
     "stackLimitPush32_1023 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "0538c5873643505fc0ceb8f55945729bfadd0dde4bcc0a30a544162236b1a90b",
+                    "hash" : "0x0538c5873643505fc0ceb8f55945729bfadd0dde4bcc0a30a544162236b1a90b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "0538c5873643505fc0ceb8f55945729bfadd0dde4bcc0a30a544162236b1a90b",
+                    "hash" : "0x0538c5873643505fc0ceb8f55945729bfadd0dde4bcc0a30a544162236b1a90b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "0538c5873643505fc0ceb8f55945729bfadd0dde4bcc0a30a544162236b1a90b",
+                    "hash" : "0x0538c5873643505fc0ceb8f55945729bfadd0dde4bcc0a30a544162236b1a90b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "0538c5873643505fc0ceb8f55945729bfadd0dde4bcc0a30a544162236b1a90b",
+                    "hash" : "0x0538c5873643505fc0ceb8f55945729bfadd0dde4bcc0a30a544162236b1a90b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0538c5873643505fc0ceb8f55945729bfadd0dde4bcc0a30a544162236b1a90b",
+                    "hash" : "0x0538c5873643505fc0ceb8f55945729bfadd0dde4bcc0a30a544162236b1a90b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6103fd6000525b7f0102030405060708090a0102030405060708090a0102030405060708090a010260016000510360005260005160065700",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "100000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/stackLimitPush32_1024.json b/GeneralStateTests/stMemoryTest/stackLimitPush32_1024.json
index ab5fbd338..a4ac4f24c 100644
--- a/GeneralStateTests/stMemoryTest/stackLimitPush32_1024.json
+++ b/GeneralStateTests/stMemoryTest/stackLimitPush32_1024.json
@@ -1,17 +1,17 @@
 {
     "stackLimitPush32_1024 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "8c09fdc294863a6a0d8c06bf3346ed48f1794a4513c74d79d6010eedfca91c5f",
+                    "hash" : "0x8c09fdc294863a6a0d8c06bf3346ed48f1794a4513c74d79d6010eedfca91c5f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "8c09fdc294863a6a0d8c06bf3346ed48f1794a4513c74d79d6010eedfca91c5f",
+                    "hash" : "0x8c09fdc294863a6a0d8c06bf3346ed48f1794a4513c74d79d6010eedfca91c5f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "8c09fdc294863a6a0d8c06bf3346ed48f1794a4513c74d79d6010eedfca91c5f",
+                    "hash" : "0x8c09fdc294863a6a0d8c06bf3346ed48f1794a4513c74d79d6010eedfca91c5f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "8c09fdc294863a6a0d8c06bf3346ed48f1794a4513c74d79d6010eedfca91c5f",
+                    "hash" : "0x8c09fdc294863a6a0d8c06bf3346ed48f1794a4513c74d79d6010eedfca91c5f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "8c09fdc294863a6a0d8c06bf3346ed48f1794a4513c74d79d6010eedfca91c5f",
+                    "hash" : "0x8c09fdc294863a6a0d8c06bf3346ed48f1794a4513c74d79d6010eedfca91c5f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6103fe6000525b7f0102030405060708090a0102030405060708090a0102030405060708090a010260016000510360005260005160065700",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "100000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/stackLimitPush32_1025.json b/GeneralStateTests/stMemoryTest/stackLimitPush32_1025.json
index a8f07a6b0..bf741275e 100644
--- a/GeneralStateTests/stMemoryTest/stackLimitPush32_1025.json
+++ b/GeneralStateTests/stMemoryTest/stackLimitPush32_1025.json
@@ -1,17 +1,17 @@
 {
     "stackLimitPush32_1025 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "2b2c33348aabc10de2654557fe330f3d0d20ecf113613e7e016c3fdefcc610ef",
+                    "hash" : "0x2b2c33348aabc10de2654557fe330f3d0d20ecf113613e7e016c3fdefcc610ef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "2b2c33348aabc10de2654557fe330f3d0d20ecf113613e7e016c3fdefcc610ef",
+                    "hash" : "0x2b2c33348aabc10de2654557fe330f3d0d20ecf113613e7e016c3fdefcc610ef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2b2c33348aabc10de2654557fe330f3d0d20ecf113613e7e016c3fdefcc610ef",
+                    "hash" : "0x2b2c33348aabc10de2654557fe330f3d0d20ecf113613e7e016c3fdefcc610ef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "2b2c33348aabc10de2654557fe330f3d0d20ecf113613e7e016c3fdefcc610ef",
+                    "hash" : "0x2b2c33348aabc10de2654557fe330f3d0d20ecf113613e7e016c3fdefcc610ef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "2b2c33348aabc10de2654557fe330f3d0d20ecf113613e7e016c3fdefcc610ef",
+                    "hash" : "0x2b2c33348aabc10de2654557fe330f3d0d20ecf113613e7e016c3fdefcc610ef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6103ff6000525b7f0102030405060708090a0102030405060708090a0102030405060708090a010260016000510360005260005160065700",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "100000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL.json
index da626d93f..e2906ca55 100644
--- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL.json
+++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL.json
@@ -1,17 +1,17 @@
 {
     "CALL_OneVCallSuicide" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9df178851e255b9eca0b8f56c64426c1aad2ab88fb32bc1ef272a472e67c52c3",
+                    "hash" : "0x9df178851e255b9eca0b8f56c64426c1aad2ab88fb32bc1ef272a472e67c52c3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9df178851e255b9eca0b8f56c64426c1aad2ab88fb32bc1ef272a472e67c52c3",
+                    "hash" : "0x9df178851e255b9eca0b8f56c64426c1aad2ab88fb32bc1ef272a472e67c52c3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "18fde033bb93d4edd7f65d0bf26b1ae113fae2abe0b6d9f51571b9bd41e8ba89",
+                    "hash" : "0x18fde033bb93d4edd7f65d0bf26b1ae113fae2abe0b6d9f51571b9bd41e8ba89",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "18fde033bb93d4edd7f65d0bf26b1ae113fae2abe0b6d9f51571b9bd41e8ba89",
+                    "hash" : "0x18fde033bb93d4edd7f65d0bf26b1ae113fae2abe0b6d9f51571b9bd41e8ba89",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9df178851e255b9eca0b8f56c64426c1aad2ab88fb32bc1ef272a472e67c52c3",
+                    "hash" : "0x9df178851e255b9eca0b8f56c64426c1aad2ab88fb32bc1ef272a472e67c52c3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,14 +61,14 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f16001555a606455",
                 "nonce" : "0x00",
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE.json
index aedbd7da6..145c4fe8f 100644
--- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE.json
+++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE.json
@@ -1,17 +1,17 @@
 {
     "NonZeroValue_CALLCODE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e034c4ab4e487e066337e27811b39dc4b3a63c127b1e8968e3d57d6dc7c2ac11",
+                    "hash" : "0xe034c4ab4e487e066337e27811b39dc4b3a63c127b1e8968e3d57d6dc7c2ac11",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e034c4ab4e487e066337e27811b39dc4b3a63c127b1e8968e3d57d6dc7c2ac11",
+                    "hash" : "0xe034c4ab4e487e066337e27811b39dc4b3a63c127b1e8968e3d57d6dc7c2ac11",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "fc851b9f0ae9a9b21a39bd3567a405dde667c95ea642e2b2adf2a6e5cde10175",
+                    "hash" : "0xfc851b9f0ae9a9b21a39bd3567a405dde667c95ea642e2b2adf2a6e5cde10175",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "fc851b9f0ae9a9b21a39bd3567a405dde667c95ea642e2b2adf2a6e5cde10175",
+                    "hash" : "0xfc851b9f0ae9a9b21a39bd3567a405dde667c95ea642e2b2adf2a6e5cde10175",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e034c4ab4e487e066337e27811b39dc4b3a63c127b1e8968e3d57d6dc7c2ac11",
+                    "hash" : "0xe034c4ab4e487e066337e27811b39dc4b3a63c127b1e8968e3d57d6dc7c2ac11",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,14 +61,14 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455",
                 "nonce" : "0x00",
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToEmpty.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToEmpty.json
index 0abf493a6..28c07cb2a 100644
--- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToEmpty.json
+++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToEmpty.json
@@ -1,17 +1,17 @@
 {
     "NonZeroValue_CALLCODE_ToEmpty" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "30e803dcb470910b21cbc5afe6f4e10c0255e41681c2798792a46c45aeab8b85",
+                    "hash" : "0x30e803dcb470910b21cbc5afe6f4e10c0255e41681c2798792a46c45aeab8b85",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "30e803dcb470910b21cbc5afe6f4e10c0255e41681c2798792a46c45aeab8b85",
+                    "hash" : "0x30e803dcb470910b21cbc5afe6f4e10c0255e41681c2798792a46c45aeab8b85",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4323085a2521bdac4f581cd301feb82a04ca8f6715bffad04bf59bf41e34e13f",
+                    "hash" : "0x4323085a2521bdac4f581cd301feb82a04ca8f6715bffad04bf59bf41e34e13f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4323085a2521bdac4f581cd301feb82a04ca8f6715bffad04bf59bf41e34e13f",
+                    "hash" : "0x4323085a2521bdac4f581cd301feb82a04ca8f6715bffad04bf59bf41e34e13f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "30e803dcb470910b21cbc5afe6f4e10c0255e41681c2798792a46c45aeab8b85",
+                    "hash" : "0x30e803dcb470910b21cbc5afe6f4e10c0255e41681c2798792a46c45aeab8b85",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToNonNonZeroBalance.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToNonNonZeroBalance.json
index 67e703584..ad4224c2a 100644
--- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToNonNonZeroBalance.json
+++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToNonNonZeroBalance.json
@@ -1,17 +1,17 @@
 {
     "NonZeroValue_CALLCODE_ToNonNonZeroBalance" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "73c1b3d3ff93afd00bab54b6c2ba55cf832755ddb84300c1fe67f7a8c9adc9f1",
+                    "hash" : "0x73c1b3d3ff93afd00bab54b6c2ba55cf832755ddb84300c1fe67f7a8c9adc9f1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "73c1b3d3ff93afd00bab54b6c2ba55cf832755ddb84300c1fe67f7a8c9adc9f1",
+                    "hash" : "0x73c1b3d3ff93afd00bab54b6c2ba55cf832755ddb84300c1fe67f7a8c9adc9f1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "75e88dfadd9e54ba0f0655edc26b76b4c4d81f44f1c08463db104ffb99e5801f",
+                    "hash" : "0x75e88dfadd9e54ba0f0655edc26b76b4c4d81f44f1c08463db104ffb99e5801f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "75e88dfadd9e54ba0f0655edc26b76b4c4d81f44f1c08463db104ffb99e5801f",
+                    "hash" : "0x75e88dfadd9e54ba0f0655edc26b76b4c4d81f44f1c08463db104ffb99e5801f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "73c1b3d3ff93afd00bab54b6c2ba55cf832755ddb84300c1fe67f7a8c9adc9f1",
+                    "hash" : "0x73c1b3d3ff93afd00bab54b6c2ba55cf832755ddb84300c1fe67f7a8c9adc9f1",
                     "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" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToOneStorageKey.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToOneStorageKey.json
index a38c9c76b..6cf7f7666 100644
--- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToOneStorageKey.json
+++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToOneStorageKey.json
@@ -1,17 +1,17 @@
 {
     "NonZeroValue_CALLCODE_ToOneStorageKey" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6594ecae20668651e6810ff24736106050666ce43d3d194a424072aedb8ac36f",
+                    "hash" : "0x6594ecae20668651e6810ff24736106050666ce43d3d194a424072aedb8ac36f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6594ecae20668651e6810ff24736106050666ce43d3d194a424072aedb8ac36f",
+                    "hash" : "0x6594ecae20668651e6810ff24736106050666ce43d3d194a424072aedb8ac36f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "810d61625df378cb6b11b70292d47ef172a8ba6b3ee2a980d0ced31543f4d8ef",
+                    "hash" : "0x810d61625df378cb6b11b70292d47ef172a8ba6b3ee2a980d0ced31543f4d8ef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "810d61625df378cb6b11b70292d47ef172a8ba6b3ee2a980d0ced31543f4d8ef",
+                    "hash" : "0x810d61625df378cb6b11b70292d47ef172a8ba6b3ee2a980d0ced31543f4d8ef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6594ecae20668651e6810ff24736106050666ce43d3d194a424072aedb8ac36f",
+                    "hash" : "0x6594ecae20668651e6810ff24736106050666ce43d3d194a424072aedb8ac36f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x03e8",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -89,14 +89,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL_ToEmpty.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL_ToEmpty.json
index 3fbc73fc2..59dae8455 100644
--- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL_ToEmpty.json
+++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL_ToEmpty.json
@@ -1,17 +1,17 @@
 {
     "NonZeroValue_CALL_ToEmpty" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "0475fdbe6f5d3b56c1a456bdf38b1af774714b49d972141014a773d341abff8c",
+                    "hash" : "0x0475fdbe6f5d3b56c1a456bdf38b1af774714b49d972141014a773d341abff8c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b28eed23e9dad726338ac265dcf79d8c4232a554477c3b7ce825904ec31a80c7",
+                    "hash" : "0xb28eed23e9dad726338ac265dcf79d8c4232a554477c3b7ce825904ec31a80c7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9776a6d31fb2793d3cecca684189f597321414fade8fa4285f5f5591ea932bf0",
+                    "hash" : "0x9776a6d31fb2793d3cecca684189f597321414fade8fa4285f5f5591ea932bf0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9776a6d31fb2793d3cecca684189f597321414fade8fa4285f5f5591ea932bf0",
+                    "hash" : "0x9776a6d31fb2793d3cecca684189f597321414fade8fa4285f5f5591ea932bf0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b28eed23e9dad726338ac265dcf79d8c4232a554477c3b7ce825904ec31a80c7",
+                    "hash" : "0xb28eed23e9dad726338ac265dcf79d8c4232a554477c3b7ce825904ec31a80c7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x03e8",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f16001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL_ToNonNonZeroBalance.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL_ToNonNonZeroBalance.json
index a179d2dc6..e5443b00c 100644
--- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL_ToNonNonZeroBalance.json
+++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL_ToNonNonZeroBalance.json
@@ -1,17 +1,17 @@
 {
     "NonZeroValue_CALL_ToNonNonZeroBalance" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b56615545150230d234f9959803c1390853e12cf8c5c343b76b9869e3812f074",
+                    "hash" : "0xb56615545150230d234f9959803c1390853e12cf8c5c343b76b9869e3812f074",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b56615545150230d234f9959803c1390853e12cf8c5c343b76b9869e3812f074",
+                    "hash" : "0xb56615545150230d234f9959803c1390853e12cf8c5c343b76b9869e3812f074",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "8ee7323d74cc905937313476a96b647b1df86592aa403abcce0ca08928829aec",
+                    "hash" : "0x8ee7323d74cc905937313476a96b647b1df86592aa403abcce0ca08928829aec",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "8ee7323d74cc905937313476a96b647b1df86592aa403abcce0ca08928829aec",
+                    "hash" : "0x8ee7323d74cc905937313476a96b647b1df86592aa403abcce0ca08928829aec",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b56615545150230d234f9959803c1390853e12cf8c5c343b76b9869e3812f074",
+                    "hash" : "0xb56615545150230d234f9959803c1390853e12cf8c5c343b76b9869e3812f074",
                     "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" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f16001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL_ToOneStorageKey.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL_ToOneStorageKey.json
index 77ffa8fc4..321785ada 100644
--- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL_ToOneStorageKey.json
+++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL_ToOneStorageKey.json
@@ -1,17 +1,17 @@
 {
     "NonZeroValue_CALL_ToOneStorageKey" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "58d12eb2afd9e732567022aac3eaaa0c5d5d5007551aef55ee02ef1b1b135dd7",
+                    "hash" : "0x58d12eb2afd9e732567022aac3eaaa0c5d5d5007551aef55ee02ef1b1b135dd7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c348bb0448946bdf5ba1c3e9c3751048bc78aa866d2c9de1e5fc82892f5eb099",
+                    "hash" : "0xc348bb0448946bdf5ba1c3e9c3751048bc78aa866d2c9de1e5fc82892f5eb099",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "059510b79136780b74bc8dc28c65f719826ab4702456b8c8d81c951cb4c05bcf",
+                    "hash" : "0x059510b79136780b74bc8dc28c65f719826ab4702456b8c8d81c951cb4c05bcf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "059510b79136780b74bc8dc28c65f719826ab4702456b8c8d81c951cb4c05bcf",
+                    "hash" : "0x059510b79136780b74bc8dc28c65f719826ab4702456b8c8d81c951cb4c05bcf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c348bb0448946bdf5ba1c3e9c3751048bc78aa866d2c9de1e5fc82892f5eb099",
+                    "hash" : "0xc348bb0448946bdf5ba1c3e9c3751048bc78aa866d2c9de1e5fc82892f5eb099",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x03e8",
                 "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f16001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -89,14 +89,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL.json
index e256b7ab9..16431802b 100644
--- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL.json
+++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL.json
@@ -1,17 +1,17 @@
 {
     "NonZeroValue_DELEGATECALL" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e131f40988e218780d2e8b009da72c874f92a48b6ca844afb3ca7e529ebf257d",
+                    "hash" : "0xe131f40988e218780d2e8b009da72c874f92a48b6ca844afb3ca7e529ebf257d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e131f40988e218780d2e8b009da72c874f92a48b6ca844afb3ca7e529ebf257d",
+                    "hash" : "0xe131f40988e218780d2e8b009da72c874f92a48b6ca844afb3ca7e529ebf257d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "0736a19073698ddc647cf82eed7589a7776bc227ca27788b12ca6bc5f94e39b8",
+                    "hash" : "0x0736a19073698ddc647cf82eed7589a7776bc227ca27788b12ca6bc5f94e39b8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "45a8638184a3027700edeb6478c08dd19a400d1ddb864e23c7f5b7faa9aed22c",
+                    "hash" : "0x45a8638184a3027700edeb6478c08dd19a400d1ddb864e23c7f5b7faa9aed22c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e131f40988e218780d2e8b009da72c874f92a48b6ca844afb3ca7e529ebf257d",
+                    "hash" : "0xe131f40988e218780d2e8b009da72c874f92a48b6ca844afb3ca7e529ebf257d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,14 +61,14 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455",
                 "nonce" : "0x00",
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToEmpty.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToEmpty.json
index 30e00f6c8..ff4930b18 100644
--- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToEmpty.json
+++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToEmpty.json
@@ -1,17 +1,17 @@
 {
     "NonZeroValue_DELEGATECALL_ToEmpty" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "55b364749bffbe4de6de27bd1befab41b9afbe7513c559b376a03a27cb0af916",
+                    "hash" : "0x55b364749bffbe4de6de27bd1befab41b9afbe7513c559b376a03a27cb0af916",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "55b364749bffbe4de6de27bd1befab41b9afbe7513c559b376a03a27cb0af916",
+                    "hash" : "0x55b364749bffbe4de6de27bd1befab41b9afbe7513c559b376a03a27cb0af916",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2679e492e89edbb16b20be31663b8d783e92a85db08be2e2fcddfe0beb6ba088",
+                    "hash" : "0x2679e492e89edbb16b20be31663b8d783e92a85db08be2e2fcddfe0beb6ba088",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "dd53adf5f25628ca817be7df8e5a57b5446689ed145a4ac46abf3a45013fe2af",
+                    "hash" : "0xdd53adf5f25628ca817be7df8e5a57b5446689ed145a4ac46abf3a45013fe2af",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "55b364749bffbe4de6de27bd1befab41b9afbe7513c559b376a03a27cb0af916",
+                    "hash" : "0x55b364749bffbe4de6de27bd1befab41b9afbe7513c559b376a03a27cb0af916",
                     "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" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToNonNonZeroBalance.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToNonNonZeroBalance.json
index 632606c4a..0250ac4e6 100644
--- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToNonNonZeroBalance.json
+++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToNonNonZeroBalance.json
@@ -1,17 +1,17 @@
 {
     "NonZeroValue_DELEGATECALL_ToNonNonZeroBalance" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a0ffd8374aa4f0219c79796004e4d128297c960bee088d569ee4fd59303e5bb3",
+                    "hash" : "0xa0ffd8374aa4f0219c79796004e4d128297c960bee088d569ee4fd59303e5bb3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a0ffd8374aa4f0219c79796004e4d128297c960bee088d569ee4fd59303e5bb3",
+                    "hash" : "0xa0ffd8374aa4f0219c79796004e4d128297c960bee088d569ee4fd59303e5bb3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "490c7a4c7f7de525caa617975740e598c8b5d67fdf0b1299a85cbabd29b42d0a",
+                    "hash" : "0x490c7a4c7f7de525caa617975740e598c8b5d67fdf0b1299a85cbabd29b42d0a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f5814da69510fc59eb19ff9a78e870ed05d7e529ac9ccbe17a7a46db4e4369a0",
+                    "hash" : "0xf5814da69510fc59eb19ff9a78e870ed05d7e529ac9ccbe17a7a46db4e4369a0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a0ffd8374aa4f0219c79796004e4d128297c960bee088d569ee4fd59303e5bb3",
+                    "hash" : "0xa0ffd8374aa4f0219c79796004e4d128297c960bee088d569ee4fd59303e5bb3",
                     "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" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToOneStorageKey.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToOneStorageKey.json
index 5148feb67..6426b6bfd 100644
--- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToOneStorageKey.json
+++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToOneStorageKey.json
@@ -1,17 +1,17 @@
 {
     "NonZeroValue_DELEGATECALL_ToOneStorageKey" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f17cfda7d19e3648d3bd315a3e888f89f7002b6413cc8dd4de6e433612d6d0d2",
+                    "hash" : "0xf17cfda7d19e3648d3bd315a3e888f89f7002b6413cc8dd4de6e433612d6d0d2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f17cfda7d19e3648d3bd315a3e888f89f7002b6413cc8dd4de6e433612d6d0d2",
+                    "hash" : "0xf17cfda7d19e3648d3bd315a3e888f89f7002b6413cc8dd4de6e433612d6d0d2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b910ee1c13f68cb2c31ebf954a3682dacc4b2bc55eb576f6c42f44d9853d7e80",
+                    "hash" : "0xb910ee1c13f68cb2c31ebf954a3682dacc4b2bc55eb576f6c42f44d9853d7e80",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6baf84679c6338c00371b0e3246c4feaf08e07db41e1e0d191069ae5611645e5",
+                    "hash" : "0x6baf84679c6338c00371b0e3246c4feaf08e07db41e1e0d191069ae5611645e5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f17cfda7d19e3648d3bd315a3e888f89f7002b6413cc8dd4de6e433612d6d0d2",
+                    "hash" : "0xf17cfda7d19e3648d3bd315a3e888f89f7002b6413cc8dd4de6e433612d6d0d2",
                     "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" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -89,14 +89,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE.json
index e73227d20..943fbdd1d 100644
--- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE.json
+++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE.json
@@ -1,17 +1,17 @@
 {
-    "NonZeroValue_SUICIDE" : {
+    "NonZeroValue_SELFDESTRUCT" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c019ad49d0173d2e02dbaba6f8309522fbe14d20f4d1b23ee79deccc2d4a74ca",
+                    "hash" : "0xc019ad49d0173d2e02dbaba6f8309522fbe14d20f4d1b23ee79deccc2d4a74ca",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c019ad49d0173d2e02dbaba6f8309522fbe14d20f4d1b23ee79deccc2d4a74ca",
+                    "hash" : "0xc019ad49d0173d2e02dbaba6f8309522fbe14d20f4d1b23ee79deccc2d4a74ca",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "80756cac9d08bad90d4111bd79b4dff1c6f1c0048822a7e1831b1152840c33cb",
+                    "hash" : "0x80756cac9d08bad90d4111bd79b4dff1c6f1c0048822a7e1831b1152840c33cb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "80756cac9d08bad90d4111bd79b4dff1c6f1c0048822a7e1831b1152840c33cb",
+                    "hash" : "0x80756cac9d08bad90d4111bd79b4dff1c6f1c0048822a7e1831b1152840c33cb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c019ad49d0173d2e02dbaba6f8309522fbe14d20f4d1b23ee79deccc2d4a74ca",
+                    "hash" : "0xc019ad49d0173d2e02dbaba6f8309522fbe14d20f4d1b23ee79deccc2d4a74ca",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,14 +61,14 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x73c94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
                 "nonce" : "0x00",
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToEmpty.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToEmpty.json
index 1ee2158be..1d06f9501 100644
--- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToEmpty.json
+++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToEmpty.json
@@ -1,17 +1,17 @@
 {
-    "NonZeroValue_SUICIDE_ToEmpty" : {
+    "NonZeroValue_SELFDESTRUCT_ToEmpty" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b31731ecc10e0cf52b8a47f22cb2c18bbf44d7548299432733efeec8c5e55608",
+                    "hash" : "0xb31731ecc10e0cf52b8a47f22cb2c18bbf44d7548299432733efeec8c5e55608",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c019ad49d0173d2e02dbaba6f8309522fbe14d20f4d1b23ee79deccc2d4a74ca",
+                    "hash" : "0xc019ad49d0173d2e02dbaba6f8309522fbe14d20f4d1b23ee79deccc2d4a74ca",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "80756cac9d08bad90d4111bd79b4dff1c6f1c0048822a7e1831b1152840c33cb",
+                    "hash" : "0x80756cac9d08bad90d4111bd79b4dff1c6f1c0048822a7e1831b1152840c33cb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "80756cac9d08bad90d4111bd79b4dff1c6f1c0048822a7e1831b1152840c33cb",
+                    "hash" : "0x80756cac9d08bad90d4111bd79b4dff1c6f1c0048822a7e1831b1152840c33cb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c019ad49d0173d2e02dbaba6f8309522fbe14d20f4d1b23ee79deccc2d4a74ca",
+                    "hash" : "0xc019ad49d0173d2e02dbaba6f8309522fbe14d20f4d1b23ee79deccc2d4a74ca",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x73c94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalance.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalance.json
index c3bdcb748..357b40b76 100644
--- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalance.json
+++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalance.json
@@ -1,17 +1,17 @@
 {
-    "NonZeroValue_SUICIDE_ToNonNonZeroBalance" : {
+    "NonZeroValue_SELFDESTRUCT_ToNonNonZeroBalance" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "29639facdc2ec378b5f8b30d7031af440030906818c65e5ce501be46e7673a6f",
+                    "hash" : "0x29639facdc2ec378b5f8b30d7031af440030906818c65e5ce501be46e7673a6f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "29639facdc2ec378b5f8b30d7031af440030906818c65e5ce501be46e7673a6f",
+                    "hash" : "0x29639facdc2ec378b5f8b30d7031af440030906818c65e5ce501be46e7673a6f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "ee399cdbb90811501e58caaca483d656e0624d7465fdac67292b777e31ded659",
+                    "hash" : "0xee399cdbb90811501e58caaca483d656e0624d7465fdac67292b777e31ded659",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ee399cdbb90811501e58caaca483d656e0624d7465fdac67292b777e31ded659",
+                    "hash" : "0xee399cdbb90811501e58caaca483d656e0624d7465fdac67292b777e31ded659",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "29639facdc2ec378b5f8b30d7031af440030906818c65e5ce501be46e7673a6f",
+                    "hash" : "0x29639facdc2ec378b5f8b30d7031af440030906818c65e5ce501be46e7673a6f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x73c94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToOneStorageKey.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToOneStorageKey.json
index cfa0e6e01..38b61a43e 100644
--- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToOneStorageKey.json
+++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToOneStorageKey.json
@@ -1,17 +1,17 @@
 {
-    "NonZeroValue_SUICIDE_ToOneStorageKey" : {
+    "NonZeroValue_SELFDESTRUCT_ToOneStorageKey" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "4d5ad37c709dfa330027d407eec5cd81657cc985006ae08573a2bebe550f7413",
+                    "hash" : "0x4d5ad37c709dfa330027d407eec5cd81657cc985006ae08573a2bebe550f7413",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "eb8655c8a78e91811abc48ebc52669602d1e1e74cead359d88456dc60a293209",
+                    "hash" : "0xeb8655c8a78e91811abc48ebc52669602d1e1e74cead359d88456dc60a293209",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "402b17e4f614ce2354257025fc55022b09dd55fc8de31637c8779c163d12600f",
+                    "hash" : "0x402b17e4f614ce2354257025fc55022b09dd55fc8de31637c8779c163d12600f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "402b17e4f614ce2354257025fc55022b09dd55fc8de31637c8779c163d12600f",
+                    "hash" : "0x402b17e4f614ce2354257025fc55022b09dd55fc8de31637c8779c163d12600f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "eb8655c8a78e91811abc48ebc52669602d1e1e74cead359d88456dc60a293209",
+                    "hash" : "0xeb8655c8a78e91811abc48ebc52669602d1e1e74cead359d88456dc60a293209",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,14 +61,14 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x73c94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
                 "nonce" : "0x00",
@@ -76,9 +76,9 @@
                     "0x00" : "0x01"
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -90,14 +90,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL.json
index b7d362043..ae789c912 100644
--- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL.json
+++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL.json
@@ -1,17 +1,17 @@
 {
     "NonZeroValue_TransactionCALL" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "93f113c0983199eebd1537d87938599f994dca74a08df794a0664370df1abf7b",
+                    "hash" : "0x93f113c0983199eebd1537d87938599f994dca74a08df794a0664370df1abf7b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "93f113c0983199eebd1537d87938599f994dca74a08df794a0664370df1abf7b",
+                    "hash" : "0x93f113c0983199eebd1537d87938599f994dca74a08df794a0664370df1abf7b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "93f113c0983199eebd1537d87938599f994dca74a08df794a0664370df1abf7b",
+                    "hash" : "0x93f113c0983199eebd1537d87938599f994dca74a08df794a0664370df1abf7b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "93f113c0983199eebd1537d87938599f994dca74a08df794a0664370df1abf7b",
+                    "hash" : "0x93f113c0983199eebd1537d87938599f994dca74a08df794a0664370df1abf7b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "93f113c0983199eebd1537d87938599f994dca74a08df794a0664370df1abf7b",
+                    "hash" : "0x93f113c0983199eebd1537d87938599f994dca74a08df794a0664370df1abf7b",
                     "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" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToEmpty.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToEmpty.json
index 4a8479400..7b97f3069 100644
--- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToEmpty.json
+++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToEmpty.json
@@ -1,17 +1,17 @@
 {
     "NonZeroValue_TransactionCALL_ToEmpty" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "93f113c0983199eebd1537d87938599f994dca74a08df794a0664370df1abf7b",
+                    "hash" : "0x93f113c0983199eebd1537d87938599f994dca74a08df794a0664370df1abf7b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "93f113c0983199eebd1537d87938599f994dca74a08df794a0664370df1abf7b",
+                    "hash" : "0x93f113c0983199eebd1537d87938599f994dca74a08df794a0664370df1abf7b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "93f113c0983199eebd1537d87938599f994dca74a08df794a0664370df1abf7b",
+                    "hash" : "0x93f113c0983199eebd1537d87938599f994dca74a08df794a0664370df1abf7b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "93f113c0983199eebd1537d87938599f994dca74a08df794a0664370df1abf7b",
+                    "hash" : "0x93f113c0983199eebd1537d87938599f994dca74a08df794a0664370df1abf7b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "93f113c0983199eebd1537d87938599f994dca74a08df794a0664370df1abf7b",
+                    "hash" : "0x93f113c0983199eebd1537d87938599f994dca74a08df794a0664370df1abf7b",
                     "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" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToNonNonZeroBalance.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToNonNonZeroBalance.json
index 8659abed4..09876b285 100644
--- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToNonNonZeroBalance.json
+++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToNonNonZeroBalance.json
@@ -1,17 +1,17 @@
 {
     "NonZeroValue_TransactionCALL_ToNonNonZeroBalance" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1da2400dccfbef2a877eaa19db825342c26c14d8d11975367d53a82a94bce504",
+                    "hash" : "0x1da2400dccfbef2a877eaa19db825342c26c14d8d11975367d53a82a94bce504",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "1da2400dccfbef2a877eaa19db825342c26c14d8d11975367d53a82a94bce504",
+                    "hash" : "0x1da2400dccfbef2a877eaa19db825342c26c14d8d11975367d53a82a94bce504",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "1da2400dccfbef2a877eaa19db825342c26c14d8d11975367d53a82a94bce504",
+                    "hash" : "0x1da2400dccfbef2a877eaa19db825342c26c14d8d11975367d53a82a94bce504",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "1da2400dccfbef2a877eaa19db825342c26c14d8d11975367d53a82a94bce504",
+                    "hash" : "0x1da2400dccfbef2a877eaa19db825342c26c14d8d11975367d53a82a94bce504",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "1da2400dccfbef2a877eaa19db825342c26c14d8d11975367d53a82a94bce504",
+                    "hash" : "0x1da2400dccfbef2a877eaa19db825342c26c14d8d11975367d53a82a94bce504",
                     "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" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToOneStorageKey.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToOneStorageKey.json
index fc8101db7..15a68c8cd 100644
--- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToOneStorageKey.json
+++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToOneStorageKey.json
@@ -1,17 +1,17 @@
 {
     "NonZeroValue_TransactionCALL_ToOneStorageKey" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "35d700173a1cd693d0dfdbcf665501e33cd6d5c08e06d5a8d24acdd4bc631271",
+                    "hash" : "0x35d700173a1cd693d0dfdbcf665501e33cd6d5c08e06d5a8d24acdd4bc631271",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "35d700173a1cd693d0dfdbcf665501e33cd6d5c08e06d5a8d24acdd4bc631271",
+                    "hash" : "0x35d700173a1cd693d0dfdbcf665501e33cd6d5c08e06d5a8d24acdd4bc631271",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "35d700173a1cd693d0dfdbcf665501e33cd6d5c08e06d5a8d24acdd4bc631271",
+                    "hash" : "0x35d700173a1cd693d0dfdbcf665501e33cd6d5c08e06d5a8d24acdd4bc631271",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "35d700173a1cd693d0dfdbcf665501e33cd6d5c08e06d5a8d24acdd4bc631271",
+                    "hash" : "0x35d700173a1cd693d0dfdbcf665501e33cd6d5c08e06d5a8d24acdd4bc631271",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "35d700173a1cd693d0dfdbcf665501e33cd6d5c08e06d5a8d24acdd4bc631271",
+                    "hash" : "0x35d700173a1cd693d0dfdbcf665501e33cd6d5c08e06d5a8d24acdd4bc631271",
                     "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" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData.json
index c397ce890..3e616130c 100644
--- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData.json
+++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData.json
@@ -1,17 +1,17 @@
 {
     "NonZeroValue_TransactionCALLwithData" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "0908df20ad65e117e99311134f1f4d5ae361132699c8fb418ce1104b13b2aef1",
+                    "hash" : "0x0908df20ad65e117e99311134f1f4d5ae361132699c8fb418ce1104b13b2aef1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "0908df20ad65e117e99311134f1f4d5ae361132699c8fb418ce1104b13b2aef1",
+                    "hash" : "0x0908df20ad65e117e99311134f1f4d5ae361132699c8fb418ce1104b13b2aef1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "0908df20ad65e117e99311134f1f4d5ae361132699c8fb418ce1104b13b2aef1",
+                    "hash" : "0x0908df20ad65e117e99311134f1f4d5ae361132699c8fb418ce1104b13b2aef1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "0908df20ad65e117e99311134f1f4d5ae361132699c8fb418ce1104b13b2aef1",
+                    "hash" : "0x0908df20ad65e117e99311134f1f4d5ae361132699c8fb418ce1104b13b2aef1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0908df20ad65e117e99311134f1f4d5ae361132699c8fb418ce1104b13b2aef1",
+                    "hash" : "0x0908df20ad65e117e99311134f1f4d5ae361132699c8fb418ce1104b13b2aef1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -74,14 +74,14 @@
                 "0x1122334455667788991011121314151617181920"
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToEmpty.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToEmpty.json
index 8e93b47b9..3080b6bf6 100644
--- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToEmpty.json
+++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToEmpty.json
@@ -1,17 +1,17 @@
 {
     "NonZeroValue_TransactionCALLwithData_ToEmpty" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "0908df20ad65e117e99311134f1f4d5ae361132699c8fb418ce1104b13b2aef1",
+                    "hash" : "0x0908df20ad65e117e99311134f1f4d5ae361132699c8fb418ce1104b13b2aef1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "0908df20ad65e117e99311134f1f4d5ae361132699c8fb418ce1104b13b2aef1",
+                    "hash" : "0x0908df20ad65e117e99311134f1f4d5ae361132699c8fb418ce1104b13b2aef1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "0908df20ad65e117e99311134f1f4d5ae361132699c8fb418ce1104b13b2aef1",
+                    "hash" : "0x0908df20ad65e117e99311134f1f4d5ae361132699c8fb418ce1104b13b2aef1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "0908df20ad65e117e99311134f1f4d5ae361132699c8fb418ce1104b13b2aef1",
+                    "hash" : "0x0908df20ad65e117e99311134f1f4d5ae361132699c8fb418ce1104b13b2aef1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0908df20ad65e117e99311134f1f4d5ae361132699c8fb418ce1104b13b2aef1",
+                    "hash" : "0x0908df20ad65e117e99311134f1f4d5ae361132699c8fb418ce1104b13b2aef1",
                     "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 @@
                 "0x1122334455667788991011121314151617181920"
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToNonNonZeroBalance.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToNonNonZeroBalance.json
index 3625d8bbb..ee33d37be 100644
--- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToNonNonZeroBalance.json
+++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToNonNonZeroBalance.json
@@ -1,17 +1,17 @@
 {
     "NonZeroValue_TransactionCALLwithData_ToNonNonZeroBalance" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "44932a33e4b8e8ee19556bc9e6d8f55276559d47643bf45f171dd0546ef662ff",
+                    "hash" : "0x44932a33e4b8e8ee19556bc9e6d8f55276559d47643bf45f171dd0546ef662ff",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "44932a33e4b8e8ee19556bc9e6d8f55276559d47643bf45f171dd0546ef662ff",
+                    "hash" : "0x44932a33e4b8e8ee19556bc9e6d8f55276559d47643bf45f171dd0546ef662ff",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "44932a33e4b8e8ee19556bc9e6d8f55276559d47643bf45f171dd0546ef662ff",
+                    "hash" : "0x44932a33e4b8e8ee19556bc9e6d8f55276559d47643bf45f171dd0546ef662ff",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "44932a33e4b8e8ee19556bc9e6d8f55276559d47643bf45f171dd0546ef662ff",
+                    "hash" : "0x44932a33e4b8e8ee19556bc9e6d8f55276559d47643bf45f171dd0546ef662ff",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "44932a33e4b8e8ee19556bc9e6d8f55276559d47643bf45f171dd0546ef662ff",
+                    "hash" : "0x44932a33e4b8e8ee19556bc9e6d8f55276559d47643bf45f171dd0546ef662ff",
                     "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 @@
                 "0x1122334455667788991011121314151617181920"
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToOneStorageKey.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToOneStorageKey.json
index 365f0a17c..11cd8b023 100644
--- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToOneStorageKey.json
+++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToOneStorageKey.json
@@ -1,17 +1,17 @@
 {
     "NonZeroValue_TransactionCALLwithData_ToOneStorageKey" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "15e8cf2d5338ff06b25f36e70244bf5803b366d94c5bb9a7fa74d9834558b5a6",
+                    "hash" : "0x15e8cf2d5338ff06b25f36e70244bf5803b366d94c5bb9a7fa74d9834558b5a6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "15e8cf2d5338ff06b25f36e70244bf5803b366d94c5bb9a7fa74d9834558b5a6",
+                    "hash" : "0x15e8cf2d5338ff06b25f36e70244bf5803b366d94c5bb9a7fa74d9834558b5a6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "15e8cf2d5338ff06b25f36e70244bf5803b366d94c5bb9a7fa74d9834558b5a6",
+                    "hash" : "0x15e8cf2d5338ff06b25f36e70244bf5803b366d94c5bb9a7fa74d9834558b5a6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "15e8cf2d5338ff06b25f36e70244bf5803b366d94c5bb9a7fa74d9834558b5a6",
+                    "hash" : "0x15e8cf2d5338ff06b25f36e70244bf5803b366d94c5bb9a7fa74d9834558b5a6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "15e8cf2d5338ff06b25f36e70244bf5803b366d94c5bb9a7fa74d9834558b5a6",
+                    "hash" : "0x15e8cf2d5338ff06b25f36e70244bf5803b366d94c5bb9a7fa74d9834558b5a6",
                     "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 @@
                 "0x1122334455667788991011121314151617181920"
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0.json
index 77b5c234f..8342998db 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0.json
@@ -1,17 +1,17 @@
 {
     "CALLCODEEcrecover0" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9eac1b6a89d6b05265e9b04176c468a87c03d1ea45cf55b06efd0c9ab48d2301",
+                    "hash" : "0x9eac1b6a89d6b05265e9b04176c468a87c03d1ea45cf55b06efd0c9ab48d2301",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6596d735e854ec9815daff8a76980309a1830fb70a4d2e50cccfeacd4ef08ea7",
+                    "hash" : "0x6596d735e854ec9815daff8a76980309a1830fb70a4d2e50cccfeacd4ef08ea7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f799a1ce0f751eb1229b63c7f8f88e8cee0b5aa0bb4533131706b570c4bddcca",
+                    "hash" : "0xf799a1ce0f751eb1229b63c7f8f88e8cee0b5aa0bb4533131706b570c4bddcca",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f799a1ce0f751eb1229b63c7f8f88e8cee0b5aa0bb4533131706b570c4bddcca",
+                    "hash" : "0xf799a1ce0f751eb1229b63c7f8f88e8cee0b5aa0bb4533131706b570c4bddcca",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6596d735e854ec9815daff8a76980309a1830fb70a4d2e50cccfeacd4ef08ea7",
+                    "hash" : "0x6596d735e854ec9815daff8a76980309a1830fb70a4d2e50cccfeacd4ef08ea7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f260025560a060020a608051066000556000543214600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3652240"
+                "0x37ba90"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_0input.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_0input.json
index a59862e0f..18b7303f4 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_0input.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_0input.json
@@ -1,17 +1,17 @@
 {
     "CALLCODEEcrecover0_0input" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "0c8f940ac7ccc785ea3269c54e2163015371fe33503a1f8132b978038cd575e1",
+                    "hash" : "0x0c8f940ac7ccc785ea3269c54e2163015371fe33503a1f8132b978038cd575e1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "57d85a776f0ed60eb9f8addc94d51c6a4291bd377076fa0f472c3c3e36cf0faa",
+                    "hash" : "0x57d85a776f0ed60eb9f8addc94d51c6a4291bd377076fa0f472c3c3e36cf0faa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "94aa48e4c65f925e0720999909ae372c2a8d0a323188c7836c9acd9de8084d01",
+                    "hash" : "0x94aa48e4c65f925e0720999909ae372c2a8d0a323188c7836c9acd9de8084d01",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "94aa48e4c65f925e0720999909ae372c2a8d0a323188c7836c9acd9de8084d01",
+                    "hash" : "0x94aa48e4c65f925e0720999909ae372c2a8d0a323188c7836c9acd9de8084d01",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "57d85a776f0ed60eb9f8addc94d51c6a4291bd377076fa0f472c3c3e36cf0faa",
+                    "hash" : "0x57d85a776f0ed60eb9f8addc94d51c6a4291bd377076fa0f472c3c3e36cf0faa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x602060806080600060006001620493e0f260025560a060020a60805106600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3652240"
+                "0x37ba90"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_Gas2999.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_Gas2999.json
index b674b7aea..6ad5db627 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_Gas2999.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_Gas2999.json
@@ -1,17 +1,17 @@
 {
     "CALLCODEEcrecover0_Gas2999" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b883081d90f494799d270110223dadef0a39d8876bc0c14f4826c5d3e3ae0ebb",
+                    "hash" : "0xb883081d90f494799d270110223dadef0a39d8876bc0c14f4826c5d3e3ae0ebb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "897f996d27f67f93cf68f7a3dc8aaec646b713234c34a2c162a43841ac55dc90",
+                    "hash" : "0x897f996d27f67f93cf68f7a3dc8aaec646b713234c34a2c162a43841ac55dc90",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "c6d9353338911dcd8ade0686ffb48152ef6d6c3f5f352d954e66f10dfec29840",
+                    "hash" : "0xc6d9353338911dcd8ade0686ffb48152ef6d6c3f5f352d954e66f10dfec29840",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c6d9353338911dcd8ade0686ffb48152ef6d6c3f5f352d954e66f10dfec29840",
+                    "hash" : "0xc6d9353338911dcd8ade0686ffb48152ef6d6c3f5f352d954e66f10dfec29840",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "897f996d27f67f93cf68f7a3dc8aaec646b713234c34a2c162a43841ac55dc90",
+                    "hash" : "0x897f996d27f67f93cf68f7a3dc8aaec646b713234c34a2c162a43841ac55dc90",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001610bb7f260025560a060020a608051066000556000543214600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_NoGas.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_NoGas.json
index aed19bd1e..4a8a1a669 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_NoGas.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_NoGas.json
@@ -1,17 +1,17 @@
 {
     "CALLCODEEcrecover0_NoGas" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "2be771c1f218681ff8b8a2c2af94605601c815cd7034c69891a7dd17c5c26313",
+                    "hash" : "0x2be771c1f218681ff8b8a2c2af94605601c815cd7034c69891a7dd17c5c26313",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6ffab1a138206bf9486ae55c422414ef4a7d287370035c89b1b58f0eb3facc26",
+                    "hash" : "0x6ffab1a138206bf9486ae55c422414ef4a7d287370035c89b1b58f0eb3facc26",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9bfb9c885eac441898a31454c65c65ff2ec84238221af48da2ac32500bb20f5e",
+                    "hash" : "0x9bfb9c885eac441898a31454c65c65ff2ec84238221af48da2ac32500bb20f5e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9bfb9c885eac441898a31454c65c65ff2ec84238221af48da2ac32500bb20f5e",
+                    "hash" : "0x9bfb9c885eac441898a31454c65c65ff2ec84238221af48da2ac32500bb20f5e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6ffab1a138206bf9486ae55c422414ef4a7d287370035c89b1b58f0eb3facc26",
+                    "hash" : "0x6ffab1a138206bf9486ae55c422414ef4a7d287370035c89b1b58f0eb3facc26",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c45496060526020608060806000600160016000f260025560a060020a608051066000556000543214600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_completeReturnValue.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_completeReturnValue.json
index 8ad1b35df..6472049a7 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_completeReturnValue.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_completeReturnValue.json
@@ -1,17 +1,17 @@
 {
     "CALLCODEEcrecover0_completeReturnValue" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "584bd8635ffc1fbba4dadff92094fec0a28de4ced2191b1b68d17eb2efe11bab",
+                    "hash" : "0x584bd8635ffc1fbba4dadff92094fec0a28de4ced2191b1b68d17eb2efe11bab",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "584bd8635ffc1fbba4dadff92094fec0a28de4ced2191b1b68d17eb2efe11bab",
+                    "hash" : "0x584bd8635ffc1fbba4dadff92094fec0a28de4ced2191b1b68d17eb2efe11bab",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "bb908853ebf24a2f1892e21ab87edfcdae6c242b9167b4c234de7aa9cb97b524",
+                    "hash" : "0xbb908853ebf24a2f1892e21ab87edfcdae6c242b9167b4c234de7aa9cb97b524",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "bb908853ebf24a2f1892e21ab87edfcdae6c242b9167b4c234de7aa9cb97b524",
+                    "hash" : "0xbb908853ebf24a2f1892e21ab87edfcdae6c242b9167b4c234de7aa9cb97b524",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "584bd8635ffc1fbba4dadff92094fec0a28de4ced2191b1b68d17eb2efe11bab",
+                    "hash" : "0x584bd8635ffc1fbba4dadff92094fec0a28de4ced2191b1b68d17eb2efe11bab",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001610bb8f2600255608051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_gas3000.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_gas3000.json
index 3360a44ad..3cecb5317 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_gas3000.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_gas3000.json
@@ -1,17 +1,17 @@
 {
     "CALLCODEEcrecover0_gas3000" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "22f37948a081bbb85a340254a983ca835503113cfb6418143021fb89021e5bf5",
+                    "hash" : "0x22f37948a081bbb85a340254a983ca835503113cfb6418143021fb89021e5bf5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "fa8f83131d8d5f9322d2893e12342a8980948d1e734cfdbfa99aabefb9942b03",
+                    "hash" : "0xfa8f83131d8d5f9322d2893e12342a8980948d1e734cfdbfa99aabefb9942b03",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "30162640b2bf57fa99f543a25f45882c8e41d1d3e1ceffded3b72daa6884c1e1",
+                    "hash" : "0x30162640b2bf57fa99f543a25f45882c8e41d1d3e1ceffded3b72daa6884c1e1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "30162640b2bf57fa99f543a25f45882c8e41d1d3e1ceffded3b72daa6884c1e1",
+                    "hash" : "0x30162640b2bf57fa99f543a25f45882c8e41d1d3e1ceffded3b72daa6884c1e1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "fa8f83131d8d5f9322d2893e12342a8980948d1e734cfdbfa99aabefb9942b03",
+                    "hash" : "0xfa8f83131d8d5f9322d2893e12342a8980948d1e734cfdbfa99aabefb9942b03",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001610bb8f260025560a060020a608051066000556000543214600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_overlappingInputOutput.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_overlappingInputOutput.json
index e2c79be7e..98a434b87 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_overlappingInputOutput.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_overlappingInputOutput.json
@@ -1,17 +1,17 @@
 {
     "CALLCODEEcrecover0_overlappingInputOutput" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e575a3b7d926bc4c6de7be26d68a1d094b0ec0841d2130493d23ab102051596a",
+                    "hash" : "0xe575a3b7d926bc4c6de7be26d68a1d094b0ec0841d2130493d23ab102051596a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "91656c11a9845fd85d0bd83befcd344906d4aa16edfd5fa4273d01b634476b3d",
+                    "hash" : "0x91656c11a9845fd85d0bd83befcd344906d4aa16edfd5fa4273d01b634476b3d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "ca1717450cce44ba42c7d5d190ba1b05105af965e211fba73460f390e8fd1be3",
+                    "hash" : "0xca1717450cce44ba42c7d5d190ba1b05105af965e211fba73460f390e8fd1be3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ca1717450cce44ba42c7d5d190ba1b05105af965e211fba73460f390e8fd1be3",
+                    "hash" : "0xca1717450cce44ba42c7d5d190ba1b05105af965e211fba73460f390e8fd1be3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "91656c11a9845fd85d0bd83befcd344906d4aa16edfd5fa4273d01b634476b3d",
+                    "hash" : "0x91656c11a9845fd85d0bd83befcd344906d4aa16edfd5fa4273d01b634476b3d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060406080600060006001620493e0f260025560a060020a604051066000556000543214600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover1.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover1.json
index c5d2ad09d..8c4f4695e 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover1.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover1.json
@@ -1,17 +1,17 @@
 {
     "CALLCODEEcrecover1" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f262fe6a03bbc8679c4a82514702934627d13d6c7e76085eae0ef31de1cfbc73",
+                    "hash" : "0xf262fe6a03bbc8679c4a82514702934627d13d6c7e76085eae0ef31de1cfbc73",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "12c413ef17691f161eeb212121bbad4804d14a8ffc8ecf0bb740ab1229beebcc",
+                    "hash" : "0x12c413ef17691f161eeb212121bbad4804d14a8ffc8ecf0bb740ab1229beebcc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5adfb4e75598f76d070edb5056d4360ae6eaac1e0c6776d82ef688bec4ca38ab",
+                    "hash" : "0x5adfb4e75598f76d070edb5056d4360ae6eaac1e0c6776d82ef688bec4ca38ab",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5adfb4e75598f76d070edb5056d4360ae6eaac1e0c6776d82ef688bec4ca38ab",
+                    "hash" : "0x5adfb4e75598f76d070edb5056d4360ae6eaac1e0c6776d82ef688bec4ca38ab",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "12c413ef17691f161eeb212121bbad4804d14a8ffc8ecf0bb740ab1229beebcc",
+                    "hash" : "0x12c413ef17691f161eeb212121bbad4804d14a8ffc8ecf0bb740ab1229beebcc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c60005260016020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620186a0f260025560a060020a608051066000556000543214600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover2.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover2.json
index 7107cb161..9d88c5397 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover2.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover2.json
@@ -1,17 +1,17 @@
 {
     "CALLCODEEcrecover2" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "8be0de871f149dd9036ffea13ad9076a19b0a87f6d7828103907724e28f83b5d",
+                    "hash" : "0x8be0de871f149dd9036ffea13ad9076a19b0a87f6d7828103907724e28f83b5d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9b3d7d6eac73bb9f96ea5f8157c4993f0459a65ea5918cc5c2196238be22a0cd",
+                    "hash" : "0x9b3d7d6eac73bb9f96ea5f8157c4993f0459a65ea5918cc5c2196238be22a0cd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2b063782ff9c42c18b0c440e41a1b2097c8f75389f698c7b69af9484e87b1394",
+                    "hash" : "0x2b063782ff9c42c18b0c440e41a1b2097c8f75389f698c7b69af9484e87b1394",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "2b063782ff9c42c18b0c440e41a1b2097c8f75389f698c7b69af9484e87b1394",
+                    "hash" : "0x2b063782ff9c42c18b0c440e41a1b2097c8f75389f698c7b69af9484e87b1394",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9b3d7d6eac73bb9f96ea5f8157c4993f0459a65ea5918cc5c2196238be22a0cd",
+                    "hash" : "0x9b3d7d6eac73bb9f96ea5f8157c4993f0459a65ea5918cc5c2196238be22a0cd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6021527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549604152602060616061600060006001620186a0f260025560a060020a606151066000556000543214600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover3.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover3.json
index aa8755aba..3cbe69837 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover3.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover3.json
@@ -1,17 +1,17 @@
 {
     "CALLCODEEcrecover3" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "fed1e9a3da583046162af6ed6171e7683d3a89100c474e7617931cbb23c9171e",
+                    "hash" : "0xfed1e9a3da583046162af6ed6171e7683d3a89100c474e7617931cbb23c9171e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "66a61576f892dd293458323d70df471ca61771c959203d1e174d64d557e53aca",
+                    "hash" : "0x66a61576f892dd293458323d70df471ca61771c959203d1e174d64d557e53aca",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "eb94655adec71a88e2615ac24a4fa697b7ac3a2d745873069ccf0232c494313c",
+                    "hash" : "0xeb94655adec71a88e2615ac24a4fa697b7ac3a2d745873069ccf0232c494313c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "eb94655adec71a88e2615ac24a4fa697b7ac3a2d745873069ccf0232c494313c",
+                    "hash" : "0xeb94655adec71a88e2615ac24a4fa697b7ac3a2d745873069ccf0232c494313c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "66a61576f892dd293458323d70df471ca61771c959203d1e174d64d557e53aca",
+                    "hash" : "0x66a61576f892dd293458323d70df471ca61771c959203d1e174d64d557e53aca",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x7f2f380a2dea7e778d81affc2443403b8fe4644db442ae4862ff5bb3732829cdb9600052601b6020527f6b65ccb0558806e9b097f27a396d08f964e37b8b7af6ceeb516ff86739fbea0a6040527f37cbc8d883e129a4b1ef9d5f1df53c4f21a3ef147cf2a50a4ede0eb06ce092d4606052602060806080600060006001620186a0f260025560a060020a608051066000556000543214600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover80.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover80.json
index 60bb7971a..45655dcf7 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover80.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover80.json
@@ -1,17 +1,17 @@
 {
     "CALLCODEEcrecover80" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e216badd7d303a75a5ba7269f21c9e25353a4e0276757e55459ce0da5e2f5fc8",
+                    "hash" : "0xe216badd7d303a75a5ba7269f21c9e25353a4e0276757e55459ce0da5e2f5fc8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "40b646526608d59b43f550e238f50a3bcfaf065b83fa186e877015fc93b6f738",
+                    "hash" : "0x40b646526608d59b43f550e238f50a3bcfaf065b83fa186e877015fc93b6f738",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "7a06a9b9029ed27905c979757d738d9172a2bdd83c14db8ed22582cb4852ab80",
+                    "hash" : "0x7a06a9b9029ed27905c979757d738d9172a2bdd83c14db8ed22582cb4852ab80",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "7a06a9b9029ed27905c979757d738d9172a2bdd83c14db8ed22582cb4852ab80",
+                    "hash" : "0x7a06a9b9029ed27905c979757d738d9172a2bdd83c14db8ed22582cb4852ab80",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "40b646526608d59b43f550e238f50a3bcfaf065b83fa186e877015fc93b6f738",
+                    "hash" : "0x40b646526608d59b43f550e238f50a3bcfaf065b83fa186e877015fc93b6f738",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x7ec547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527eb1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527eb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f260025560a060020a608051066000556000543214600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3652240"
+                "0x37ba90"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverH_prefixed0.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverH_prefixed0.json
index 37074c36d..8e10efe76 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverH_prefixed0.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverH_prefixed0.json
@@ -1,17 +1,17 @@
 {
     "CALLCODEEcrecoverH_prefixed0" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c7710f6a93d1f58657ea85ded47657ba849f076d133087388e6cb2bd5f674ba1",
+                    "hash" : "0xc7710f6a93d1f58657ea85ded47657ba849f076d133087388e6cb2bd5f674ba1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7897ca4676634b39cb65d8f06d58720262c5a17cebf696dbadd378550ff0cd1f",
+                    "hash" : "0x7897ca4676634b39cb65d8f06d58720262c5a17cebf696dbadd378550ff0cd1f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "fd40abde077f5ddc8e6f9e0077117fc2c5f0a12039525ba83ad79d2519a2f1bb",
+                    "hash" : "0xfd40abde077f5ddc8e6f9e0077117fc2c5f0a12039525ba83ad79d2519a2f1bb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "fd40abde077f5ddc8e6f9e0077117fc2c5f0a12039525ba83ad79d2519a2f1bb",
+                    "hash" : "0xfd40abde077f5ddc8e6f9e0077117fc2c5f0a12039525ba83ad79d2519a2f1bb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7897ca4676634b39cb65d8f06d58720262c5a17cebf696dbadd378550ff0cd1f",
+                    "hash" : "0x7897ca4676634b39cb65d8f06d58720262c5a17cebf696dbadd378550ff0cd1f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x7ec547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f260025560a060020a608051066000556000543214600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3652240"
+                "0x37ba90"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverR_prefixed0.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverR_prefixed0.json
index 6208f2352..7d2da9c65 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverR_prefixed0.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverR_prefixed0.json
@@ -1,17 +1,17 @@
 {
     "CALLCODEEcrecoverR_prefixed0" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "ef146e382f63cd5e0c0b19a2b982fa24d65b5e5816fd99b4852942bca11c1994",
+                    "hash" : "0xef146e382f63cd5e0c0b19a2b982fa24d65b5e5816fd99b4852942bca11c1994",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e0fb6df8294c30d22dd68bb80917de61e7ca3fb5bd9e29cb29dab6432176be7d",
+                    "hash" : "0xe0fb6df8294c30d22dd68bb80917de61e7ca3fb5bd9e29cb29dab6432176be7d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f6e3d4a6aa057bdd8a5a8b8648fdc1b2efd1146db5d6e003cf0c0d344d5901fd",
+                    "hash" : "0xf6e3d4a6aa057bdd8a5a8b8648fdc1b2efd1146db5d6e003cf0c0d344d5901fd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f6e3d4a6aa057bdd8a5a8b8648fdc1b2efd1146db5d6e003cf0c0d344d5901fd",
+                    "hash" : "0xf6e3d4a6aa057bdd8a5a8b8648fdc1b2efd1146db5d6e003cf0c0d344d5901fd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e0fb6df8294c30d22dd68bb80917de61e7ca3fb5bd9e29cb29dab6432176be7d",
+                    "hash" : "0xe0fb6df8294c30d22dd68bb80917de61e7ca3fb5bd9e29cb29dab6432176be7d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527eb1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f260025560a060020a608051066000556000543214600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3652240"
+                "0x37ba90"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverS_prefixed0.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverS_prefixed0.json
index cb9143fb8..607f1fe9c 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverS_prefixed0.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverS_prefixed0.json
@@ -1,17 +1,17 @@
 {
     "CALLCODEEcrecoverS_prefixed0" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "ea5900accbdb7ac4d5e3838d594a0a6be6996889c5926e781734788b4ef8350d",
+                    "hash" : "0xea5900accbdb7ac4d5e3838d594a0a6be6996889c5926e781734788b4ef8350d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9fc4b5d1e199ad0d51733ecc120706356d81ee5f0c49a2ae6494e8f23a86dde9",
+                    "hash" : "0x9fc4b5d1e199ad0d51733ecc120706356d81ee5f0c49a2ae6494e8f23a86dde9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "7a263a0b4ce8299dff23b911080cadab60bfec7ed41b171647e27074de3741af",
+                    "hash" : "0x7a263a0b4ce8299dff23b911080cadab60bfec7ed41b171647e27074de3741af",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "7a263a0b4ce8299dff23b911080cadab60bfec7ed41b171647e27074de3741af",
+                    "hash" : "0x7a263a0b4ce8299dff23b911080cadab60bfec7ed41b171647e27074de3741af",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9fc4b5d1e199ad0d51733ecc120706356d81ee5f0c49a2ae6494e8f23a86dde9",
+                    "hash" : "0x9fc4b5d1e199ad0d51733ecc120706356d81ee5f0c49a2ae6494e8f23a86dde9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527eb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f260025560a060020a608051066000556000543214600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3652240"
+                "0x37ba90"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverV_prefixed0.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverV_prefixed0.json
index 3a8e06ec3..b0c182950 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverV_prefixed0.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverV_prefixed0.json
@@ -1,17 +1,17 @@
 {
     "CALLCODEEcrecoverV_prefixed0" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9eac1b6a89d6b05265e9b04176c468a87c03d1ea45cf55b06efd0c9ab48d2301",
+                    "hash" : "0x9eac1b6a89d6b05265e9b04176c468a87c03d1ea45cf55b06efd0c9ab48d2301",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6596d735e854ec9815daff8a76980309a1830fb70a4d2e50cccfeacd4ef08ea7",
+                    "hash" : "0x6596d735e854ec9815daff8a76980309a1830fb70a4d2e50cccfeacd4ef08ea7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f799a1ce0f751eb1229b63c7f8f88e8cee0b5aa0bb4533131706b570c4bddcca",
+                    "hash" : "0xf799a1ce0f751eb1229b63c7f8f88e8cee0b5aa0bb4533131706b570c4bddcca",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f799a1ce0f751eb1229b63c7f8f88e8cee0b5aa0bb4533131706b570c4bddcca",
+                    "hash" : "0xf799a1ce0f751eb1229b63c7f8f88e8cee0b5aa0bb4533131706b570c4bddcca",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6596d735e854ec9815daff8a76980309a1830fb70a4d2e50cccfeacd4ef08ea7",
+                    "hash" : "0x6596d735e854ec9815daff8a76980309a1830fb70a4d2e50cccfeacd4ef08ea7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f260025560a060020a608051066000556000543214600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3652240"
+                "0x37ba90"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverV_prefixedf0.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverV_prefixedf0.json
index 1c131f5b2..fa37aab1d 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverV_prefixedf0.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverV_prefixedf0.json
@@ -1,17 +1,17 @@
 {
     "CALLCODEEcrecoverV_prefixedf0" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9eba53e9f11d7b45ebcff8d960ca6ee701d572b1533c0f7acbf6210373d1e34f",
+                    "hash" : "0x9eba53e9f11d7b45ebcff8d960ca6ee701d572b1533c0f7acbf6210373d1e34f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "9eba53e9f11d7b45ebcff8d960ca6ee701d572b1533c0f7acbf6210373d1e34f",
+                    "hash" : "0x9eba53e9f11d7b45ebcff8d960ca6ee701d572b1533c0f7acbf6210373d1e34f",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -29,7 +29,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b2ee88dee876096e747b6879e06a263d98e4c3cb8d24ed173382259112e69226",
+                    "hash" : "0xb2ee88dee876096e747b6879e06a263d98e4c3cb8d24ed173382259112e69226",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -37,7 +37,7 @@
                     }
                 },
                 {
-                    "hash" : "b2ee88dee876096e747b6879e06a263d98e4c3cb8d24ed173382259112e69226",
+                    "hash" : "0xb2ee88dee876096e747b6879e06a263d98e4c3cb8d24ed173382259112e69226",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -47,7 +47,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "15e6392b8f1990a2f59f6f0d8af5b00239dcdafe68bd4cab13f1e00ce783c533",
+                    "hash" : "0x15e6392b8f1990a2f59f6f0d8af5b00239dcdafe68bd4cab13f1e00ce783c533",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -55,7 +55,7 @@
                     }
                 },
                 {
-                    "hash" : "15e6392b8f1990a2f59f6f0d8af5b00239dcdafe68bd4cab13f1e00ce783c533",
+                    "hash" : "0x15e6392b8f1990a2f59f6f0d8af5b00239dcdafe68bd4cab13f1e00ce783c533",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -65,7 +65,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "15e6392b8f1990a2f59f6f0d8af5b00239dcdafe68bd4cab13f1e00ce783c533",
+                    "hash" : "0x15e6392b8f1990a2f59f6f0d8af5b00239dcdafe68bd4cab13f1e00ce783c533",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -73,7 +73,7 @@
                     }
                 },
                 {
-                    "hash" : "15e6392b8f1990a2f59f6f0d8af5b00239dcdafe68bd4cab13f1e00ce783c533",
+                    "hash" : "0x15e6392b8f1990a2f59f6f0d8af5b00239dcdafe68bd4cab13f1e00ce783c533",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -83,7 +83,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b2ee88dee876096e747b6879e06a263d98e4c3cb8d24ed173382259112e69226",
+                    "hash" : "0xb2ee88dee876096e747b6879e06a263d98e4c3cb8d24ed173382259112e69226",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -91,7 +91,7 @@
                     }
                 },
                 {
-                    "hash" : "b2ee88dee876096e747b6879e06a263d98e4c3cb8d24ed173382259112e69226",
+                    "hash" : "0xb2ee88dee876096e747b6879e06a263d98e4c3cb8d24ed173382259112e69226",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -101,16 +101,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c6000526000356020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f260025560a060020a608051066000556000543214600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -122,14 +122,14 @@
                 "0x00000000000000000000000000000000f000000000000000000000000000001c"
             ],
             "gasLimit" : [
-                "3652240"
+                "0x37ba90"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentitiy_0.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentitiy_0.json
index f196c77f3..de56b202a 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentitiy_0.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentitiy_0.json
@@ -1,17 +1,17 @@
 {
     "CALLCODEIdentitiy_0" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e03f1d6e66a44f43647704defdbe06e5535f1fecc57350344fdce2d6c500f0ff",
+                    "hash" : "0xe03f1d6e66a44f43647704defdbe06e5535f1fecc57350344fdce2d6c500f0ff",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e03f1d6e66a44f43647704defdbe06e5535f1fecc57350344fdce2d6c500f0ff",
+                    "hash" : "0xe03f1d6e66a44f43647704defdbe06e5535f1fecc57350344fdce2d6c500f0ff",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5d8b1ba285d79d0fbdc0f7ebe2276b1a61196f40252f31306ddb0da74dc67a08",
+                    "hash" : "0x5d8b1ba285d79d0fbdc0f7ebe2276b1a61196f40252f31306ddb0da74dc67a08",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5d8b1ba285d79d0fbdc0f7ebe2276b1a61196f40252f31306ddb0da74dc67a08",
+                    "hash" : "0x5d8b1ba285d79d0fbdc0f7ebe2276b1a61196f40252f31306ddb0da74dc67a08",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e03f1d6e66a44f43647704defdbe06e5535f1fecc57350344fdce2d6c500f0ff",
+                    "hash" : "0xe03f1d6e66a44f43647704defdbe06e5535f1fecc57350344fdce2d6c500f0ff",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x600160005260206000602060006000600460fff2600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentitiy_1.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentitiy_1.json
index b63f0378c..6f0d22996 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentitiy_1.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentitiy_1.json
@@ -1,17 +1,17 @@
 {
     "CALLCODEIdentitiy_1" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "4e4c71d51978ca6ee442b08705a89c415ea71e5bf00b0963e923465b4bc2062f",
+                    "hash" : "0x4e4c71d51978ca6ee442b08705a89c415ea71e5bf00b0963e923465b4bc2062f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "4e4c71d51978ca6ee442b08705a89c415ea71e5bf00b0963e923465b4bc2062f",
+                    "hash" : "0x4e4c71d51978ca6ee442b08705a89c415ea71e5bf00b0963e923465b4bc2062f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "1ef50261df0bf5ee5a0d9abc28d8695bbd0bb6bb5ff4b1775419942a2cb5dd38",
+                    "hash" : "0x1ef50261df0bf5ee5a0d9abc28d8695bbd0bb6bb5ff4b1775419942a2cb5dd38",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "1ef50261df0bf5ee5a0d9abc28d8695bbd0bb6bb5ff4b1775419942a2cb5dd38",
+                    "hash" : "0x1ef50261df0bf5ee5a0d9abc28d8695bbd0bb6bb5ff4b1775419942a2cb5dd38",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "4e4c71d51978ca6ee442b08705a89c415ea71e5bf00b0963e923465b4bc2062f",
+                    "hash" : "0x4e4c71d51978ca6ee442b08705a89c415ea71e5bf00b0963e923465b4bc2062f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x6020600060006000600060046101f4f2600255600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_1_nonzeroValue.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_1_nonzeroValue.json
index 304cd2cd2..a60a732dc 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_1_nonzeroValue.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_1_nonzeroValue.json
@@ -1,17 +1,17 @@
 {
     "CALLCODEIdentity_1_nonzeroValue" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x05f5e100",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "0a425ed069c15a06c4c043803e98ed613c7fda0c01c911816f581ad75695712b",
+                    "hash" : "0x0a425ed069c15a06c4c043803e98ed613c7fda0c01c911816f581ad75695712b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "0a425ed069c15a06c4c043803e98ed613c7fda0c01c911816f581ad75695712b",
+                    "hash" : "0x0a425ed069c15a06c4c043803e98ed613c7fda0c01c911816f581ad75695712b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "52afe51d1eee169b025f53bcba971e6ebd51c0b60a8b201caa6c4a2f3e1d29bf",
+                    "hash" : "0x52afe51d1eee169b025f53bcba971e6ebd51c0b60a8b201caa6c4a2f3e1d29bf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "52afe51d1eee169b025f53bcba971e6ebd51c0b60a8b201caa6c4a2f3e1d29bf",
+                    "hash" : "0x52afe51d1eee169b025f53bcba971e6ebd51c0b60a8b201caa6c4a2f3e1d29bf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0a425ed069c15a06c4c043803e98ed613c7fda0c01c911816f581ad75695712b",
+                    "hash" : "0x0a425ed069c15a06c4c043803e98ed613c7fda0c01c911816f581ad75695712b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0bebc200",
                 "code" : "0x60206000600060006013600462030d40f2600255600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_2.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_2.json
index 5c21abe70..9c6594912 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_2.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_2.json
@@ -1,17 +1,17 @@
 {
     "CALLCODEIdentity_2" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "339317f131bd9e9ae6d70e13aa53267646fe98231c7694a8666041110eb17eed",
+                    "hash" : "0x339317f131bd9e9ae6d70e13aa53267646fe98231c7694a8666041110eb17eed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "339317f131bd9e9ae6d70e13aa53267646fe98231c7694a8666041110eb17eed",
+                    "hash" : "0x339317f131bd9e9ae6d70e13aa53267646fe98231c7694a8666041110eb17eed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e6918c4262f559d6a44c6c555da8635ff01f9fbf2f4ce808c310d37052a8705d",
+                    "hash" : "0xe6918c4262f559d6a44c6c555da8635ff01f9fbf2f4ce808c310d37052a8705d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e6918c4262f559d6a44c6c555da8635ff01f9fbf2f4ce808c310d37052a8705d",
+                    "hash" : "0xe6918c4262f559d6a44c6c555da8635ff01f9fbf2f4ce808c310d37052a8705d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "339317f131bd9e9ae6d70e13aa53267646fe98231c7694a8666041110eb17eed",
+                    "hash" : "0x339317f131bd9e9ae6d70e13aa53267646fe98231c7694a8666041110eb17eed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x64f34578907f6000526020600060256000600060046101f4f2600255600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_3.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_3.json
index bf74e5439..2a4efc92b 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_3.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_3.json
@@ -1,17 +1,17 @@
 {
     "CALLCODEIdentity_3" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "339317f131bd9e9ae6d70e13aa53267646fe98231c7694a8666041110eb17eed",
+                    "hash" : "0x339317f131bd9e9ae6d70e13aa53267646fe98231c7694a8666041110eb17eed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "339317f131bd9e9ae6d70e13aa53267646fe98231c7694a8666041110eb17eed",
+                    "hash" : "0x339317f131bd9e9ae6d70e13aa53267646fe98231c7694a8666041110eb17eed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e6918c4262f559d6a44c6c555da8635ff01f9fbf2f4ce808c310d37052a8705d",
+                    "hash" : "0xe6918c4262f559d6a44c6c555da8635ff01f9fbf2f4ce808c310d37052a8705d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e6918c4262f559d6a44c6c555da8635ff01f9fbf2f4ce808c310d37052a8705d",
+                    "hash" : "0xe6918c4262f559d6a44c6c555da8635ff01f9fbf2f4ce808c310d37052a8705d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "339317f131bd9e9ae6d70e13aa53267646fe98231c7694a8666041110eb17eed",
+                    "hash" : "0x339317f131bd9e9ae6d70e13aa53267646fe98231c7694a8666041110eb17eed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x64f34578907f6000526020600060256000600060046101f4f2600255600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4.json
index 4496d040e..73f528e97 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4.json
@@ -1,17 +1,17 @@
 {
     "CALLCODEIdentity_4" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "4640953e96ae83c81900b74f3f2f666b24ecded241aa3c6e17c1925a78646229",
+                    "hash" : "0x4640953e96ae83c81900b74f3f2f666b24ecded241aa3c6e17c1925a78646229",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "4640953e96ae83c81900b74f3f2f666b24ecded241aa3c6e17c1925a78646229",
+                    "hash" : "0x4640953e96ae83c81900b74f3f2f666b24ecded241aa3c6e17c1925a78646229",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f7f1cfffee70125d101b1097c15f86ddbd67f9efc1a790f7f5a7c081cc82475f",
+                    "hash" : "0xf7f1cfffee70125d101b1097c15f86ddbd67f9efc1a790f7f5a7c081cc82475f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f7f1cfffee70125d101b1097c15f86ddbd67f9efc1a790f7f5a7c081cc82475f",
+                    "hash" : "0xf7f1cfffee70125d101b1097c15f86ddbd67f9efc1a790f7f5a7c081cc82475f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "4640953e96ae83c81900b74f3f2f666b24ecded241aa3c6e17c1925a78646229",
+                    "hash" : "0x4640953e96ae83c81900b74f3f2f666b24ecded241aa3c6e17c1925a78646229",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060046064f2600255600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4_gas17.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4_gas17.json
index 81e711ee0..b4dbbf6e8 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4_gas17.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4_gas17.json
@@ -1,17 +1,17 @@
 {
     "CALLCODEIdentity_4_gas17" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6b6d3209c5ee4053386231d2c7fd643ceaddeea8648258673607e13ef4f337c3",
+                    "hash" : "0x6b6d3209c5ee4053386231d2c7fd643ceaddeea8648258673607e13ef4f337c3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6b6d3209c5ee4053386231d2c7fd643ceaddeea8648258673607e13ef4f337c3",
+                    "hash" : "0x6b6d3209c5ee4053386231d2c7fd643ceaddeea8648258673607e13ef4f337c3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "75b157a2a3ed65dc4b929e3bae97d19a3d5698f2d343e9627f3e3fc99d5fa312",
+                    "hash" : "0x75b157a2a3ed65dc4b929e3bae97d19a3d5698f2d343e9627f3e3fc99d5fa312",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "75b157a2a3ed65dc4b929e3bae97d19a3d5698f2d343e9627f3e3fc99d5fa312",
+                    "hash" : "0x75b157a2a3ed65dc4b929e3bae97d19a3d5698f2d343e9627f3e3fc99d5fa312",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6b6d3209c5ee4053386231d2c7fd643ceaddeea8648258673607e13ef4f337c3",
+                    "hash" : "0x6b6d3209c5ee4053386231d2c7fd643ceaddeea8648258673607e13ef4f337c3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060046011f2600255600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4_gas18.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4_gas18.json
index c3c1cb724..2defd3f34 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4_gas18.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4_gas18.json
@@ -1,17 +1,17 @@
 {
     "CALLCODEIdentity_4_gas18" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e998a0359b9b6ee50bcd2e8cddca4c429768b9f7fff2531a761cfc7999a77cc9",
+                    "hash" : "0xe998a0359b9b6ee50bcd2e8cddca4c429768b9f7fff2531a761cfc7999a77cc9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e998a0359b9b6ee50bcd2e8cddca4c429768b9f7fff2531a761cfc7999a77cc9",
+                    "hash" : "0xe998a0359b9b6ee50bcd2e8cddca4c429768b9f7fff2531a761cfc7999a77cc9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "8affab955d17a66d86c006b3eec16173434624792581690f5e86ca070dc63eec",
+                    "hash" : "0x8affab955d17a66d86c006b3eec16173434624792581690f5e86ca070dc63eec",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "8affab955d17a66d86c006b3eec16173434624792581690f5e86ca070dc63eec",
+                    "hash" : "0x8affab955d17a66d86c006b3eec16173434624792581690f5e86ca070dc63eec",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e998a0359b9b6ee50bcd2e8cddca4c429768b9f7fff2531a761cfc7999a77cc9",
+                    "hash" : "0xe998a0359b9b6ee50bcd2e8cddca4c429768b9f7fff2531a761cfc7999a77cc9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060046012f2600255600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_5.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_5.json
index 216ceb922..bdcad7c4d 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_5.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_5.json
@@ -1,17 +1,17 @@
 {
     "CALLCODEIdentity_5" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e1b1bf135aa55e24a591e8f8a3e092e2263868c6bbc6ef8a01e5ecab5a5d894a",
+                    "hash" : "0xe1b1bf135aa55e24a591e8f8a3e092e2263868c6bbc6ef8a01e5ecab5a5d894a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e1b1bf135aa55e24a591e8f8a3e092e2263868c6bbc6ef8a01e5ecab5a5d894a",
+                    "hash" : "0xe1b1bf135aa55e24a591e8f8a3e092e2263868c6bbc6ef8a01e5ecab5a5d894a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9b33939f10d802dd786623ed008ff320701d5dbef5001560d376ef88164cfbec",
+                    "hash" : "0x9b33939f10d802dd786623ed008ff320701d5dbef5001560d376ef88164cfbec",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9b33939f10d802dd786623ed008ff320701d5dbef5001560d376ef88164cfbec",
+                    "hash" : "0x9b33939f10d802dd786623ed008ff320701d5dbef5001560d376ef88164cfbec",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e1b1bf135aa55e24a591e8f8a3e092e2263868c6bbc6ef8a01e5ecab5a5d894a",
+                    "hash" : "0xe1b1bf135aa55e24a591e8f8a3e092e2263868c6bbc6ef8a01e5ecab5a5d894a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260206000620f4240600060006004610258f2600255600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "10000000"
+                "0x989680"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_0.json b/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_0.json
index 0eacdd148..6e454dfef 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_0.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_0.json
@@ -1,17 +1,17 @@
 {
     "CALLCODERipemd160_0" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c26e661d6843db12e0d0d896e1838ecd63b9a347756da99a0f19b3f62d54e24b",
+                    "hash" : "0xc26e661d6843db12e0d0d896e1838ecd63b9a347756da99a0f19b3f62d54e24b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c26e661d6843db12e0d0d896e1838ecd63b9a347756da99a0f19b3f62d54e24b",
+                    "hash" : "0xc26e661d6843db12e0d0d896e1838ecd63b9a347756da99a0f19b3f62d54e24b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "30b40f8fc4c5d4e9fb62f24ab4d2f158c406fb8a5e9f6443bbc30ad5a07bb651",
+                    "hash" : "0x30b40f8fc4c5d4e9fb62f24ab4d2f158c406fb8a5e9f6443bbc30ad5a07bb651",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "30b40f8fc4c5d4e9fb62f24ab4d2f158c406fb8a5e9f6443bbc30ad5a07bb651",
+                    "hash" : "0x30b40f8fc4c5d4e9fb62f24ab4d2f158c406fb8a5e9f6443bbc30ad5a07bb651",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c26e661d6843db12e0d0d896e1838ecd63b9a347756da99a0f19b3f62d54e24b",
+                    "hash" : "0xc26e661d6843db12e0d0d896e1838ecd63b9a347756da99a0f19b3f62d54e24b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x600160005260206000602060006000600360fff2600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_1.json b/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_1.json
index 2a8497c07..73bff748e 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_1.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_1.json
@@ -1,17 +1,17 @@
 {
     "CALLCODERipemd160_1" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "fa285a579fce99e3bf712a8538dc24ad17d9dedebc78623af4050a7cd31e5347",
+                    "hash" : "0xfa285a579fce99e3bf712a8538dc24ad17d9dedebc78623af4050a7cd31e5347",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "fa285a579fce99e3bf712a8538dc24ad17d9dedebc78623af4050a7cd31e5347",
+                    "hash" : "0xfa285a579fce99e3bf712a8538dc24ad17d9dedebc78623af4050a7cd31e5347",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "132251be75567abbc7ef39c5832f8ace12d118ecaa1c8db9e1c8a75a3d166cbb",
+                    "hash" : "0x132251be75567abbc7ef39c5832f8ace12d118ecaa1c8db9e1c8a75a3d166cbb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "132251be75567abbc7ef39c5832f8ace12d118ecaa1c8db9e1c8a75a3d166cbb",
+                    "hash" : "0x132251be75567abbc7ef39c5832f8ace12d118ecaa1c8db9e1c8a75a3d166cbb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "fa285a579fce99e3bf712a8538dc24ad17d9dedebc78623af4050a7cd31e5347",
+                    "hash" : "0xfa285a579fce99e3bf712a8538dc24ad17d9dedebc78623af4050a7cd31e5347",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x602060006000600060006003610258f2600255600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_2.json b/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_2.json
index eadb840e2..4d6ab45a6 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_2.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_2.json
@@ -1,17 +1,17 @@
 {
     "CALLCODERipemd160_2" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "536140a0df4cf715599a2b8a377e48323cad0e3d3f5eb1e61893f5111a8c94b2",
+                    "hash" : "0x536140a0df4cf715599a2b8a377e48323cad0e3d3f5eb1e61893f5111a8c94b2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "536140a0df4cf715599a2b8a377e48323cad0e3d3f5eb1e61893f5111a8c94b2",
+                    "hash" : "0x536140a0df4cf715599a2b8a377e48323cad0e3d3f5eb1e61893f5111a8c94b2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "8fadc16e1e04e9d81960894ff8851904cf517e9bbe9c5689688b18a34d03478d",
+                    "hash" : "0x8fadc16e1e04e9d81960894ff8851904cf517e9bbe9c5689688b18a34d03478d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "8fadc16e1e04e9d81960894ff8851904cf517e9bbe9c5689688b18a34d03478d",
+                    "hash" : "0x8fadc16e1e04e9d81960894ff8851904cf517e9bbe9c5689688b18a34d03478d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "536140a0df4cf715599a2b8a377e48323cad0e3d3f5eb1e61893f5111a8c94b2",
+                    "hash" : "0x536140a0df4cf715599a2b8a377e48323cad0e3d3f5eb1e61893f5111a8c94b2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x64f34578907f600552602060006025600060006003611770f2600255600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_3.json b/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_3.json
index 26fd6e46f..a0560a34a 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_3.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_3.json
@@ -1,17 +1,17 @@
 {
     "CALLCODERipemd160_3" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "78faadcd29814e3d689e510cd49c457985be48aa12500d08281b894275ff38c9",
+                    "hash" : "0x78faadcd29814e3d689e510cd49c457985be48aa12500d08281b894275ff38c9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "78faadcd29814e3d689e510cd49c457985be48aa12500d08281b894275ff38c9",
+                    "hash" : "0x78faadcd29814e3d689e510cd49c457985be48aa12500d08281b894275ff38c9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "8b6c209afa88718c1e50103fa97c18ef27c5279e113257df57eea141b8a83f24",
+                    "hash" : "0x8b6c209afa88718c1e50103fa97c18ef27c5279e113257df57eea141b8a83f24",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "8b6c209afa88718c1e50103fa97c18ef27c5279e113257df57eea141b8a83f24",
+                    "hash" : "0x8b6c209afa88718c1e50103fa97c18ef27c5279e113257df57eea141b8a83f24",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "78faadcd29814e3d689e510cd49c457985be48aa12500d08281b894275ff38c9",
+                    "hash" : "0x78faadcd29814e3d689e510cd49c457985be48aa12500d08281b894275ff38c9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x64f34578907f600052602060006025600060006003611770f2600255600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_3_postfixed0.json b/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_3_postfixed0.json
index 6e403af12..0db580bdb 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_3_postfixed0.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_3_postfixed0.json
@@ -1,17 +1,17 @@
 {
     "CALLCODERipemd160_3_postfixed0" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "72a652921c45cdc85a3d0172a4643ebc320b8ba58745ac667ccbddfb432b4e77",
+                    "hash" : "0x72a652921c45cdc85a3d0172a4643ebc320b8ba58745ac667ccbddfb432b4e77",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "72a652921c45cdc85a3d0172a4643ebc320b8ba58745ac667ccbddfb432b4e77",
+                    "hash" : "0x72a652921c45cdc85a3d0172a4643ebc320b8ba58745ac667ccbddfb432b4e77",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "58130be64bb95d387e167974a2c2831a1c51c6013e7450f522d9167f9057446e",
+                    "hash" : "0x58130be64bb95d387e167974a2c2831a1c51c6013e7450f522d9167f9057446e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "58130be64bb95d387e167974a2c2831a1c51c6013e7450f522d9167f9057446e",
+                    "hash" : "0x58130be64bb95d387e167974a2c2831a1c51c6013e7450f522d9167f9057446e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "72a652921c45cdc85a3d0172a4643ebc320b8ba58745ac667ccbddfb432b4e77",
+                    "hash" : "0x72a652921c45cdc85a3d0172a4643ebc320b8ba58745ac667ccbddfb432b4e77",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x65f34578907f00600052602060006025600060006003611770f2600255600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_3_prefixed0.json b/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_3_prefixed0.json
index 15267a843..0f31a083d 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_3_prefixed0.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_3_prefixed0.json
@@ -1,17 +1,17 @@
 {
     "CALLCODERipemd160_3_prefixed0" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "78faadcd29814e3d689e510cd49c457985be48aa12500d08281b894275ff38c9",
+                    "hash" : "0x78faadcd29814e3d689e510cd49c457985be48aa12500d08281b894275ff38c9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "78faadcd29814e3d689e510cd49c457985be48aa12500d08281b894275ff38c9",
+                    "hash" : "0x78faadcd29814e3d689e510cd49c457985be48aa12500d08281b894275ff38c9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "8b6c209afa88718c1e50103fa97c18ef27c5279e113257df57eea141b8a83f24",
+                    "hash" : "0x8b6c209afa88718c1e50103fa97c18ef27c5279e113257df57eea141b8a83f24",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "8b6c209afa88718c1e50103fa97c18ef27c5279e113257df57eea141b8a83f24",
+                    "hash" : "0x8b6c209afa88718c1e50103fa97c18ef27c5279e113257df57eea141b8a83f24",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "78faadcd29814e3d689e510cd49c457985be48aa12500d08281b894275ff38c9",
+                    "hash" : "0x78faadcd29814e3d689e510cd49c457985be48aa12500d08281b894275ff38c9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x64f34578907f600052602060006025600060006003611770f2600255600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_4.json b/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_4.json
index e78bd1fee..d769eed0a 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_4.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_4.json
@@ -1,17 +1,17 @@
 {
     "CALLCODERipemd160_4" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d7a415ec40003a2e8e485cedc1929fd9f9d5c4f7eb050a5038d4ffeca96d5a5d",
+                    "hash" : "0xd7a415ec40003a2e8e485cedc1929fd9f9d5c4f7eb050a5038d4ffeca96d5a5d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d7a415ec40003a2e8e485cedc1929fd9f9d5c4f7eb050a5038d4ffeca96d5a5d",
+                    "hash" : "0xd7a415ec40003a2e8e485cedc1929fd9f9d5c4f7eb050a5038d4ffeca96d5a5d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "90161da4f4947bbe433f2ad3954b8a205f58c3800c2fe87ef4f7ee20f45cd5be",
+                    "hash" : "0x90161da4f4947bbe433f2ad3954b8a205f58c3800c2fe87ef4f7ee20f45cd5be",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "90161da4f4947bbe433f2ad3954b8a205f58c3800c2fe87ef4f7ee20f45cd5be",
+                    "hash" : "0x90161da4f4947bbe433f2ad3954b8a205f58c3800c2fe87ef4f7ee20f45cd5be",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d7a415ec40003a2e8e485cedc1929fd9f9d5c4f7eb050a5038d4ffeca96d5a5d",
+                    "hash" : "0xd7a415ec40003a2e8e485cedc1929fd9f9d5c4f7eb050a5038d4ffeca96d5a5d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060036102d0f2600255600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_4_gas719.json b/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_4_gas719.json
index 99055cf8a..e85f5872d 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_4_gas719.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_4_gas719.json
@@ -1,17 +1,17 @@
 {
     "CALLCODERipemd160_4_gas719" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "3858948e61be1d2756e10a9ab2b447a4c7581608ad4b00a35da8bd19fd130cf0",
+                    "hash" : "0x3858948e61be1d2756e10a9ab2b447a4c7581608ad4b00a35da8bd19fd130cf0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "3858948e61be1d2756e10a9ab2b447a4c7581608ad4b00a35da8bd19fd130cf0",
+                    "hash" : "0x3858948e61be1d2756e10a9ab2b447a4c7581608ad4b00a35da8bd19fd130cf0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e47a0f907843569aa87c33888216418a431f0f32dd72fd58685263a387819d68",
+                    "hash" : "0xe47a0f907843569aa87c33888216418a431f0f32dd72fd58685263a387819d68",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e47a0f907843569aa87c33888216418a431f0f32dd72fd58685263a387819d68",
+                    "hash" : "0xe47a0f907843569aa87c33888216418a431f0f32dd72fd58685263a387819d68",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "3858948e61be1d2756e10a9ab2b447a4c7581608ad4b00a35da8bd19fd130cf0",
+                    "hash" : "0x3858948e61be1d2756e10a9ab2b447a4c7581608ad4b00a35da8bd19fd130cf0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060036102cff2600255600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_5.json b/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_5.json
index 880dd942f..5834da6a9 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_5.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_5.json
@@ -1,17 +1,17 @@
 {
     "CALLCODERipemd160_5" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "92f03b4d3e050ab726a2791fe0a178e79664d1bed0b08675cc728fc16554595c",
+                    "hash" : "0x92f03b4d3e050ab726a2791fe0a178e79664d1bed0b08675cc728fc16554595c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "92f03b4d3e050ab726a2791fe0a178e79664d1bed0b08675cc728fc16554595c",
+                    "hash" : "0x92f03b4d3e050ab726a2791fe0a178e79664d1bed0b08675cc728fc16554595c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "bc4678907c6b5edf23b8168d033e41eff624ca154c9bba9d50a40d7501f4b7ec",
+                    "hash" : "0xbc4678907c6b5edf23b8168d033e41eff624ca154c9bba9d50a40d7501f4b7ec",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "bc4678907c6b5edf23b8168d033e41eff624ca154c9bba9d50a40d7501f4b7ec",
+                    "hash" : "0xbc4678907c6b5edf23b8168d033e41eff624ca154c9bba9d50a40d7501f4b7ec",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "92f03b4d3e050ab726a2791fe0a178e79664d1bed0b08675cc728fc16554595c",
+                    "hash" : "0x92f03b4d3e050ab726a2791fe0a178e79664d1bed0b08675cc728fc16554595c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260206000620f4240600060006003611770f2600255600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "10000000"
+                "0x989680"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_0.json b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_0.json
index 9791f2469..d94964c17 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_0.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_0.json
@@ -1,17 +1,17 @@
 {
     "CALLCODESha256_0" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "670a98631f06ae54db67f0cd501879d06ed88c14f5452a8ea1f9134c899c80d3",
+                    "hash" : "0x670a98631f06ae54db67f0cd501879d06ed88c14f5452a8ea1f9134c899c80d3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "670a98631f06ae54db67f0cd501879d06ed88c14f5452a8ea1f9134c899c80d3",
+                    "hash" : "0x670a98631f06ae54db67f0cd501879d06ed88c14f5452a8ea1f9134c899c80d3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "1529c257c369c7802b4a9814d6fa4006f0be11238fe35cd9c8d8c1b8391c12be",
+                    "hash" : "0x1529c257c369c7802b4a9814d6fa4006f0be11238fe35cd9c8d8c1b8391c12be",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "1529c257c369c7802b4a9814d6fa4006f0be11238fe35cd9c8d8c1b8391c12be",
+                    "hash" : "0x1529c257c369c7802b4a9814d6fa4006f0be11238fe35cd9c8d8c1b8391c12be",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "670a98631f06ae54db67f0cd501879d06ed88c14f5452a8ea1f9134c899c80d3",
+                    "hash" : "0x670a98631f06ae54db67f0cd501879d06ed88c14f5452a8ea1f9134c899c80d3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x600160005260206000602060006000600260fff2600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_1.json b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_1.json
index 68496ab5e..a8603186e 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_1.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_1.json
@@ -1,17 +1,17 @@
 {
     "CALLCODESha256_1" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7d542c7d4109350d7cd0d349c12ce05e8681403b1bd186b56cdeb09e729bb19c",
+                    "hash" : "0x7d542c7d4109350d7cd0d349c12ce05e8681403b1bd186b56cdeb09e729bb19c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7d542c7d4109350d7cd0d349c12ce05e8681403b1bd186b56cdeb09e729bb19c",
+                    "hash" : "0x7d542c7d4109350d7cd0d349c12ce05e8681403b1bd186b56cdeb09e729bb19c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4833302bd51ace328a4e36d14916842f10f430b1e7a4a91ae17ade32eac8909c",
+                    "hash" : "0x4833302bd51ace328a4e36d14916842f10f430b1e7a4a91ae17ade32eac8909c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4833302bd51ace328a4e36d14916842f10f430b1e7a4a91ae17ade32eac8909c",
+                    "hash" : "0x4833302bd51ace328a4e36d14916842f10f430b1e7a4a91ae17ade32eac8909c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7d542c7d4109350d7cd0d349c12ce05e8681403b1bd186b56cdeb09e729bb19c",
+                    "hash" : "0x7d542c7d4109350d7cd0d349c12ce05e8681403b1bd186b56cdeb09e729bb19c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x6020600060006000600060026101f4f2600255600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_1_nonzeroValue.json b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_1_nonzeroValue.json
index f3e4f10cc..4a71061fe 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_1_nonzeroValue.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_1_nonzeroValue.json
@@ -1,17 +1,17 @@
 {
     "CALLCODESha256_1_nonzeroValue" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x05f5e100",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "48798a6d4c74a787608c14bf589ac6306ef5af3d4cb793a68e36c9880c209b15",
+                    "hash" : "0x48798a6d4c74a787608c14bf589ac6306ef5af3d4cb793a68e36c9880c209b15",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "48798a6d4c74a787608c14bf589ac6306ef5af3d4cb793a68e36c9880c209b15",
+                    "hash" : "0x48798a6d4c74a787608c14bf589ac6306ef5af3d4cb793a68e36c9880c209b15",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b4ca0a701ef2f893c70b499b66afc2e02e2f1224d2237ff908a4ce1c90133408",
+                    "hash" : "0xb4ca0a701ef2f893c70b499b66afc2e02e2f1224d2237ff908a4ce1c90133408",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b4ca0a701ef2f893c70b499b66afc2e02e2f1224d2237ff908a4ce1c90133408",
+                    "hash" : "0xb4ca0a701ef2f893c70b499b66afc2e02e2f1224d2237ff908a4ce1c90133408",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "48798a6d4c74a787608c14bf589ac6306ef5af3d4cb793a68e36c9880c209b15",
+                    "hash" : "0x48798a6d4c74a787608c14bf589ac6306ef5af3d4cb793a68e36c9880c209b15",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0bebc200",
                 "code" : "0x60206000600060006013600262030d40f2600255600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_2.json b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_2.json
index 89575f900..e759856ff 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_2.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_2.json
@@ -1,17 +1,17 @@
 {
     "CALLCODESha256_2" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "af396401acd11bb73faec4d3c830639b29026198dc0ca537eb200e65b0143dbe",
+                    "hash" : "0xaf396401acd11bb73faec4d3c830639b29026198dc0ca537eb200e65b0143dbe",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "af396401acd11bb73faec4d3c830639b29026198dc0ca537eb200e65b0143dbe",
+                    "hash" : "0xaf396401acd11bb73faec4d3c830639b29026198dc0ca537eb200e65b0143dbe",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "96abcf46fdb7e2d89de59fa41cffb7cb7e99234232b67fa672a87065fb1ce4b5",
+                    "hash" : "0x96abcf46fdb7e2d89de59fa41cffb7cb7e99234232b67fa672a87065fb1ce4b5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "96abcf46fdb7e2d89de59fa41cffb7cb7e99234232b67fa672a87065fb1ce4b5",
+                    "hash" : "0x96abcf46fdb7e2d89de59fa41cffb7cb7e99234232b67fa672a87065fb1ce4b5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "af396401acd11bb73faec4d3c830639b29026198dc0ca537eb200e65b0143dbe",
+                    "hash" : "0xaf396401acd11bb73faec4d3c830639b29026198dc0ca537eb200e65b0143dbe",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x64f34578907f6005526020600060256000600060026101f4f2600255600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3.json b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3.json
index a17e4a1d4..a473b2208 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3.json
@@ -1,17 +1,17 @@
 {
     "CALLCODESha256_3" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a79606bbb30cf8de0ab7b06067977d7bbad98b7c548553d218900cac28848e0b",
+                    "hash" : "0xa79606bbb30cf8de0ab7b06067977d7bbad98b7c548553d218900cac28848e0b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a79606bbb30cf8de0ab7b06067977d7bbad98b7c548553d218900cac28848e0b",
+                    "hash" : "0xa79606bbb30cf8de0ab7b06067977d7bbad98b7c548553d218900cac28848e0b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4b62d72a804ebb03621302972172df1f34ac8224be07cf3168484eab1ceb46f5",
+                    "hash" : "0x4b62d72a804ebb03621302972172df1f34ac8224be07cf3168484eab1ceb46f5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4b62d72a804ebb03621302972172df1f34ac8224be07cf3168484eab1ceb46f5",
+                    "hash" : "0x4b62d72a804ebb03621302972172df1f34ac8224be07cf3168484eab1ceb46f5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a79606bbb30cf8de0ab7b06067977d7bbad98b7c548553d218900cac28848e0b",
+                    "hash" : "0xa79606bbb30cf8de0ab7b06067977d7bbad98b7c548553d218900cac28848e0b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x64f34578907f6000526020600060256000600060026101f4f2600255600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3_postfix0.json b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3_postfix0.json
index 1b1aab148..2528f24c3 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3_postfix0.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3_postfix0.json
@@ -1,17 +1,17 @@
 {
     "CALLCODESha256_3_postfix0" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "3fa7da42d456cdfe4dbd5fd254c7135cec918e0737d540fc8561454d16f9ebb8",
+                    "hash" : "0x3fa7da42d456cdfe4dbd5fd254c7135cec918e0737d540fc8561454d16f9ebb8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "3fa7da42d456cdfe4dbd5fd254c7135cec918e0737d540fc8561454d16f9ebb8",
+                    "hash" : "0x3fa7da42d456cdfe4dbd5fd254c7135cec918e0737d540fc8561454d16f9ebb8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "fbe78e64e11b2f5801bfc346bdc25aaf600a8cceeb1ee62e9512e9768eb0e610",
+                    "hash" : "0xfbe78e64e11b2f5801bfc346bdc25aaf600a8cceeb1ee62e9512e9768eb0e610",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "fbe78e64e11b2f5801bfc346bdc25aaf600a8cceeb1ee62e9512e9768eb0e610",
+                    "hash" : "0xfbe78e64e11b2f5801bfc346bdc25aaf600a8cceeb1ee62e9512e9768eb0e610",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "3fa7da42d456cdfe4dbd5fd254c7135cec918e0737d540fc8561454d16f9ebb8",
+                    "hash" : "0x3fa7da42d456cdfe4dbd5fd254c7135cec918e0737d540fc8561454d16f9ebb8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x65f34578907f006000526020600060256000600060026101f4f2600255600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3_prefix0.json b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3_prefix0.json
index 3a925fa1e..2469b36ef 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3_prefix0.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3_prefix0.json
@@ -1,17 +1,17 @@
 {
     "CALLCODESha256_3_prefix0" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a79606bbb30cf8de0ab7b06067977d7bbad98b7c548553d218900cac28848e0b",
+                    "hash" : "0xa79606bbb30cf8de0ab7b06067977d7bbad98b7c548553d218900cac28848e0b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a79606bbb30cf8de0ab7b06067977d7bbad98b7c548553d218900cac28848e0b",
+                    "hash" : "0xa79606bbb30cf8de0ab7b06067977d7bbad98b7c548553d218900cac28848e0b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4b62d72a804ebb03621302972172df1f34ac8224be07cf3168484eab1ceb46f5",
+                    "hash" : "0x4b62d72a804ebb03621302972172df1f34ac8224be07cf3168484eab1ceb46f5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4b62d72a804ebb03621302972172df1f34ac8224be07cf3168484eab1ceb46f5",
+                    "hash" : "0x4b62d72a804ebb03621302972172df1f34ac8224be07cf3168484eab1ceb46f5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a79606bbb30cf8de0ab7b06067977d7bbad98b7c548553d218900cac28848e0b",
+                    "hash" : "0xa79606bbb30cf8de0ab7b06067977d7bbad98b7c548553d218900cac28848e0b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x64f34578907f6000526020600060256000600060026101f4f2600255600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_4.json b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_4.json
index dd454a0c2..dc769479c 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_4.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_4.json
@@ -1,17 +1,17 @@
 {
     "CALLCODESha256_4" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "843bc24a3eda2be4ed12e2e67c84e40dc21e2eb00a3fb5b9ff1fa06342f8ffb5",
+                    "hash" : "0x843bc24a3eda2be4ed12e2e67c84e40dc21e2eb00a3fb5b9ff1fa06342f8ffb5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "843bc24a3eda2be4ed12e2e67c84e40dc21e2eb00a3fb5b9ff1fa06342f8ffb5",
+                    "hash" : "0x843bc24a3eda2be4ed12e2e67c84e40dc21e2eb00a3fb5b9ff1fa06342f8ffb5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "812fe546750edec69755b9f7b672bed74dd7d641953da0660e0e877a372ff523",
+                    "hash" : "0x812fe546750edec69755b9f7b672bed74dd7d641953da0660e0e877a372ff523",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "812fe546750edec69755b9f7b672bed74dd7d641953da0660e0e877a372ff523",
+                    "hash" : "0x812fe546750edec69755b9f7b672bed74dd7d641953da0660e0e877a372ff523",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "843bc24a3eda2be4ed12e2e67c84e40dc21e2eb00a3fb5b9ff1fa06342f8ffb5",
+                    "hash" : "0x843bc24a3eda2be4ed12e2e67c84e40dc21e2eb00a3fb5b9ff1fa06342f8ffb5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060026064f2600255600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_4_gas99.json b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_4_gas99.json
index 110409671..81d25dae2 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_4_gas99.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_4_gas99.json
@@ -1,17 +1,17 @@
 {
     "CALLCODESha256_4_gas99" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "419cd054c0d12261f5bdf4ca1ae5bb0254e9d15ea57b39d7bdc91ccab11588c9",
+                    "hash" : "0x419cd054c0d12261f5bdf4ca1ae5bb0254e9d15ea57b39d7bdc91ccab11588c9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "419cd054c0d12261f5bdf4ca1ae5bb0254e9d15ea57b39d7bdc91ccab11588c9",
+                    "hash" : "0x419cd054c0d12261f5bdf4ca1ae5bb0254e9d15ea57b39d7bdc91ccab11588c9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f74c8ae615146b95b9889857962c998575a3985ff7ce541f3c952e6233cfdde5",
+                    "hash" : "0xf74c8ae615146b95b9889857962c998575a3985ff7ce541f3c952e6233cfdde5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f74c8ae615146b95b9889857962c998575a3985ff7ce541f3c952e6233cfdde5",
+                    "hash" : "0xf74c8ae615146b95b9889857962c998575a3985ff7ce541f3c952e6233cfdde5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "419cd054c0d12261f5bdf4ca1ae5bb0254e9d15ea57b39d7bdc91ccab11588c9",
+                    "hash" : "0x419cd054c0d12261f5bdf4ca1ae5bb0254e9d15ea57b39d7bdc91ccab11588c9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060026063f2600255600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_5.json b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_5.json
index 62f92d61f..3415f8332 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_5.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_5.json
@@ -1,17 +1,17 @@
 {
     "CALLCODESha256_5" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "80e50e6029b1eedab60c117faca3a26bd41006eaedf35ec7542b4a4f8430c143",
+                    "hash" : "0x80e50e6029b1eedab60c117faca3a26bd41006eaedf35ec7542b4a4f8430c143",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "80e50e6029b1eedab60c117faca3a26bd41006eaedf35ec7542b4a4f8430c143",
+                    "hash" : "0x80e50e6029b1eedab60c117faca3a26bd41006eaedf35ec7542b4a4f8430c143",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "18774dbef5f50715a33f58ee46efc8067ee81c7ab9511246c8e8a709cdd9596a",
+                    "hash" : "0x18774dbef5f50715a33f58ee46efc8067ee81c7ab9511246c8e8a709cdd9596a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "18774dbef5f50715a33f58ee46efc8067ee81c7ab9511246c8e8a709cdd9596a",
+                    "hash" : "0x18774dbef5f50715a33f58ee46efc8067ee81c7ab9511246c8e8a709cdd9596a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "80e50e6029b1eedab60c117faca3a26bd41006eaedf35ec7542b4a4f8430c143",
+                    "hash" : "0x80e50e6029b1eedab60c117faca3a26bd41006eaedf35ec7542b4a4f8430c143",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260206000620f4240600060006002610258f2600255600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "10000000"
+                "0x989680"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CallEcrecover0.json b/GeneralStateTests/stPreCompiledContracts/CallEcrecover0.json
index 4beaf0fc4..3109dc89e 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallEcrecover0.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallEcrecover0.json
@@ -1,17 +1,17 @@
 {
     "CallEcrecover0" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "8505dbcf94b936e26c353b02f74fb7a63c8944a99e3ecb290d57e4eff2fabdab",
+                    "hash" : "0x8505dbcf94b936e26c353b02f74fb7a63c8944a99e3ecb290d57e4eff2fabdab",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "370f1d0efbf7a605382c003a69c11ff6594f71c08e5d2786a261935c2d226813",
+                    "hash" : "0x370f1d0efbf7a605382c003a69c11ff6594f71c08e5d2786a261935c2d226813",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e59ad00cf0b8f137057e235e8923da16bece8e3813402cabebbcecd21b2989f2",
+                    "hash" : "0xe59ad00cf0b8f137057e235e8923da16bece8e3813402cabebbcecd21b2989f2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e59ad00cf0b8f137057e235e8923da16bece8e3813402cabebbcecd21b2989f2",
+                    "hash" : "0xe59ad00cf0b8f137057e235e8923da16bece8e3813402cabebbcecd21b2989f2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "370f1d0efbf7a605382c003a69c11ff6594f71c08e5d2786a261935c2d226813",
+                    "hash" : "0x370f1d0efbf7a605382c003a69c11ff6594f71c08e5d2786a261935c2d226813",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f160025560a060020a608051066000556000543214600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3652240"
+                "0x37ba90"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_0input.json b/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_0input.json
index 71497ed3d..ab83bbe9b 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_0input.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_0input.json
@@ -1,17 +1,17 @@
 {
     "CallEcrecover0_0input" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "58840eda5f0456e479cbc88fb36a3d726aa00cc749f7f9d6781b3040fbfde0e2",
+                    "hash" : "0x58840eda5f0456e479cbc88fb36a3d726aa00cc749f7f9d6781b3040fbfde0e2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "ceda0216a6e3075a9d97660ac8cd73ebe8a404de2e4c598fa1e7bbe4a3ac39a2",
+                    "hash" : "0xceda0216a6e3075a9d97660ac8cd73ebe8a404de2e4c598fa1e7bbe4a3ac39a2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "90dbbb8ef30716e81ed29f7dd1134fc8c2cc63030859dada095bd6e6d5fab570",
+                    "hash" : "0x90dbbb8ef30716e81ed29f7dd1134fc8c2cc63030859dada095bd6e6d5fab570",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "90dbbb8ef30716e81ed29f7dd1134fc8c2cc63030859dada095bd6e6d5fab570",
+                    "hash" : "0x90dbbb8ef30716e81ed29f7dd1134fc8c2cc63030859dada095bd6e6d5fab570",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "ceda0216a6e3075a9d97660ac8cd73ebe8a404de2e4c598fa1e7bbe4a3ac39a2",
+                    "hash" : "0xceda0216a6e3075a9d97660ac8cd73ebe8a404de2e4c598fa1e7bbe4a3ac39a2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x602060806080600060006001620493e0f160025560a060020a60805106600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3652240"
+                "0x37ba90"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_Gas2999.json b/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_Gas2999.json
index bd495a430..4d42af5fc 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_Gas2999.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_Gas2999.json
@@ -1,17 +1,17 @@
 {
     "CallEcrecover0_Gas2999" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "866186ae9d33b5b2a581f5df2565e64e8c61c662c4005766735edb716201da8c",
+                    "hash" : "0x866186ae9d33b5b2a581f5df2565e64e8c61c662c4005766735edb716201da8c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "911822f4a79d685d5f3a342b18c8236d9bd5dcc1c95df59097976be55c8425b1",
+                    "hash" : "0x911822f4a79d685d5f3a342b18c8236d9bd5dcc1c95df59097976be55c8425b1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "93529a5670f3deec10566bdd9b9d0c64d507104276cb45bb89ff9e58a2fb8bdf",
+                    "hash" : "0x93529a5670f3deec10566bdd9b9d0c64d507104276cb45bb89ff9e58a2fb8bdf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "93529a5670f3deec10566bdd9b9d0c64d507104276cb45bb89ff9e58a2fb8bdf",
+                    "hash" : "0x93529a5670f3deec10566bdd9b9d0c64d507104276cb45bb89ff9e58a2fb8bdf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "911822f4a79d685d5f3a342b18c8236d9bd5dcc1c95df59097976be55c8425b1",
+                    "hash" : "0x911822f4a79d685d5f3a342b18c8236d9bd5dcc1c95df59097976be55c8425b1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001610bb7f160025560a060020a608051066000556000543214600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_NoGas.json b/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_NoGas.json
index daa5c260f..81d4bb817 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_NoGas.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_NoGas.json
@@ -1,17 +1,17 @@
 {
     "CallEcrecover0_NoGas" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "588ae61bf355d95355831237f9c194249fea4ee07ba336e50df603abfd97d88a",
+                    "hash" : "0x588ae61bf355d95355831237f9c194249fea4ee07ba336e50df603abfd97d88a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b6bf32d8dd390c9d512edd4cc09e4ecfafecec80a1268865255a18b20c6ecf27",
+                    "hash" : "0xb6bf32d8dd390c9d512edd4cc09e4ecfafecec80a1268865255a18b20c6ecf27",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "032a12ab38d985948b46af030fb1bf3f91639309061fc5c5f987ae7514c8f210",
+                    "hash" : "0x032a12ab38d985948b46af030fb1bf3f91639309061fc5c5f987ae7514c8f210",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "032a12ab38d985948b46af030fb1bf3f91639309061fc5c5f987ae7514c8f210",
+                    "hash" : "0x032a12ab38d985948b46af030fb1bf3f91639309061fc5c5f987ae7514c8f210",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b6bf32d8dd390c9d512edd4cc09e4ecfafecec80a1268865255a18b20c6ecf27",
+                    "hash" : "0xb6bf32d8dd390c9d512edd4cc09e4ecfafecec80a1268865255a18b20c6ecf27",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c45496060526020608060806000600160016000f160025560a060020a608051066000556000543214600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_completeReturnValue.json b/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_completeReturnValue.json
index 82750875b..1ac623cc5 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_completeReturnValue.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_completeReturnValue.json
@@ -1,17 +1,17 @@
 {
     "CallEcrecover0_completeReturnValue" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "13906f096f838797d95679a558b847bf344c320d1f8317cfdafd620a73c4c66b",
+                    "hash" : "0x13906f096f838797d95679a558b847bf344c320d1f8317cfdafd620a73c4c66b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "10f2c5ac2871f3e34193847a66433d23c7d4e64b359f8a006cf25b51f5f9e7ed",
+                    "hash" : "0x10f2c5ac2871f3e34193847a66433d23c7d4e64b359f8a006cf25b51f5f9e7ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "cf3a03c8130bc0c6e37631c6dcc902da0b3dbfd543daa109c643629699aaf3e2",
+                    "hash" : "0xcf3a03c8130bc0c6e37631c6dcc902da0b3dbfd543daa109c643629699aaf3e2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "cf3a03c8130bc0c6e37631c6dcc902da0b3dbfd543daa109c643629699aaf3e2",
+                    "hash" : "0xcf3a03c8130bc0c6e37631c6dcc902da0b3dbfd543daa109c643629699aaf3e2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "10f2c5ac2871f3e34193847a66433d23c7d4e64b359f8a006cf25b51f5f9e7ed",
+                    "hash" : "0x10f2c5ac2871f3e34193847a66433d23c7d4e64b359f8a006cf25b51f5f9e7ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001610bb8f1600255608051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_gas3000.json b/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_gas3000.json
index 3f86e1529..d0b67971f 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_gas3000.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_gas3000.json
@@ -1,17 +1,17 @@
 {
     "CallEcrecover0_gas3000" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "3d5b0141e864305619c2ab5a2e0d234aed6500593e67d4670d9274d37125b046",
+                    "hash" : "0x3d5b0141e864305619c2ab5a2e0d234aed6500593e67d4670d9274d37125b046",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b190f9b2ca19fc3608cdc6a8996f7922f43802a11d2c9ef4f8096bea4bd87283",
+                    "hash" : "0xb190f9b2ca19fc3608cdc6a8996f7922f43802a11d2c9ef4f8096bea4bd87283",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f88554801a796b492c18990052e6c5c2d59f2d64d451cbb679e23f6d5f0ca116",
+                    "hash" : "0xf88554801a796b492c18990052e6c5c2d59f2d64d451cbb679e23f6d5f0ca116",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f88554801a796b492c18990052e6c5c2d59f2d64d451cbb679e23f6d5f0ca116",
+                    "hash" : "0xf88554801a796b492c18990052e6c5c2d59f2d64d451cbb679e23f6d5f0ca116",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b190f9b2ca19fc3608cdc6a8996f7922f43802a11d2c9ef4f8096bea4bd87283",
+                    "hash" : "0xb190f9b2ca19fc3608cdc6a8996f7922f43802a11d2c9ef4f8096bea4bd87283",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001610bb8f160025560a060020a608051066000556000543214600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_overlappingInputOutput.json b/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_overlappingInputOutput.json
index 544d23942..ebb74e942 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_overlappingInputOutput.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_overlappingInputOutput.json
@@ -1,17 +1,17 @@
 {
     "CallEcrecover0_overlappingInputOutput" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "124609657b6e6c9d599efde65a05ab2c46a92e775fbe862f7e7a28754531d87d",
+                    "hash" : "0x124609657b6e6c9d599efde65a05ab2c46a92e775fbe862f7e7a28754531d87d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d7836cf325c2b6d378a0b2494d37ab333137634eb8dd98cddf6f99bc61ed1040",
+                    "hash" : "0xd7836cf325c2b6d378a0b2494d37ab333137634eb8dd98cddf6f99bc61ed1040",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "dc2e15ae32e22ada58a279d127eb0f3f09436b81b258599e54e087de4427a7b7",
+                    "hash" : "0xdc2e15ae32e22ada58a279d127eb0f3f09436b81b258599e54e087de4427a7b7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "dc2e15ae32e22ada58a279d127eb0f3f09436b81b258599e54e087de4427a7b7",
+                    "hash" : "0xdc2e15ae32e22ada58a279d127eb0f3f09436b81b258599e54e087de4427a7b7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d7836cf325c2b6d378a0b2494d37ab333137634eb8dd98cddf6f99bc61ed1040",
+                    "hash" : "0xd7836cf325c2b6d378a0b2494d37ab333137634eb8dd98cddf6f99bc61ed1040",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060406080600060006001620493e0f160025560a060020a604051066000556000543214600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CallEcrecover1.json b/GeneralStateTests/stPreCompiledContracts/CallEcrecover1.json
index 6955ff828..4d52d024e 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallEcrecover1.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallEcrecover1.json
@@ -1,17 +1,17 @@
 {
     "CallEcrecover1" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "598525c77ae0e6c1f9521c791a79dd72adb2028c78be1e6851b6b445106e7e90",
+                    "hash" : "0x598525c77ae0e6c1f9521c791a79dd72adb2028c78be1e6851b6b445106e7e90",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "49b38376404c99af28367fbeb75af86fa492b58060f85f38104e04fa709444e6",
+                    "hash" : "0x49b38376404c99af28367fbeb75af86fa492b58060f85f38104e04fa709444e6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "76ff072677ae740627ca68045f5a48976592e806ca44291895c83e3d7baa7f77",
+                    "hash" : "0x76ff072677ae740627ca68045f5a48976592e806ca44291895c83e3d7baa7f77",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "76ff072677ae740627ca68045f5a48976592e806ca44291895c83e3d7baa7f77",
+                    "hash" : "0x76ff072677ae740627ca68045f5a48976592e806ca44291895c83e3d7baa7f77",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "49b38376404c99af28367fbeb75af86fa492b58060f85f38104e04fa709444e6",
+                    "hash" : "0x49b38376404c99af28367fbeb75af86fa492b58060f85f38104e04fa709444e6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c60005260016020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620186a0f160025560a060020a608051066000556000543214600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CallEcrecover2.json b/GeneralStateTests/stPreCompiledContracts/CallEcrecover2.json
index aeb59708c..44f680e8e 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallEcrecover2.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallEcrecover2.json
@@ -1,17 +1,17 @@
 {
     "CallEcrecover2" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "14a386a5c799c6bf2171ead5376c4d167810e8faf64085d8f1d683bcc880c5df",
+                    "hash" : "0x14a386a5c799c6bf2171ead5376c4d167810e8faf64085d8f1d683bcc880c5df",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "2d79c0271766fdbd306ec02697e7f12efab038a4e1423b128a8c0977df1670e2",
+                    "hash" : "0x2d79c0271766fdbd306ec02697e7f12efab038a4e1423b128a8c0977df1670e2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a2c6e104fd37a7a1fbd6244d98a9019669f65509f1e1775a00b3982d7ae9bf95",
+                    "hash" : "0xa2c6e104fd37a7a1fbd6244d98a9019669f65509f1e1775a00b3982d7ae9bf95",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a2c6e104fd37a7a1fbd6244d98a9019669f65509f1e1775a00b3982d7ae9bf95",
+                    "hash" : "0xa2c6e104fd37a7a1fbd6244d98a9019669f65509f1e1775a00b3982d7ae9bf95",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "2d79c0271766fdbd306ec02697e7f12efab038a4e1423b128a8c0977df1670e2",
+                    "hash" : "0x2d79c0271766fdbd306ec02697e7f12efab038a4e1423b128a8c0977df1670e2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6021527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549604152602060616061600060006001620186a0f160025560a060020a606151066000556000543214600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CallEcrecover3.json b/GeneralStateTests/stPreCompiledContracts/CallEcrecover3.json
index 747cf1600..9ab4af689 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallEcrecover3.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallEcrecover3.json
@@ -1,17 +1,17 @@
 {
     "CallEcrecover3" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "4b068eda7ef6d2485f037a5da86d987352aedf658e043556fab5eb53ff12d32b",
+                    "hash" : "0x4b068eda7ef6d2485f037a5da86d987352aedf658e043556fab5eb53ff12d32b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "251bb0ce027876b20cde52e1df43ee1c89b359ea531fd61ec13a6e255a924a8f",
+                    "hash" : "0x251bb0ce027876b20cde52e1df43ee1c89b359ea531fd61ec13a6e255a924a8f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "98a5fc6cc3755b02eb073d723f0248f2ed541b216c718ffdb7ce45fe4d279afe",
+                    "hash" : "0x98a5fc6cc3755b02eb073d723f0248f2ed541b216c718ffdb7ce45fe4d279afe",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "98a5fc6cc3755b02eb073d723f0248f2ed541b216c718ffdb7ce45fe4d279afe",
+                    "hash" : "0x98a5fc6cc3755b02eb073d723f0248f2ed541b216c718ffdb7ce45fe4d279afe",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "251bb0ce027876b20cde52e1df43ee1c89b359ea531fd61ec13a6e255a924a8f",
+                    "hash" : "0x251bb0ce027876b20cde52e1df43ee1c89b359ea531fd61ec13a6e255a924a8f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x7f2f380a2dea7e778d81affc2443403b8fe4644db442ae4862ff5bb3732829cdb9600052601b6020527f6b65ccb0558806e9b097f27a396d08f964e37b8b7af6ceeb516ff86739fbea0a6040527f37cbc8d883e129a4b1ef9d5f1df53c4f21a3ef147cf2a50a4ede0eb06ce092d4606052602060806080600060006001620186a0f160025560a060020a608051066000556000543214600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CallEcrecover80.json b/GeneralStateTests/stPreCompiledContracts/CallEcrecover80.json
index f67773f88..06c375c52 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallEcrecover80.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallEcrecover80.json
@@ -1,17 +1,17 @@
 {
     "CallEcrecover80" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "8294f78f70d24b3c5229b7f74a48164b06c2017cf8d6d5d0e6b80d4c11622e45",
+                    "hash" : "0x8294f78f70d24b3c5229b7f74a48164b06c2017cf8d6d5d0e6b80d4c11622e45",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a03c4faaf1c664028b3fb54c9438eb4b087af266d9e096ca21262085ae26a61b",
+                    "hash" : "0xa03c4faaf1c664028b3fb54c9438eb4b087af266d9e096ca21262085ae26a61b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "ffb96a92a31182d6315ce1be5e6ecf0edb08439beeee76f00754ebef78184de2",
+                    "hash" : "0xffb96a92a31182d6315ce1be5e6ecf0edb08439beeee76f00754ebef78184de2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ffb96a92a31182d6315ce1be5e6ecf0edb08439beeee76f00754ebef78184de2",
+                    "hash" : "0xffb96a92a31182d6315ce1be5e6ecf0edb08439beeee76f00754ebef78184de2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a03c4faaf1c664028b3fb54c9438eb4b087af266d9e096ca21262085ae26a61b",
+                    "hash" : "0xa03c4faaf1c664028b3fb54c9438eb4b087af266d9e096ca21262085ae26a61b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x7ec547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527eb1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527eb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f160025560a060020a608051066000556000543214600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3652240"
+                "0x37ba90"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CallEcrecoverCheckLength.json b/GeneralStateTests/stPreCompiledContracts/CallEcrecoverCheckLength.json
index 7a4ca019b..6c27660be 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallEcrecoverCheckLength.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallEcrecoverCheckLength.json
@@ -1,17 +1,17 @@
 {
     "CallEcrecoverCheckLength" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "638e4110cba967f52d8f95485362b38bb194d4391e05d0aef00e5dfd6a5a82a6",
+                    "hash" : "0x638e4110cba967f52d8f95485362b38bb194d4391e05d0aef00e5dfd6a5a82a6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "64c2d838b0cacb5932e2f2a7f7b5d08db2ef73491dbbc607dcbaef412d057da5",
+                    "hash" : "0x64c2d838b0cacb5932e2f2a7f7b5d08db2ef73491dbbc607dcbaef412d057da5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "39a3e642f9dae481af1cf868fdf45c9e7a969198ce5e28992ba13f2245414753",
+                    "hash" : "0x39a3e642f9dae481af1cf868fdf45c9e7a969198ce5e28992ba13f2245414753",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "39a3e642f9dae481af1cf868fdf45c9e7a969198ce5e28992ba13f2245414753",
+                    "hash" : "0x39a3e642f9dae481af1cf868fdf45c9e7a969198ce5e28992ba13f2245414753",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "64c2d838b0cacb5932e2f2a7f7b5d08db2ef73491dbbc607dcbaef412d057da5",
+                    "hash" : "0x64c2d838b0cacb5932e2f2a7f7b5d08db2ef73491dbbc607dcbaef412d057da5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x7f11223344556677889900112233445566778899001122334455667788990011226080527f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f160025560805160005559600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3652240"
+                "0x37ba90"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CallEcrecoverCheckLengthWrongV.json b/GeneralStateTests/stPreCompiledContracts/CallEcrecoverCheckLengthWrongV.json
index f68d36c33..8a91a0af5 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallEcrecoverCheckLengthWrongV.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallEcrecoverCheckLengthWrongV.json
@@ -1,17 +1,17 @@
 {
     "CallEcrecoverCheckLengthWrongV" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "04d25dda2e050f8dd39e03aab9e6b2d2ce018d5e1df87f6b2f19ed982baace27",
+                    "hash" : "0x04d25dda2e050f8dd39e03aab9e6b2d2ce018d5e1df87f6b2f19ed982baace27",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "8f8558ab35c3f053d7e065850a39becadadd83f84b4a9286e2026e5fc6a8f51c",
+                    "hash" : "0x8f8558ab35c3f053d7e065850a39becadadd83f84b4a9286e2026e5fc6a8f51c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "65a33fe0392e3358f07118cbeb290cc4ff26b0b8521a16279fdbd01172fe532c",
+                    "hash" : "0x65a33fe0392e3358f07118cbeb290cc4ff26b0b8521a16279fdbd01172fe532c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "65a33fe0392e3358f07118cbeb290cc4ff26b0b8521a16279fdbd01172fe532c",
+                    "hash" : "0x65a33fe0392e3358f07118cbeb290cc4ff26b0b8521a16279fdbd01172fe532c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "8f8558ab35c3f053d7e065850a39becadadd83f84b4a9286e2026e5fc6a8f51c",
+                    "hash" : "0x8f8558ab35c3f053d7e065850a39becadadd83f84b4a9286e2026e5fc6a8f51c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x7f11223344556677889900112233445566778899001122334455667788990011226080527f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601d6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f160025560805160005559600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3652240"
+                "0x37ba90"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CallEcrecoverH_prefixed0.json b/GeneralStateTests/stPreCompiledContracts/CallEcrecoverH_prefixed0.json
index 99fa8fa63..0b0b3c66a 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallEcrecoverH_prefixed0.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallEcrecoverH_prefixed0.json
@@ -1,17 +1,17 @@
 {
     "CallEcrecoverH_prefixed0" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a6c5db01005f66672af63de8f23bb41c1d94adee8d6808698eba96989d762a80",
+                    "hash" : "0xa6c5db01005f66672af63de8f23bb41c1d94adee8d6808698eba96989d762a80",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "de3ccf17a0d898e0f32dbeb683d931a001ed51095fddbf6718a3189811519199",
+                    "hash" : "0xde3ccf17a0d898e0f32dbeb683d931a001ed51095fddbf6718a3189811519199",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "df4759b5abd497561010bbb5e32ce3a05ae566914b439aafe1974d34c79505dd",
+                    "hash" : "0xdf4759b5abd497561010bbb5e32ce3a05ae566914b439aafe1974d34c79505dd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "df4759b5abd497561010bbb5e32ce3a05ae566914b439aafe1974d34c79505dd",
+                    "hash" : "0xdf4759b5abd497561010bbb5e32ce3a05ae566914b439aafe1974d34c79505dd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "de3ccf17a0d898e0f32dbeb683d931a001ed51095fddbf6718a3189811519199",
+                    "hash" : "0xde3ccf17a0d898e0f32dbeb683d931a001ed51095fddbf6718a3189811519199",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x7ec547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f160025560a060020a608051066000556000543214600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3652240"
+                "0x37ba90"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CallEcrecoverR_prefixed0.json b/GeneralStateTests/stPreCompiledContracts/CallEcrecoverR_prefixed0.json
index 8a7795eef..6a4ab8adc 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallEcrecoverR_prefixed0.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallEcrecoverR_prefixed0.json
@@ -1,17 +1,17 @@
 {
     "CallEcrecoverR_prefixed0" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6b66f574dedab09f4ec85ad6f09a73784b475eb2b5c1c19497d8c4de66b4f6a2",
+                    "hash" : "0x6b66f574dedab09f4ec85ad6f09a73784b475eb2b5c1c19497d8c4de66b4f6a2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6442eb30120caf880ddf9d8e449b3b94043a1b1cd518df156504d7f700b86dc7",
+                    "hash" : "0x6442eb30120caf880ddf9d8e449b3b94043a1b1cd518df156504d7f700b86dc7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e1849dd8b142d9789bbb0ae5cfeb43bae4e89a356ef4067593aeee62e5a7512a",
+                    "hash" : "0xe1849dd8b142d9789bbb0ae5cfeb43bae4e89a356ef4067593aeee62e5a7512a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e1849dd8b142d9789bbb0ae5cfeb43bae4e89a356ef4067593aeee62e5a7512a",
+                    "hash" : "0xe1849dd8b142d9789bbb0ae5cfeb43bae4e89a356ef4067593aeee62e5a7512a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6442eb30120caf880ddf9d8e449b3b94043a1b1cd518df156504d7f700b86dc7",
+                    "hash" : "0x6442eb30120caf880ddf9d8e449b3b94043a1b1cd518df156504d7f700b86dc7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527eb1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f160025560a060020a608051066000556000543214600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3652240"
+                "0x37ba90"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CallEcrecoverS_prefixed0.json b/GeneralStateTests/stPreCompiledContracts/CallEcrecoverS_prefixed0.json
index e0cdf1574..893f9becd 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallEcrecoverS_prefixed0.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallEcrecoverS_prefixed0.json
@@ -1,17 +1,17 @@
 {
     "CallEcrecoverS_prefixed0" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "fb856755b7081da6b2524530d15a140672838a64b1502a12664dd31f6feb2450",
+                    "hash" : "0xfb856755b7081da6b2524530d15a140672838a64b1502a12664dd31f6feb2450",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9ec7d7d82d95eb381826e68acded80fc3e53465e8b8b355f0157659771168df5",
+                    "hash" : "0x9ec7d7d82d95eb381826e68acded80fc3e53465e8b8b355f0157659771168df5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "173de6b545ca3ba8844c40322b8820013df8e35de86aeeb7f41c7cfb3b718c7e",
+                    "hash" : "0x173de6b545ca3ba8844c40322b8820013df8e35de86aeeb7f41c7cfb3b718c7e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "173de6b545ca3ba8844c40322b8820013df8e35de86aeeb7f41c7cfb3b718c7e",
+                    "hash" : "0x173de6b545ca3ba8844c40322b8820013df8e35de86aeeb7f41c7cfb3b718c7e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9ec7d7d82d95eb381826e68acded80fc3e53465e8b8b355f0157659771168df5",
+                    "hash" : "0x9ec7d7d82d95eb381826e68acded80fc3e53465e8b8b355f0157659771168df5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527eb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f160025560a060020a608051066000556000543214600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3652240"
+                "0x37ba90"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CallEcrecoverV_prefixed0.json b/GeneralStateTests/stPreCompiledContracts/CallEcrecoverV_prefixed0.json
index e7663f903..dd370f97c 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallEcrecoverV_prefixed0.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallEcrecoverV_prefixed0.json
@@ -1,17 +1,17 @@
 {
     "CallEcrecoverV_prefixed0" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "8505dbcf94b936e26c353b02f74fb7a63c8944a99e3ecb290d57e4eff2fabdab",
+                    "hash" : "0x8505dbcf94b936e26c353b02f74fb7a63c8944a99e3ecb290d57e4eff2fabdab",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "370f1d0efbf7a605382c003a69c11ff6594f71c08e5d2786a261935c2d226813",
+                    "hash" : "0x370f1d0efbf7a605382c003a69c11ff6594f71c08e5d2786a261935c2d226813",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e59ad00cf0b8f137057e235e8923da16bece8e3813402cabebbcecd21b2989f2",
+                    "hash" : "0xe59ad00cf0b8f137057e235e8923da16bece8e3813402cabebbcecd21b2989f2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e59ad00cf0b8f137057e235e8923da16bece8e3813402cabebbcecd21b2989f2",
+                    "hash" : "0xe59ad00cf0b8f137057e235e8923da16bece8e3813402cabebbcecd21b2989f2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "370f1d0efbf7a605382c003a69c11ff6594f71c08e5d2786a261935c2d226813",
+                    "hash" : "0x370f1d0efbf7a605382c003a69c11ff6594f71c08e5d2786a261935c2d226813",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f160025560a060020a608051066000556000543214600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3652240"
+                "0x37ba90"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CallIdentitiy_0.json b/GeneralStateTests/stPreCompiledContracts/CallIdentitiy_0.json
index 521dd38c8..d641028e0 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallIdentitiy_0.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallIdentitiy_0.json
@@ -1,17 +1,17 @@
 {
     "CallIdentitiy_0" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "2a2fe3cbecb8a0a5dcb6b1eec781f2c5bd4afbea81f5b77f97519c7218a7322b",
+                    "hash" : "0x2a2fe3cbecb8a0a5dcb6b1eec781f2c5bd4afbea81f5b77f97519c7218a7322b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "15b122e1f8eff78043fb6fb23c5d011026cea7741586cb2bd0e9a2af074ce180",
+                    "hash" : "0x15b122e1f8eff78043fb6fb23c5d011026cea7741586cb2bd0e9a2af074ce180",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "c0597a2a5a4719ac83e0ef87fe6ecc2cff6542f240815b94178d66501319befc",
+                    "hash" : "0xc0597a2a5a4719ac83e0ef87fe6ecc2cff6542f240815b94178d66501319befc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c0597a2a5a4719ac83e0ef87fe6ecc2cff6542f240815b94178d66501319befc",
+                    "hash" : "0xc0597a2a5a4719ac83e0ef87fe6ecc2cff6542f240815b94178d66501319befc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "15b122e1f8eff78043fb6fb23c5d011026cea7741586cb2bd0e9a2af074ce180",
+                    "hash" : "0x15b122e1f8eff78043fb6fb23c5d011026cea7741586cb2bd0e9a2af074ce180",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x600160005260206000602060006000600460fff1600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CallIdentitiy_1.json b/GeneralStateTests/stPreCompiledContracts/CallIdentitiy_1.json
index 2d320296d..c9ab54c6c 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallIdentitiy_1.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallIdentitiy_1.json
@@ -1,17 +1,17 @@
 {
     "CallIdentitiy_1" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "12941dbdbb5e71f565c3edb1abb5202ee31054a23497085e8331ee9d73df94f0",
+                    "hash" : "0x12941dbdbb5e71f565c3edb1abb5202ee31054a23497085e8331ee9d73df94f0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "ab6b59df16a6036de5cbe6a121af7c01a6851d91ec2f04ecc227c33218af6171",
+                    "hash" : "0xab6b59df16a6036de5cbe6a121af7c01a6851d91ec2f04ecc227c33218af6171",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "c3421551fe70fd96f23787dccbad42678560a10d563eed5798a4a4072ef0a84d",
+                    "hash" : "0xc3421551fe70fd96f23787dccbad42678560a10d563eed5798a4a4072ef0a84d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c3421551fe70fd96f23787dccbad42678560a10d563eed5798a4a4072ef0a84d",
+                    "hash" : "0xc3421551fe70fd96f23787dccbad42678560a10d563eed5798a4a4072ef0a84d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "ab6b59df16a6036de5cbe6a121af7c01a6851d91ec2f04ecc227c33218af6171",
+                    "hash" : "0xab6b59df16a6036de5cbe6a121af7c01a6851d91ec2f04ecc227c33218af6171",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x6020600060006000600060046101f4f1600255600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CallIdentity_1_nonzeroValue.json b/GeneralStateTests/stPreCompiledContracts/CallIdentity_1_nonzeroValue.json
index 6457260c2..461c37207 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallIdentity_1_nonzeroValue.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallIdentity_1_nonzeroValue.json
@@ -1,17 +1,17 @@
 {
     "CallIdentity_1_nonzeroValue" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x05f5e100",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "baa02d57dbced7b424a3e924caf5b973cc5bc8b8196de9c5d1fd08e1d4f88c84",
+                    "hash" : "0xbaa02d57dbced7b424a3e924caf5b973cc5bc8b8196de9c5d1fd08e1d4f88c84",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "baa02d57dbced7b424a3e924caf5b973cc5bc8b8196de9c5d1fd08e1d4f88c84",
+                    "hash" : "0xbaa02d57dbced7b424a3e924caf5b973cc5bc8b8196de9c5d1fd08e1d4f88c84",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a03eaa07a46ad382fe5827f9ea3d97b367e0fc5f05e4bf3101b4749966a506da",
+                    "hash" : "0xa03eaa07a46ad382fe5827f9ea3d97b367e0fc5f05e4bf3101b4749966a506da",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a03eaa07a46ad382fe5827f9ea3d97b367e0fc5f05e4bf3101b4749966a506da",
+                    "hash" : "0xa03eaa07a46ad382fe5827f9ea3d97b367e0fc5f05e4bf3101b4749966a506da",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "baa02d57dbced7b424a3e924caf5b973cc5bc8b8196de9c5d1fd08e1d4f88c84",
+                    "hash" : "0xbaa02d57dbced7b424a3e924caf5b973cc5bc8b8196de9c5d1fd08e1d4f88c84",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0bebc200",
                 "code" : "0x60206000600060006013600462030d40f1600255600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CallIdentity_2.json b/GeneralStateTests/stPreCompiledContracts/CallIdentity_2.json
index 747e2cf91..80b902723 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallIdentity_2.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallIdentity_2.json
@@ -1,17 +1,17 @@
 {
     "CallIdentity_2" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "31fcdb740b5116808148c57d8fa50b88e3b74346ec747dd93f32da7f70e5443b",
+                    "hash" : "0x31fcdb740b5116808148c57d8fa50b88e3b74346ec747dd93f32da7f70e5443b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a86c7bc16888d22117df157633b66a0661573856c7b8390a148dcbeaededdb08",
+                    "hash" : "0xa86c7bc16888d22117df157633b66a0661573856c7b8390a148dcbeaededdb08",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "38ea48c5d3c1e38baf62235a6052525a4183f6c496af843b82ac99d505b99b54",
+                    "hash" : "0x38ea48c5d3c1e38baf62235a6052525a4183f6c496af843b82ac99d505b99b54",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "38ea48c5d3c1e38baf62235a6052525a4183f6c496af843b82ac99d505b99b54",
+                    "hash" : "0x38ea48c5d3c1e38baf62235a6052525a4183f6c496af843b82ac99d505b99b54",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a86c7bc16888d22117df157633b66a0661573856c7b8390a148dcbeaededdb08",
+                    "hash" : "0xa86c7bc16888d22117df157633b66a0661573856c7b8390a148dcbeaededdb08",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x64f34578907f6000526020600060256000600060046101f4f1600255600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CallIdentity_3.json b/GeneralStateTests/stPreCompiledContracts/CallIdentity_3.json
index 9f79e5bc3..566d89523 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallIdentity_3.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallIdentity_3.json
@@ -1,17 +1,17 @@
 {
     "CallIdentity_3" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "31fcdb740b5116808148c57d8fa50b88e3b74346ec747dd93f32da7f70e5443b",
+                    "hash" : "0x31fcdb740b5116808148c57d8fa50b88e3b74346ec747dd93f32da7f70e5443b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a86c7bc16888d22117df157633b66a0661573856c7b8390a148dcbeaededdb08",
+                    "hash" : "0xa86c7bc16888d22117df157633b66a0661573856c7b8390a148dcbeaededdb08",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "38ea48c5d3c1e38baf62235a6052525a4183f6c496af843b82ac99d505b99b54",
+                    "hash" : "0x38ea48c5d3c1e38baf62235a6052525a4183f6c496af843b82ac99d505b99b54",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "38ea48c5d3c1e38baf62235a6052525a4183f6c496af843b82ac99d505b99b54",
+                    "hash" : "0x38ea48c5d3c1e38baf62235a6052525a4183f6c496af843b82ac99d505b99b54",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a86c7bc16888d22117df157633b66a0661573856c7b8390a148dcbeaededdb08",
+                    "hash" : "0xa86c7bc16888d22117df157633b66a0661573856c7b8390a148dcbeaededdb08",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x64f34578907f6000526020600060256000600060046101f4f1600255600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CallIdentity_4.json b/GeneralStateTests/stPreCompiledContracts/CallIdentity_4.json
index 306aca22e..65c4cbe05 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallIdentity_4.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallIdentity_4.json
@@ -1,17 +1,17 @@
 {
     "CallIdentity_4" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "0291a60c427c75552a5becdc9679e24592d87e319334b629d40f4d48b56da233",
+                    "hash" : "0x0291a60c427c75552a5becdc9679e24592d87e319334b629d40f4d48b56da233",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b96c0a52a392b5c70e3f1f5745a652aabae535641283bad2eb7cf56e13023e54",
+                    "hash" : "0xb96c0a52a392b5c70e3f1f5745a652aabae535641283bad2eb7cf56e13023e54",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "dc83ec4cbf38f314848a1eb20262fa8d78fa9708cc99058e1205112a4f7534f8",
+                    "hash" : "0xdc83ec4cbf38f314848a1eb20262fa8d78fa9708cc99058e1205112a4f7534f8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "dc83ec4cbf38f314848a1eb20262fa8d78fa9708cc99058e1205112a4f7534f8",
+                    "hash" : "0xdc83ec4cbf38f314848a1eb20262fa8d78fa9708cc99058e1205112a4f7534f8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b96c0a52a392b5c70e3f1f5745a652aabae535641283bad2eb7cf56e13023e54",
+                    "hash" : "0xb96c0a52a392b5c70e3f1f5745a652aabae535641283bad2eb7cf56e13023e54",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060046064f1600255600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CallIdentity_4_gas17.json b/GeneralStateTests/stPreCompiledContracts/CallIdentity_4_gas17.json
index 82d4419b1..07244e212 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallIdentity_4_gas17.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallIdentity_4_gas17.json
@@ -1,17 +1,17 @@
 {
     "CallIdentity_4_gas17" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e2dcb5cc0942d7be3d0ecb21e173c5abd86b755aa3b1cf7bfe6bf7f4296754b3",
+                    "hash" : "0xe2dcb5cc0942d7be3d0ecb21e173c5abd86b755aa3b1cf7bfe6bf7f4296754b3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "bf192444e0d0b5076efbf4fa8bd7e8141f2749fc273537ccd20c68b5acaf0f76",
+                    "hash" : "0xbf192444e0d0b5076efbf4fa8bd7e8141f2749fc273537ccd20c68b5acaf0f76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3492519d71098ebaa3d5838c55708698215b8e711ed71359dc8d62be949b76e6",
+                    "hash" : "0x3492519d71098ebaa3d5838c55708698215b8e711ed71359dc8d62be949b76e6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3492519d71098ebaa3d5838c55708698215b8e711ed71359dc8d62be949b76e6",
+                    "hash" : "0x3492519d71098ebaa3d5838c55708698215b8e711ed71359dc8d62be949b76e6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "bf192444e0d0b5076efbf4fa8bd7e8141f2749fc273537ccd20c68b5acaf0f76",
+                    "hash" : "0xbf192444e0d0b5076efbf4fa8bd7e8141f2749fc273537ccd20c68b5acaf0f76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060046011f1600255600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CallIdentity_4_gas18.json b/GeneralStateTests/stPreCompiledContracts/CallIdentity_4_gas18.json
index 03e1a3526..0c5cbde40 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallIdentity_4_gas18.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallIdentity_4_gas18.json
@@ -1,17 +1,17 @@
 {
     "CallIdentity_4_gas18" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d75ad45243788aa28b8d3d7b801d9825414bce24a629d07cd6f966c5f89f243b",
+                    "hash" : "0xd75ad45243788aa28b8d3d7b801d9825414bce24a629d07cd6f966c5f89f243b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9775eb229187458c166832ace1cd972a410d903029be855c6ccf880aee39738f",
+                    "hash" : "0x9775eb229187458c166832ace1cd972a410d903029be855c6ccf880aee39738f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e96de5a841c51dd3eafc83e2e48b62895f47af3c23ca3d13f954b8ded4d84dab",
+                    "hash" : "0xe96de5a841c51dd3eafc83e2e48b62895f47af3c23ca3d13f954b8ded4d84dab",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e96de5a841c51dd3eafc83e2e48b62895f47af3c23ca3d13f954b8ded4d84dab",
+                    "hash" : "0xe96de5a841c51dd3eafc83e2e48b62895f47af3c23ca3d13f954b8ded4d84dab",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9775eb229187458c166832ace1cd972a410d903029be855c6ccf880aee39738f",
+                    "hash" : "0x9775eb229187458c166832ace1cd972a410d903029be855c6ccf880aee39738f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060046012f1600255600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CallIdentity_5.json b/GeneralStateTests/stPreCompiledContracts/CallIdentity_5.json
index 61219a2ca..e37a6a476 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallIdentity_5.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallIdentity_5.json
@@ -1,17 +1,17 @@
 {
     "CallIdentity_5" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "4f0f966de47b3c5f33eed5309cb538d3c9b027fc1deca750d34600854ed258d5",
+                    "hash" : "0x4f0f966de47b3c5f33eed5309cb538d3c9b027fc1deca750d34600854ed258d5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "1f91d1b116ec8c728da65c0fd5b12d9a081092cdf6f454161fad580f16ef2e89",
+                    "hash" : "0x1f91d1b116ec8c728da65c0fd5b12d9a081092cdf6f454161fad580f16ef2e89",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "0edafad0e4913deab8b13bcde66c69f1aed4372f3245c0772eca7452e74791b5",
+                    "hash" : "0x0edafad0e4913deab8b13bcde66c69f1aed4372f3245c0772eca7452e74791b5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "0edafad0e4913deab8b13bcde66c69f1aed4372f3245c0772eca7452e74791b5",
+                    "hash" : "0x0edafad0e4913deab8b13bcde66c69f1aed4372f3245c0772eca7452e74791b5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "1f91d1b116ec8c728da65c0fd5b12d9a081092cdf6f454161fad580f16ef2e89",
+                    "hash" : "0x1f91d1b116ec8c728da65c0fd5b12d9a081092cdf6f454161fad580f16ef2e89",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260206000620f4240600060006004610258f1600255600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "10000000"
+                "0x989680"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CallRipemd160_0.json b/GeneralStateTests/stPreCompiledContracts/CallRipemd160_0.json
index 11fe62f18..e3ba96cc0 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallRipemd160_0.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallRipemd160_0.json
@@ -1,17 +1,17 @@
 {
     "CallRipemd160_0" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "686c6f0235678010e68839c7ba72cd39ed5b7de6475ebf2f1a42ed3056c445d6",
+                    "hash" : "0x686c6f0235678010e68839c7ba72cd39ed5b7de6475ebf2f1a42ed3056c445d6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "435aedb8d3ae05243d181c5eb50880e30ac527b87163a86ee7cfd255ce79b94c",
+                    "hash" : "0x435aedb8d3ae05243d181c5eb50880e30ac527b87163a86ee7cfd255ce79b94c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b418cef120df01a9cef80804c2f883527c0b550df6664166857a7c998a869b65",
+                    "hash" : "0xb418cef120df01a9cef80804c2f883527c0b550df6664166857a7c998a869b65",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b418cef120df01a9cef80804c2f883527c0b550df6664166857a7c998a869b65",
+                    "hash" : "0xb418cef120df01a9cef80804c2f883527c0b550df6664166857a7c998a869b65",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "435aedb8d3ae05243d181c5eb50880e30ac527b87163a86ee7cfd255ce79b94c",
+                    "hash" : "0x435aedb8d3ae05243d181c5eb50880e30ac527b87163a86ee7cfd255ce79b94c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x600160005260206000602060006000600360fff1600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CallRipemd160_1.json b/GeneralStateTests/stPreCompiledContracts/CallRipemd160_1.json
index baf4791ef..0fda1e928 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallRipemd160_1.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallRipemd160_1.json
@@ -1,17 +1,17 @@
 {
     "CallRipemd160_1" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "34f4f4a52d69fed606412853b95650be8dc1a3f35ef8da8b3a81a6da1c8b7135",
+                    "hash" : "0x34f4f4a52d69fed606412853b95650be8dc1a3f35ef8da8b3a81a6da1c8b7135",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "37bf4936518d1bdbd00c4d6085a1dda0c8c17d80fea19ac7c7a7212e40ca41db",
+                    "hash" : "0x37bf4936518d1bdbd00c4d6085a1dda0c8c17d80fea19ac7c7a7212e40ca41db",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "1d22c83f58f74145b7afad4f5a57244540f901969d5d2a7ec4aa519ed0787930",
+                    "hash" : "0x1d22c83f58f74145b7afad4f5a57244540f901969d5d2a7ec4aa519ed0787930",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "1d22c83f58f74145b7afad4f5a57244540f901969d5d2a7ec4aa519ed0787930",
+                    "hash" : "0x1d22c83f58f74145b7afad4f5a57244540f901969d5d2a7ec4aa519ed0787930",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "37bf4936518d1bdbd00c4d6085a1dda0c8c17d80fea19ac7c7a7212e40ca41db",
+                    "hash" : "0x37bf4936518d1bdbd00c4d6085a1dda0c8c17d80fea19ac7c7a7212e40ca41db",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x602060006000600060006003610258f1600255600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CallRipemd160_2.json b/GeneralStateTests/stPreCompiledContracts/CallRipemd160_2.json
index 712c79ddb..eb3baad4d 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallRipemd160_2.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallRipemd160_2.json
@@ -1,17 +1,17 @@
 {
     "CallRipemd160_2" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "efa421c033dd0a7ff037166340c068e5560b9da80cbe4626e5ea3860e7c5f82f",
+                    "hash" : "0xefa421c033dd0a7ff037166340c068e5560b9da80cbe4626e5ea3860e7c5f82f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "db19dd8002a75f71875397e59eee22a2e7a0165cc2a928373d09855dccc6bbd0",
+                    "hash" : "0xdb19dd8002a75f71875397e59eee22a2e7a0165cc2a928373d09855dccc6bbd0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "bc4584ac2f7c4700e762bfd62eb415fac4f9613a8d8c40b9f9fa69746f3c647c",
+                    "hash" : "0xbc4584ac2f7c4700e762bfd62eb415fac4f9613a8d8c40b9f9fa69746f3c647c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "bc4584ac2f7c4700e762bfd62eb415fac4f9613a8d8c40b9f9fa69746f3c647c",
+                    "hash" : "0xbc4584ac2f7c4700e762bfd62eb415fac4f9613a8d8c40b9f9fa69746f3c647c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "db19dd8002a75f71875397e59eee22a2e7a0165cc2a928373d09855dccc6bbd0",
+                    "hash" : "0xdb19dd8002a75f71875397e59eee22a2e7a0165cc2a928373d09855dccc6bbd0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x64f34578907f600552602060006025600060006003611770f1600255600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CallRipemd160_3.json b/GeneralStateTests/stPreCompiledContracts/CallRipemd160_3.json
index e832b6f1a..140d2401d 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallRipemd160_3.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallRipemd160_3.json
@@ -1,17 +1,17 @@
 {
     "CallRipemd160_3" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1c9d805e8510689af75f8235017a930f3128f4ebc7beb07be48c709696efcf26",
+                    "hash" : "0x1c9d805e8510689af75f8235017a930f3128f4ebc7beb07be48c709696efcf26",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "61d43f9c89fb798e915650738d94660050b92e8f3c5b01047b17d68a04d43a32",
+                    "hash" : "0x61d43f9c89fb798e915650738d94660050b92e8f3c5b01047b17d68a04d43a32",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4190628cd7645611fdd0bfecc72dbe756897fb08f92ff8a24ece746c656240b9",
+                    "hash" : "0x4190628cd7645611fdd0bfecc72dbe756897fb08f92ff8a24ece746c656240b9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4190628cd7645611fdd0bfecc72dbe756897fb08f92ff8a24ece746c656240b9",
+                    "hash" : "0x4190628cd7645611fdd0bfecc72dbe756897fb08f92ff8a24ece746c656240b9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "61d43f9c89fb798e915650738d94660050b92e8f3c5b01047b17d68a04d43a32",
+                    "hash" : "0x61d43f9c89fb798e915650738d94660050b92e8f3c5b01047b17d68a04d43a32",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x64f34578907f600052602060006025600060006003611770f1600255600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CallRipemd160_3_postfixed0.json b/GeneralStateTests/stPreCompiledContracts/CallRipemd160_3_postfixed0.json
index edede0e2d..d242b2ed5 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallRipemd160_3_postfixed0.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallRipemd160_3_postfixed0.json
@@ -1,17 +1,17 @@
 {
     "CallRipemd160_3_postfixed0" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e6a95c717a096d670ab2a1ddd4288430982baabaa52e89936c0a8da192219ad4",
+                    "hash" : "0xe6a95c717a096d670ab2a1ddd4288430982baabaa52e89936c0a8da192219ad4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "39a6d621e41ca9d266a684313899a078c43219a657377abebf38b2a988c5b782",
+                    "hash" : "0x39a6d621e41ca9d266a684313899a078c43219a657377abebf38b2a988c5b782",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a2af8618f7758923dd3dab7ef54cb26f42ab11c316172aba26f1b84483f7a166",
+                    "hash" : "0xa2af8618f7758923dd3dab7ef54cb26f42ab11c316172aba26f1b84483f7a166",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a2af8618f7758923dd3dab7ef54cb26f42ab11c316172aba26f1b84483f7a166",
+                    "hash" : "0xa2af8618f7758923dd3dab7ef54cb26f42ab11c316172aba26f1b84483f7a166",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "39a6d621e41ca9d266a684313899a078c43219a657377abebf38b2a988c5b782",
+                    "hash" : "0x39a6d621e41ca9d266a684313899a078c43219a657377abebf38b2a988c5b782",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x65f34578907f00600052602060006025600060006003611770f1600255600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CallRipemd160_3_prefixed0.json b/GeneralStateTests/stPreCompiledContracts/CallRipemd160_3_prefixed0.json
index ccd19c377..6a3af8691 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallRipemd160_3_prefixed0.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallRipemd160_3_prefixed0.json
@@ -1,17 +1,17 @@
 {
     "CallRipemd160_3_prefixed0" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1c9d805e8510689af75f8235017a930f3128f4ebc7beb07be48c709696efcf26",
+                    "hash" : "0x1c9d805e8510689af75f8235017a930f3128f4ebc7beb07be48c709696efcf26",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "61d43f9c89fb798e915650738d94660050b92e8f3c5b01047b17d68a04d43a32",
+                    "hash" : "0x61d43f9c89fb798e915650738d94660050b92e8f3c5b01047b17d68a04d43a32",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4190628cd7645611fdd0bfecc72dbe756897fb08f92ff8a24ece746c656240b9",
+                    "hash" : "0x4190628cd7645611fdd0bfecc72dbe756897fb08f92ff8a24ece746c656240b9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4190628cd7645611fdd0bfecc72dbe756897fb08f92ff8a24ece746c656240b9",
+                    "hash" : "0x4190628cd7645611fdd0bfecc72dbe756897fb08f92ff8a24ece746c656240b9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "61d43f9c89fb798e915650738d94660050b92e8f3c5b01047b17d68a04d43a32",
+                    "hash" : "0x61d43f9c89fb798e915650738d94660050b92e8f3c5b01047b17d68a04d43a32",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x64f34578907f600052602060006025600060006003611770f1600255600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CallRipemd160_4.json b/GeneralStateTests/stPreCompiledContracts/CallRipemd160_4.json
index 42e26ba36..acb88ec48 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallRipemd160_4.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallRipemd160_4.json
@@ -1,17 +1,17 @@
 {
     "CallRipemd160_4" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "4689dc4aaa314cd049ea40e2b2d064393875e67e8dc0cd9dee8dadad2bd3ce6a",
+                    "hash" : "0x4689dc4aaa314cd049ea40e2b2d064393875e67e8dc0cd9dee8dadad2bd3ce6a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "ead04023e5b0f010c226767bcc44c1f9140c0b2499dcc93a64d977b578304556",
+                    "hash" : "0xead04023e5b0f010c226767bcc44c1f9140c0b2499dcc93a64d977b578304556",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5f262f6a170033a4882dd89eb94ebfe8a8046a0f6442c62a852ca916ee210d53",
+                    "hash" : "0x5f262f6a170033a4882dd89eb94ebfe8a8046a0f6442c62a852ca916ee210d53",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5f262f6a170033a4882dd89eb94ebfe8a8046a0f6442c62a852ca916ee210d53",
+                    "hash" : "0x5f262f6a170033a4882dd89eb94ebfe8a8046a0f6442c62a852ca916ee210d53",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "ead04023e5b0f010c226767bcc44c1f9140c0b2499dcc93a64d977b578304556",
+                    "hash" : "0xead04023e5b0f010c226767bcc44c1f9140c0b2499dcc93a64d977b578304556",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060036102d0f1600255600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CallRipemd160_4_gas719.json b/GeneralStateTests/stPreCompiledContracts/CallRipemd160_4_gas719.json
index cc4866b30..06aec0bd9 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallRipemd160_4_gas719.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallRipemd160_4_gas719.json
@@ -1,17 +1,17 @@
 {
     "CallRipemd160_4_gas719" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "231af4ae84d086a74ccea9af42af14de47f48fe18ec565de095f5987b85ce933",
+                    "hash" : "0x231af4ae84d086a74ccea9af42af14de47f48fe18ec565de095f5987b85ce933",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "0ce883cdc8e7b4acf14d7d28d7446b4dfe132b5c5239be9c8bf23a2c3a37765a",
+                    "hash" : "0x0ce883cdc8e7b4acf14d7d28d7446b4dfe132b5c5239be9c8bf23a2c3a37765a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "1e83dde333b6e3f50223781c584bdc334145e3e58b0cea77c76e6247f2b58fa0",
+                    "hash" : "0x1e83dde333b6e3f50223781c584bdc334145e3e58b0cea77c76e6247f2b58fa0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "1e83dde333b6e3f50223781c584bdc334145e3e58b0cea77c76e6247f2b58fa0",
+                    "hash" : "0x1e83dde333b6e3f50223781c584bdc334145e3e58b0cea77c76e6247f2b58fa0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0ce883cdc8e7b4acf14d7d28d7446b4dfe132b5c5239be9c8bf23a2c3a37765a",
+                    "hash" : "0x0ce883cdc8e7b4acf14d7d28d7446b4dfe132b5c5239be9c8bf23a2c3a37765a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060036102cff1600255600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CallRipemd160_5.json b/GeneralStateTests/stPreCompiledContracts/CallRipemd160_5.json
index 2fde462e2..b8c4e6f8f 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallRipemd160_5.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallRipemd160_5.json
@@ -1,17 +1,17 @@
 {
     "CallRipemd160_5" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b9f2484fa66f67ec3abb57c35024cb90c67237c7a800a083d6dedba49d4393aa",
+                    "hash" : "0xb9f2484fa66f67ec3abb57c35024cb90c67237c7a800a083d6dedba49d4393aa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c004a3a22e5ed22297ab6555c85391446361245e7f4811b7dc91ccc7b8db916e",
+                    "hash" : "0xc004a3a22e5ed22297ab6555c85391446361245e7f4811b7dc91ccc7b8db916e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "d2973c4abfcc5775a79c48621f1bcd0ebd72471853ba1d1c5116a423301db265",
+                    "hash" : "0xd2973c4abfcc5775a79c48621f1bcd0ebd72471853ba1d1c5116a423301db265",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "d2973c4abfcc5775a79c48621f1bcd0ebd72471853ba1d1c5116a423301db265",
+                    "hash" : "0xd2973c4abfcc5775a79c48621f1bcd0ebd72471853ba1d1c5116a423301db265",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c004a3a22e5ed22297ab6555c85391446361245e7f4811b7dc91ccc7b8db916e",
+                    "hash" : "0xc004a3a22e5ed22297ab6555c85391446361245e7f4811b7dc91ccc7b8db916e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260206000620f4240600060006003611770f1600255600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "10000000"
+                "0x989680"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CallSha256_0.json b/GeneralStateTests/stPreCompiledContracts/CallSha256_0.json
index 8670533dc..3f6fcd8c9 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallSha256_0.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallSha256_0.json
@@ -1,17 +1,17 @@
 {
     "CallSha256_0" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e5d6c470d46618ad3d1298c9575d622ff01035ab4e2717df0cb37ebb18b53b86",
+                    "hash" : "0xe5d6c470d46618ad3d1298c9575d622ff01035ab4e2717df0cb37ebb18b53b86",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "af78af682890ed52f547478bf1a105a5c8e2627f5eff5f951f38140fd8745152",
+                    "hash" : "0xaf78af682890ed52f547478bf1a105a5c8e2627f5eff5f951f38140fd8745152",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "86b9a816d69dc08083a5266bcf788491fabc3986bfb4cbcef78bd9e9d5f30e50",
+                    "hash" : "0x86b9a816d69dc08083a5266bcf788491fabc3986bfb4cbcef78bd9e9d5f30e50",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "86b9a816d69dc08083a5266bcf788491fabc3986bfb4cbcef78bd9e9d5f30e50",
+                    "hash" : "0x86b9a816d69dc08083a5266bcf788491fabc3986bfb4cbcef78bd9e9d5f30e50",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "af78af682890ed52f547478bf1a105a5c8e2627f5eff5f951f38140fd8745152",
+                    "hash" : "0xaf78af682890ed52f547478bf1a105a5c8e2627f5eff5f951f38140fd8745152",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x600160005260206000602060006000600260fff1600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CallSha256_1.json b/GeneralStateTests/stPreCompiledContracts/CallSha256_1.json
index 515b28f62..ba741e079 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallSha256_1.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallSha256_1.json
@@ -1,17 +1,17 @@
 {
     "CallSha256_1" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6de5c8f3f170953bc212092db9030852c7b36ea9c4a804b9cd5e967b5fdfb484",
+                    "hash" : "0x6de5c8f3f170953bc212092db9030852c7b36ea9c4a804b9cd5e967b5fdfb484",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "1bab374f8e446a5ba07b8e46f51211c46ef9688e93b5970c28eb971511ff5de9",
+                    "hash" : "0x1bab374f8e446a5ba07b8e46f51211c46ef9688e93b5970c28eb971511ff5de9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "308d9368ff3343b3dfe257199d9ff3ae8fbec5810c63e74e669a343fa658f4a8",
+                    "hash" : "0x308d9368ff3343b3dfe257199d9ff3ae8fbec5810c63e74e669a343fa658f4a8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "308d9368ff3343b3dfe257199d9ff3ae8fbec5810c63e74e669a343fa658f4a8",
+                    "hash" : "0x308d9368ff3343b3dfe257199d9ff3ae8fbec5810c63e74e669a343fa658f4a8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "1bab374f8e446a5ba07b8e46f51211c46ef9688e93b5970c28eb971511ff5de9",
+                    "hash" : "0x1bab374f8e446a5ba07b8e46f51211c46ef9688e93b5970c28eb971511ff5de9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x6020600060006000600060026101f4f1600255600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CallSha256_1_nonzeroValue.json b/GeneralStateTests/stPreCompiledContracts/CallSha256_1_nonzeroValue.json
index 60bfdec1c..451f37972 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallSha256_1_nonzeroValue.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallSha256_1_nonzeroValue.json
@@ -1,17 +1,17 @@
 {
     "CallSha256_1_nonzeroValue" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x05f5e100",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a2b35883e68dc45cfb7eaf35c36fdda84a1aea77c416693388725973d44f0a58",
+                    "hash" : "0xa2b35883e68dc45cfb7eaf35c36fdda84a1aea77c416693388725973d44f0a58",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a2b35883e68dc45cfb7eaf35c36fdda84a1aea77c416693388725973d44f0a58",
+                    "hash" : "0xa2b35883e68dc45cfb7eaf35c36fdda84a1aea77c416693388725973d44f0a58",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5f16000ab7b60629613874726ca6b564fa81c5242f2e304d41fd08de087085f8",
+                    "hash" : "0x5f16000ab7b60629613874726ca6b564fa81c5242f2e304d41fd08de087085f8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5f16000ab7b60629613874726ca6b564fa81c5242f2e304d41fd08de087085f8",
+                    "hash" : "0x5f16000ab7b60629613874726ca6b564fa81c5242f2e304d41fd08de087085f8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a2b35883e68dc45cfb7eaf35c36fdda84a1aea77c416693388725973d44f0a58",
+                    "hash" : "0xa2b35883e68dc45cfb7eaf35c36fdda84a1aea77c416693388725973d44f0a58",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0bebc200",
                 "code" : "0x60206000600060006013600262030d40f1600255600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CallSha256_2.json b/GeneralStateTests/stPreCompiledContracts/CallSha256_2.json
index 7da5caa00..01ba9ef53 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallSha256_2.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallSha256_2.json
@@ -1,17 +1,17 @@
 {
     "CallSha256_2" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "5f16214512791aa2ff58ed1dfb91dd03abf992eaa2459bd93eede7475dccfbe0",
+                    "hash" : "0x5f16214512791aa2ff58ed1dfb91dd03abf992eaa2459bd93eede7475dccfbe0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a8cca12173a969472c8e27402ac36b2089680e8d4926a2f8cce4a4a2769e60b8",
+                    "hash" : "0xa8cca12173a969472c8e27402ac36b2089680e8d4926a2f8cce4a4a2769e60b8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4486c2ed72e7eb999134286eb0cdd193cd5a25fcf74b2f0ec41743fc2b0a993a",
+                    "hash" : "0x4486c2ed72e7eb999134286eb0cdd193cd5a25fcf74b2f0ec41743fc2b0a993a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4486c2ed72e7eb999134286eb0cdd193cd5a25fcf74b2f0ec41743fc2b0a993a",
+                    "hash" : "0x4486c2ed72e7eb999134286eb0cdd193cd5a25fcf74b2f0ec41743fc2b0a993a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a8cca12173a969472c8e27402ac36b2089680e8d4926a2f8cce4a4a2769e60b8",
+                    "hash" : "0xa8cca12173a969472c8e27402ac36b2089680e8d4926a2f8cce4a4a2769e60b8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x64f34578907f6005526020600060256000600060026101f4f1600255600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CallSha256_3.json b/GeneralStateTests/stPreCompiledContracts/CallSha256_3.json
index 25e43b753..21fd69ea1 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallSha256_3.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallSha256_3.json
@@ -1,17 +1,17 @@
 {
     "CallSha256_3" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "629bd433840e4cf0ff15d9f156c89b64b7db3d834ea2583694195997978fbe41",
+                    "hash" : "0x629bd433840e4cf0ff15d9f156c89b64b7db3d834ea2583694195997978fbe41",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "52e69963b10d07e1181b4666ee8eb8c8a674b04a2d181ef63980711afe2fb451",
+                    "hash" : "0x52e69963b10d07e1181b4666ee8eb8c8a674b04a2d181ef63980711afe2fb451",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2b4bd681b739a73b8c2c150718789783ed83a01bc9e6aece404755418b5c18a7",
+                    "hash" : "0x2b4bd681b739a73b8c2c150718789783ed83a01bc9e6aece404755418b5c18a7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "2b4bd681b739a73b8c2c150718789783ed83a01bc9e6aece404755418b5c18a7",
+                    "hash" : "0x2b4bd681b739a73b8c2c150718789783ed83a01bc9e6aece404755418b5c18a7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "52e69963b10d07e1181b4666ee8eb8c8a674b04a2d181ef63980711afe2fb451",
+                    "hash" : "0x52e69963b10d07e1181b4666ee8eb8c8a674b04a2d181ef63980711afe2fb451",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x64f34578907f6000526020600060256000600060026101f4f1600255600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CallSha256_3_postfix0.json b/GeneralStateTests/stPreCompiledContracts/CallSha256_3_postfix0.json
index 6a251ded3..8918e3fb2 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallSha256_3_postfix0.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallSha256_3_postfix0.json
@@ -1,17 +1,17 @@
 {
     "CallSha256_3_postfix0" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "90791e9d5dccb0c20fba4b193e275d4f83e4c9d57f6b4930511df4793146600e",
+                    "hash" : "0x90791e9d5dccb0c20fba4b193e275d4f83e4c9d57f6b4930511df4793146600e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "81e879df5e979305af1f79c7740bd1754ff11e6d8d129795e586b735c92187f3",
+                    "hash" : "0x81e879df5e979305af1f79c7740bd1754ff11e6d8d129795e586b735c92187f3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "13cc9b72cee9a44291cc26fda71bf8cdeca31a454786e0e70dc6aae7ab507cba",
+                    "hash" : "0x13cc9b72cee9a44291cc26fda71bf8cdeca31a454786e0e70dc6aae7ab507cba",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "13cc9b72cee9a44291cc26fda71bf8cdeca31a454786e0e70dc6aae7ab507cba",
+                    "hash" : "0x13cc9b72cee9a44291cc26fda71bf8cdeca31a454786e0e70dc6aae7ab507cba",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "81e879df5e979305af1f79c7740bd1754ff11e6d8d129795e586b735c92187f3",
+                    "hash" : "0x81e879df5e979305af1f79c7740bd1754ff11e6d8d129795e586b735c92187f3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x65f34578907f006000526020600060256000600060026101f4f1600255600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CallSha256_3_prefix0.json b/GeneralStateTests/stPreCompiledContracts/CallSha256_3_prefix0.json
index a56fe33e3..1ac2222f1 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallSha256_3_prefix0.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallSha256_3_prefix0.json
@@ -1,17 +1,17 @@
 {
     "CallSha256_3_prefix0" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "629bd433840e4cf0ff15d9f156c89b64b7db3d834ea2583694195997978fbe41",
+                    "hash" : "0x629bd433840e4cf0ff15d9f156c89b64b7db3d834ea2583694195997978fbe41",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "52e69963b10d07e1181b4666ee8eb8c8a674b04a2d181ef63980711afe2fb451",
+                    "hash" : "0x52e69963b10d07e1181b4666ee8eb8c8a674b04a2d181ef63980711afe2fb451",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2b4bd681b739a73b8c2c150718789783ed83a01bc9e6aece404755418b5c18a7",
+                    "hash" : "0x2b4bd681b739a73b8c2c150718789783ed83a01bc9e6aece404755418b5c18a7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "2b4bd681b739a73b8c2c150718789783ed83a01bc9e6aece404755418b5c18a7",
+                    "hash" : "0x2b4bd681b739a73b8c2c150718789783ed83a01bc9e6aece404755418b5c18a7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "52e69963b10d07e1181b4666ee8eb8c8a674b04a2d181ef63980711afe2fb451",
+                    "hash" : "0x52e69963b10d07e1181b4666ee8eb8c8a674b04a2d181ef63980711afe2fb451",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x64f34578907f6000526020600060256000600060026101f4f1600255600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CallSha256_4.json b/GeneralStateTests/stPreCompiledContracts/CallSha256_4.json
index a2f6539b4..37e8422e3 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallSha256_4.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallSha256_4.json
@@ -1,17 +1,17 @@
 {
     "CallSha256_4" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "20270d37d265f700ba4860f612411a4092621a329b0a2a378228764e2d23ac7f",
+                    "hash" : "0x20270d37d265f700ba4860f612411a4092621a329b0a2a378228764e2d23ac7f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e7591befc32140f54eb732d50574f89bec399b0b3b402af4ef4d9272d21fc0aa",
+                    "hash" : "0xe7591befc32140f54eb732d50574f89bec399b0b3b402af4ef4d9272d21fc0aa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "ebf6e4a83fcafea74db774fa81650afcf661cb5d1eb6fb04158a3369bc0a0c81",
+                    "hash" : "0xebf6e4a83fcafea74db774fa81650afcf661cb5d1eb6fb04158a3369bc0a0c81",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ebf6e4a83fcafea74db774fa81650afcf661cb5d1eb6fb04158a3369bc0a0c81",
+                    "hash" : "0xebf6e4a83fcafea74db774fa81650afcf661cb5d1eb6fb04158a3369bc0a0c81",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e7591befc32140f54eb732d50574f89bec399b0b3b402af4ef4d9272d21fc0aa",
+                    "hash" : "0xe7591befc32140f54eb732d50574f89bec399b0b3b402af4ef4d9272d21fc0aa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060026064f1600255600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CallSha256_4_gas99.json b/GeneralStateTests/stPreCompiledContracts/CallSha256_4_gas99.json
index 0dddc3c3e..fd22d14b3 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallSha256_4_gas99.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallSha256_4_gas99.json
@@ -1,17 +1,17 @@
 {
     "CallSha256_4_gas99" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "95d63944bcbeb03fa4afc9d935a8fbdd3bc76a37b30207e40f9de7ae7a0331cb",
+                    "hash" : "0x95d63944bcbeb03fa4afc9d935a8fbdd3bc76a37b30207e40f9de7ae7a0331cb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c9b775e18b516ae69d8d106d2754056629a68ec3be4d967804e4e2e768e9f316",
+                    "hash" : "0xc9b775e18b516ae69d8d106d2754056629a68ec3be4d967804e4e2e768e9f316",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "8efab944f5c2525aff1db05bf947281046ed8737b7d81bf3b58ff01e367263d4",
+                    "hash" : "0x8efab944f5c2525aff1db05bf947281046ed8737b7d81bf3b58ff01e367263d4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "8efab944f5c2525aff1db05bf947281046ed8737b7d81bf3b58ff01e367263d4",
+                    "hash" : "0x8efab944f5c2525aff1db05bf947281046ed8737b7d81bf3b58ff01e367263d4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c9b775e18b516ae69d8d106d2754056629a68ec3be4d967804e4e2e768e9f316",
+                    "hash" : "0xc9b775e18b516ae69d8d106d2754056629a68ec3be4d967804e4e2e768e9f316",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060026063f1600255600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "365224"
+                "0x0592a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/CallSha256_5.json b/GeneralStateTests/stPreCompiledContracts/CallSha256_5.json
index 8d8d8a327..6b10c001b 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallSha256_5.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallSha256_5.json
@@ -1,17 +1,17 @@
 {
     "CallSha256_5" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "ffb1bb4f635f0ea33d5b41632626ba9922d0ed84badfcc2c99256cb7563532b3",
+                    "hash" : "0xffb1bb4f635f0ea33d5b41632626ba9922d0ed84badfcc2c99256cb7563532b3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9ddd87380d77cdab2089800cd67e53c56f3e989a05ec9f78d9b1f03ae3ba2c06",
+                    "hash" : "0x9ddd87380d77cdab2089800cd67e53c56f3e989a05ec9f78d9b1f03ae3ba2c06",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "158ae4f43576851b9ebba515ba108fded9df16956b249d9bfe9169be5f837402",
+                    "hash" : "0x158ae4f43576851b9ebba515ba108fded9df16956b249d9bfe9169be5f837402",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "158ae4f43576851b9ebba515ba108fded9df16956b249d9bfe9169be5f837402",
+                    "hash" : "0x158ae4f43576851b9ebba515ba108fded9df16956b249d9bfe9169be5f837402",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9ddd87380d77cdab2089800cd67e53c56f3e989a05ec9f78d9b1f03ae3ba2c06",
+                    "hash" : "0x9ddd87380d77cdab2089800cd67e53c56f3e989a05ec9f78d9b1f03ae3ba2c06",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260206000620f4240600060006002610258f1600255600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "10000000"
+                "0x989680"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stPreCompiledContracts/sec80.json b/GeneralStateTests/stPreCompiledContracts/sec80.json
index 1391a6815..2465660d1 100644
--- a/GeneralStateTests/stPreCompiledContracts/sec80.json
+++ b/GeneralStateTests/stPreCompiledContracts/sec80.json
@@ -1,17 +1,17 @@
 {
     "sec80" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "20caf0e4334c49b11ba73bde2d58db4133c4e5b45e517fb8a56ad0be7fb6b7b5",
+                    "hash" : "0x20caf0e4334c49b11ba73bde2d58db4133c4e5b45e517fb8a56ad0be7fb6b7b5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "20caf0e4334c49b11ba73bde2d58db4133c4e5b45e517fb8a56ad0be7fb6b7b5",
+                    "hash" : "0x20caf0e4334c49b11ba73bde2d58db4133c4e5b45e517fb8a56ad0be7fb6b7b5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "561bf5ed8918949a2bdb15003334f0c487da57a350317346d02c92c9a4d32b88",
+                    "hash" : "0x561bf5ed8918949a2bdb15003334f0c487da57a350317346d02c92c9a4d32b88",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "561bf5ed8918949a2bdb15003334f0c487da57a350317346d02c92c9a4d32b88",
+                    "hash" : "0x561bf5ed8918949a2bdb15003334f0c487da57a350317346d02c92c9a4d32b88",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "20caf0e4334c49b11ba73bde2d58db4133c4e5b45e517fb8a56ad0be7fb6b7b5",
+                    "hash" : "0x20caf0e4334c49b11ba73bde2d58db4133c4e5b45e517fb8a56ad0be7fb6b7b5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x601b565b6000555b005b630badf00d6003565b63c001f00d6003565b7319e7e376e7c213b7e7e7e46cc70a5dd086daff2a7f22ae6da6b482f9b1b19b0b897c3fd43884180a1c5ee361e1107a1bc635649dda600052601b603f537f16433dce375ce6dc8151d3f0a22728bc4a1d9fd6ed39dfd18b4609331937367f6040527f306964c0cf5d74f04129fdc60b54d35b596dde1bf89ad92cb4123318f4c0e40060605260206080607f60006000600161fffff21560075760805114601257600956",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "10000000"
+                "0x989680"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest.json b/GeneralStateTests/stRandom/randomStatetest.json
index 1305bf166..c2c010df0 100644
--- a/GeneralStateTests/stRandom/randomStatetest.json
+++ b/GeneralStateTests/stRandom/randomStatetest.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "3822329c9cb2cf135d6051498b840a029d24f464147c29d1d3048eeb3f9529c6",
+                    "hash" : "0x3822329c9cb2cf135d6051498b840a029d24f464147c29d1d3048eeb3f9529c6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "3822329c9cb2cf135d6051498b840a029d24f464147c29d1d3048eeb3f9529c6",
+                    "hash" : "0x3822329c9cb2cf135d6051498b840a029d24f464147c29d1d3048eeb3f9529c6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3822329c9cb2cf135d6051498b840a029d24f464147c29d1d3048eeb3f9529c6",
+                    "hash" : "0x3822329c9cb2cf135d6051498b840a029d24f464147c29d1d3048eeb3f9529c6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3822329c9cb2cf135d6051498b840a029d24f464147c29d1d3048eeb3f9529c6",
+                    "hash" : "0x3822329c9cb2cf135d6051498b840a029d24f464147c29d1d3048eeb3f9529c6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "3822329c9cb2cf135d6051498b840a029d24f464147c29d1d3048eeb3f9529c6",
+                    "hash" : "0x3822329c9cb2cf135d6051498b840a029d24f464147c29d1d3048eeb3f9529c6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "3822329c9cb2cf135d6051498b840a029d24f464147c29d1d3048eeb3f9529c6",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f29199c9aa4054170f1a15a55056f965560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "252246116"
+                "0x0f08f864"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest0.json b/GeneralStateTests/stRandom/randomStatetest0.json
index b0e2ea6fe..223164879 100644
--- a/GeneralStateTests/stRandom/randomStatetest0.json
+++ b/GeneralStateTests/stRandom/randomStatetest0.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest0" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "588f574aadabcd11da91c32f9931372cca74e5e1830acc06246d9bb53f7a3d84",
+                    "hash" : "0x588f574aadabcd11da91c32f9931372cca74e5e1830acc06246d9bb53f7a3d84",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "588f574aadabcd11da91c32f9931372cca74e5e1830acc06246d9bb53f7a3d84",
+                    "hash" : "0x588f574aadabcd11da91c32f9931372cca74e5e1830acc06246d9bb53f7a3d84",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "588f574aadabcd11da91c32f9931372cca74e5e1830acc06246d9bb53f7a3d84",
+                    "hash" : "0x588f574aadabcd11da91c32f9931372cca74e5e1830acc06246d9bb53f7a3d84",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "588f574aadabcd11da91c32f9931372cca74e5e1830acc06246d9bb53f7a3d84",
+                    "hash" : "0x588f574aadabcd11da91c32f9931372cca74e5e1830acc06246d9bb53f7a3d84",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "588f574aadabcd11da91c32f9931372cca74e5e1830acc06246d9bb53f7a3d84",
+                    "hash" : "0x588f574aadabcd11da91c32f9931372cca74e5e1830acc06246d9bb53f7a3d84",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "588f574aadabcd11da91c32f9931372cca74e5e1830acc06246d9bb53f7a3d84",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff857ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe1302056f60005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1631233707"
+                "0x613aa6ab"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest1.json b/GeneralStateTests/stRandom/randomStatetest1.json
index 35102a7ac..a9054c2b0 100644
--- a/GeneralStateTests/stRandom/randomStatetest1.json
+++ b/GeneralStateTests/stRandom/randomStatetest1.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest1" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "adc578b3b4201932f6c3bce09e94ae1896afa6e0a5c63fe1b493b4567b6de276",
+                    "hash" : "0xadc578b3b4201932f6c3bce09e94ae1896afa6e0a5c63fe1b493b4567b6de276",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "adc578b3b4201932f6c3bce09e94ae1896afa6e0a5c63fe1b493b4567b6de276",
+                    "hash" : "0xadc578b3b4201932f6c3bce09e94ae1896afa6e0a5c63fe1b493b4567b6de276",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "adc578b3b4201932f6c3bce09e94ae1896afa6e0a5c63fe1b493b4567b6de276",
+                    "hash" : "0xadc578b3b4201932f6c3bce09e94ae1896afa6e0a5c63fe1b493b4567b6de276",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "adc578b3b4201932f6c3bce09e94ae1896afa6e0a5c63fe1b493b4567b6de276",
+                    "hash" : "0xadc578b3b4201932f6c3bce09e94ae1896afa6e0a5c63fe1b493b4567b6de276",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "adc578b3b4201932f6c3bce09e94ae1896afa6e0a5c63fe1b493b4567b6de276",
+                    "hash" : "0xadc578b3b4201932f6c3bce09e94ae1896afa6e0a5c63fe1b493b4567b6de276",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "6584ed53fe381f4c404bd2e099d04bd116514348471c66309a9a0e6f419b0b18",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x454543414341444259f2",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest10.json b/GeneralStateTests/stRandom/randomStatetest10.json
index 9d71c79b3..4130f63fd 100644
--- a/GeneralStateTests/stRandom/randomStatetest10.json
+++ b/GeneralStateTests/stRandom/randomStatetest10.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest10" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "400ff231b558eae5262ba43f7f863a200cf49aab2abc77ca61fdf4b6c6db8574",
+                    "hash" : "0x400ff231b558eae5262ba43f7f863a200cf49aab2abc77ca61fdf4b6c6db8574",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "400ff231b558eae5262ba43f7f863a200cf49aab2abc77ca61fdf4b6c6db8574",
+                    "hash" : "0x400ff231b558eae5262ba43f7f863a200cf49aab2abc77ca61fdf4b6c6db8574",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "400ff231b558eae5262ba43f7f863a200cf49aab2abc77ca61fdf4b6c6db8574",
+                    "hash" : "0x400ff231b558eae5262ba43f7f863a200cf49aab2abc77ca61fdf4b6c6db8574",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "400ff231b558eae5262ba43f7f863a200cf49aab2abc77ca61fdf4b6c6db8574",
+                    "hash" : "0x400ff231b558eae5262ba43f7f863a200cf49aab2abc77ca61fdf4b6c6db8574",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "400ff231b558eae5262ba43f7f863a200cf49aab2abc77ca61fdf4b6c6db8574",
+                    "hash" : "0x400ff231b558eae5262ba43f7f863a200cf49aab2abc77ca61fdf4b6c6db8574",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "400ff231b558eae5262ba43f7f863a200cf49aab2abc77ca61fdf4b6c6db8574",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000000120417f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3508859a1740a0528f26a635216cd980a9a9255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "364185236"
+                "0x15b50694"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest100.json b/GeneralStateTests/stRandom/randomStatetest100.json
index c0665176a..27698fbf0 100644
--- a/GeneralStateTests/stRandom/randomStatetest100.json
+++ b/GeneralStateTests/stRandom/randomStatetest100.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest100" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "54dfd10f0de86225537244edc47ec0ed9f8e665f0f6271d15e7707f67eca981b",
+                    "hash" : "0x54dfd10f0de86225537244edc47ec0ed9f8e665f0f6271d15e7707f67eca981b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "54dfd10f0de86225537244edc47ec0ed9f8e665f0f6271d15e7707f67eca981b",
+                    "hash" : "0x54dfd10f0de86225537244edc47ec0ed9f8e665f0f6271d15e7707f67eca981b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5881f750258fb642a9cc86dc9a7800652e2fe6bd40b7fa84d514344e90ee25c3",
+                    "hash" : "0x5881f750258fb642a9cc86dc9a7800652e2fe6bd40b7fa84d514344e90ee25c3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5881f750258fb642a9cc86dc9a7800652e2fe6bd40b7fa84d514344e90ee25c3",
+                    "hash" : "0x5881f750258fb642a9cc86dc9a7800652e2fe6bd40b7fa84d514344e90ee25c3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "54dfd10f0de86225537244edc47ec0ed9f8e665f0f6271d15e7707f67eca981b",
+                    "hash" : "0x54dfd10f0de86225537244edc47ec0ed9f8e665f0f6271d15e7707f67eca981b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "16bd822f93e796e82c9fcb2a3e508e0e39c621628e4e755535442d455beefdaf",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x414243444342444283f24455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest101.json b/GeneralStateTests/stRandom/randomStatetest101.json
index f3cff8eee..2482339d8 100644
--- a/GeneralStateTests/stRandom/randomStatetest101.json
+++ b/GeneralStateTests/stRandom/randomStatetest101.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest101" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "dce115ce0dcd7b7bfb76329a14d665a803e5cf266cf1235dfea7d20c03e83d18",
+                    "hash" : "0xdce115ce0dcd7b7bfb76329a14d665a803e5cf266cf1235dfea7d20c03e83d18",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "dce115ce0dcd7b7bfb76329a14d665a803e5cf266cf1235dfea7d20c03e83d18",
+                    "hash" : "0xdce115ce0dcd7b7bfb76329a14d665a803e5cf266cf1235dfea7d20c03e83d18",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "dce115ce0dcd7b7bfb76329a14d665a803e5cf266cf1235dfea7d20c03e83d18",
+                    "hash" : "0xdce115ce0dcd7b7bfb76329a14d665a803e5cf266cf1235dfea7d20c03e83d18",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "dce115ce0dcd7b7bfb76329a14d665a803e5cf266cf1235dfea7d20c03e83d18",
+                    "hash" : "0xdce115ce0dcd7b7bfb76329a14d665a803e5cf266cf1235dfea7d20c03e83d18",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "dce115ce0dcd7b7bfb76329a14d665a803e5cf266cf1235dfea7d20c03e83d18",
+                    "hash" : "0xdce115ce0dcd7b7bfb76329a14d665a803e5cf266cf1235dfea7d20c03e83d18",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "dce115ce0dcd7b7bfb76329a14d665a803e5cf266cf1235dfea7d20c03e83d18",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000000000000000000000000000000000000000000000407f0000000000000000000000000000000000000000000000000000000000000001357f00000000000000000000000000000000000000000000000000000000000000010b8a9e12010560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1884623139"
+                "0x70551123"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest102.json b/GeneralStateTests/stRandom/randomStatetest102.json
index 939146b11..1cefd9213 100644
--- a/GeneralStateTests/stRandom/randomStatetest102.json
+++ b/GeneralStateTests/stRandom/randomStatetest102.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest102" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "700d38e788dd4a41a048f79146935f8abd647c61f91b943244947086f2b1a9a1",
+                    "hash" : "0x700d38e788dd4a41a048f79146935f8abd647c61f91b943244947086f2b1a9a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "700d38e788dd4a41a048f79146935f8abd647c61f91b943244947086f2b1a9a1",
+                    "hash" : "0x700d38e788dd4a41a048f79146935f8abd647c61f91b943244947086f2b1a9a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "700d38e788dd4a41a048f79146935f8abd647c61f91b943244947086f2b1a9a1",
+                    "hash" : "0x700d38e788dd4a41a048f79146935f8abd647c61f91b943244947086f2b1a9a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "700d38e788dd4a41a048f79146935f8abd647c61f91b943244947086f2b1a9a1",
+                    "hash" : "0x700d38e788dd4a41a048f79146935f8abd647c61f91b943244947086f2b1a9a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "700d38e788dd4a41a048f79146935f8abd647c61f91b943244947086f2b1a9a1",
+                    "hash" : "0x700d38e788dd4a41a048f79146935f8abd647c61f91b943244947086f2b1a9a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "700d38e788dd4a41a048f79146935f8abd647c61f91b943244947086f2b1a9a1",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x457f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b544447f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f157094ffff1a04893a9cf3858b85765560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "634395362"
+                "0x25d01ae2"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest103.json b/GeneralStateTests/stRandom/randomStatetest103.json
index 393ccc15b..fc357a510 100644
--- a/GeneralStateTests/stRandom/randomStatetest103.json
+++ b/GeneralStateTests/stRandom/randomStatetest103.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest103" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "db746085a68ff63096d43202f64f089300ea5fabcc4dc769472b0710c0029383",
+                    "hash" : "0xdb746085a68ff63096d43202f64f089300ea5fabcc4dc769472b0710c0029383",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "db746085a68ff63096d43202f64f089300ea5fabcc4dc769472b0710c0029383",
+                    "hash" : "0xdb746085a68ff63096d43202f64f089300ea5fabcc4dc769472b0710c0029383",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "db746085a68ff63096d43202f64f089300ea5fabcc4dc769472b0710c0029383",
+                    "hash" : "0xdb746085a68ff63096d43202f64f089300ea5fabcc4dc769472b0710c0029383",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "db746085a68ff63096d43202f64f089300ea5fabcc4dc769472b0710c0029383",
+                    "hash" : "0xdb746085a68ff63096d43202f64f089300ea5fabcc4dc769472b0710c0029383",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "db746085a68ff63096d43202f64f089300ea5fabcc4dc769472b0710c0029383",
+                    "hash" : "0xdb746085a68ff63096d43202f64f089300ea5fabcc4dc769472b0710c0029383",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "db746085a68ff63096d43202f64f089300ea5fabcc4dc769472b0710c0029383",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe92357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff597f00000000000000000000000000000000000000000000000000000000000000019385a39988160a205a93196d336428",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1592853550"
+                "0x5ef1042e"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest104.json b/GeneralStateTests/stRandom/randomStatetest104.json
index ead18d0dd..55422b5a2 100644
--- a/GeneralStateTests/stRandom/randomStatetest104.json
+++ b/GeneralStateTests/stRandom/randomStatetest104.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest104" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "51f90e1d070c429e1dd324daaf74c733ef8ea12fc50dca1dc3ad8d8e6f51b6b4",
+                    "hash" : "0x51f90e1d070c429e1dd324daaf74c733ef8ea12fc50dca1dc3ad8d8e6f51b6b4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "51f90e1d070c429e1dd324daaf74c733ef8ea12fc50dca1dc3ad8d8e6f51b6b4",
+                    "hash" : "0x51f90e1d070c429e1dd324daaf74c733ef8ea12fc50dca1dc3ad8d8e6f51b6b4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "51f90e1d070c429e1dd324daaf74c733ef8ea12fc50dca1dc3ad8d8e6f51b6b4",
+                    "hash" : "0x51f90e1d070c429e1dd324daaf74c733ef8ea12fc50dca1dc3ad8d8e6f51b6b4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "51f90e1d070c429e1dd324daaf74c733ef8ea12fc50dca1dc3ad8d8e6f51b6b4",
+                    "hash" : "0x51f90e1d070c429e1dd324daaf74c733ef8ea12fc50dca1dc3ad8d8e6f51b6b4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "51f90e1d070c429e1dd324daaf74c733ef8ea12fc50dca1dc3ad8d8e6f51b6b4",
+                    "hash" : "0x51f90e1d070c429e1dd324daaf74c733ef8ea12fc50dca1dc3ad8d8e6f51b6b4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "51f90e1d070c429e1dd324daaf74c733ef8ea12fc50dca1dc3ad8d8e6f51b6b4",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f147d6b978c780a82619772417d5b6a5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "977250261"
+                "0x3a3fa7d5"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest105.json b/GeneralStateTests/stRandom/randomStatetest105.json
index b549cad8f..5a5c5b4af 100644
--- a/GeneralStateTests/stRandom/randomStatetest105.json
+++ b/GeneralStateTests/stRandom/randomStatetest105.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest105" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "bdee0d34ecfeed56ee3c30aaed98214975472b2d09948f4cf34758245ef9d6a1",
+                    "hash" : "0xbdee0d34ecfeed56ee3c30aaed98214975472b2d09948f4cf34758245ef9d6a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "bdee0d34ecfeed56ee3c30aaed98214975472b2d09948f4cf34758245ef9d6a1",
+                    "hash" : "0xbdee0d34ecfeed56ee3c30aaed98214975472b2d09948f4cf34758245ef9d6a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "bdee0d34ecfeed56ee3c30aaed98214975472b2d09948f4cf34758245ef9d6a1",
+                    "hash" : "0xbdee0d34ecfeed56ee3c30aaed98214975472b2d09948f4cf34758245ef9d6a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "bdee0d34ecfeed56ee3c30aaed98214975472b2d09948f4cf34758245ef9d6a1",
+                    "hash" : "0xbdee0d34ecfeed56ee3c30aaed98214975472b2d09948f4cf34758245ef9d6a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "bdee0d34ecfeed56ee3c30aaed98214975472b2d09948f4cf34758245ef9d6a1",
+                    "hash" : "0xbdee0d34ecfeed56ee3c30aaed98214975472b2d09948f4cf34758245ef9d6a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "bdee0d34ecfeed56ee3c30aaed98214975472b2d09948f4cf34758245ef9d6a1",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff437f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f9914639111156d1759ff65039a02926c60005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1449730295"
+                "0x566920f7"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest106.json b/GeneralStateTests/stRandom/randomStatetest106.json
index e21136fae..bccbf2623 100644
--- a/GeneralStateTests/stRandom/randomStatetest106.json
+++ b/GeneralStateTests/stRandom/randomStatetest106.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest106" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6796cb8770afcf7f773992c801b2d5800974a29c508fe1923a06b2e8fd655340",
+                    "hash" : "0x6796cb8770afcf7f773992c801b2d5800974a29c508fe1923a06b2e8fd655340",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6796cb8770afcf7f773992c801b2d5800974a29c508fe1923a06b2e8fd655340",
+                    "hash" : "0x6796cb8770afcf7f773992c801b2d5800974a29c508fe1923a06b2e8fd655340",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6796cb8770afcf7f773992c801b2d5800974a29c508fe1923a06b2e8fd655340",
+                    "hash" : "0x6796cb8770afcf7f773992c801b2d5800974a29c508fe1923a06b2e8fd655340",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6796cb8770afcf7f773992c801b2d5800974a29c508fe1923a06b2e8fd655340",
+                    "hash" : "0x6796cb8770afcf7f773992c801b2d5800974a29c508fe1923a06b2e8fd655340",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6796cb8770afcf7f773992c801b2d5800974a29c508fe1923a06b2e8fd655340",
+                    "hash" : "0x6796cb8770afcf7f773992c801b2d5800974a29c508fe1923a06b2e8fd655340",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "6796cb8770afcf7f773992c801b2d5800974a29c508fe1923a06b2e8fd655340",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f327043726481f25094828e211557795560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1107240556"
+                "0x41ff266c"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest107.json b/GeneralStateTests/stRandom/randomStatetest107.json
index 437a1e603..536f6c22d 100644
--- a/GeneralStateTests/stRandom/randomStatetest107.json
+++ b/GeneralStateTests/stRandom/randomStatetest107.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest107" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1f3b262cfe6199a0c34832b6741d0d0de29a6ffa46f0d6f7e533acccbec67750",
+                    "hash" : "0x1f3b262cfe6199a0c34832b6741d0d0de29a6ffa46f0d6f7e533acccbec67750",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "1f3b262cfe6199a0c34832b6741d0d0de29a6ffa46f0d6f7e533acccbec67750",
+                    "hash" : "0x1f3b262cfe6199a0c34832b6741d0d0de29a6ffa46f0d6f7e533acccbec67750",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "1f3b262cfe6199a0c34832b6741d0d0de29a6ffa46f0d6f7e533acccbec67750",
+                    "hash" : "0x1f3b262cfe6199a0c34832b6741d0d0de29a6ffa46f0d6f7e533acccbec67750",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "1f3b262cfe6199a0c34832b6741d0d0de29a6ffa46f0d6f7e533acccbec67750",
+                    "hash" : "0x1f3b262cfe6199a0c34832b6741d0d0de29a6ffa46f0d6f7e533acccbec67750",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "1f3b262cfe6199a0c34832b6741d0d0de29a6ffa46f0d6f7e533acccbec67750",
+                    "hash" : "0x1f3b262cfe6199a0c34832b6741d0d0de29a6ffa46f0d6f7e533acccbec67750",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "1f3b262cfe6199a0c34832b6741d0d0de29a6ffa46f0d6f7e533acccbec67750",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b50960005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1335641355"
+                "0x4f9c450b"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest108.json b/GeneralStateTests/stRandom/randomStatetest108.json
index 10de5a139..82daa7e4e 100644
--- a/GeneralStateTests/stRandom/randomStatetest108.json
+++ b/GeneralStateTests/stRandom/randomStatetest108.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest108" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "aa312e8af562a43ee46639e96f6f855af216025e0dc4880be8cc848baed36bd1",
+                    "hash" : "0xaa312e8af562a43ee46639e96f6f855af216025e0dc4880be8cc848baed36bd1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "aa312e8af562a43ee46639e96f6f855af216025e0dc4880be8cc848baed36bd1",
+                    "hash" : "0xaa312e8af562a43ee46639e96f6f855af216025e0dc4880be8cc848baed36bd1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "aa312e8af562a43ee46639e96f6f855af216025e0dc4880be8cc848baed36bd1",
+                    "hash" : "0xaa312e8af562a43ee46639e96f6f855af216025e0dc4880be8cc848baed36bd1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "aa312e8af562a43ee46639e96f6f855af216025e0dc4880be8cc848baed36bd1",
+                    "hash" : "0xaa312e8af562a43ee46639e96f6f855af216025e0dc4880be8cc848baed36bd1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "aa312e8af562a43ee46639e96f6f855af216025e0dc4880be8cc848baed36bd1",
+                    "hash" : "0xaa312e8af562a43ee46639e96f6f855af216025e0dc4880be8cc848baed36bd1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "7c1c9d5ac72e2eb95fda2d9dd311ab95fcd3edab06bff04c5282460c030a691e",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x41443442f34241",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest109.json b/GeneralStateTests/stRandom/randomStatetest109.json
index a81ad24eb..e808a6dd7 100644
--- a/GeneralStateTests/stRandom/randomStatetest109.json
+++ b/GeneralStateTests/stRandom/randomStatetest109.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest109" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d61c4bec238dc52d1c613341e4205f96707f540afc74facb408949f77de67559",
+                    "hash" : "0xd61c4bec238dc52d1c613341e4205f96707f540afc74facb408949f77de67559",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d61c4bec238dc52d1c613341e4205f96707f540afc74facb408949f77de67559",
+                    "hash" : "0xd61c4bec238dc52d1c613341e4205f96707f540afc74facb408949f77de67559",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "00abc60d5df4681fcccc44d024513cd0209d56e8ef7a08e3ca4189d506c697f7",
+                    "hash" : "0x00abc60d5df4681fcccc44d024513cd0209d56e8ef7a08e3ca4189d506c697f7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "00abc60d5df4681fcccc44d024513cd0209d56e8ef7a08e3ca4189d506c697f7",
+                    "hash" : "0x00abc60d5df4681fcccc44d024513cd0209d56e8ef7a08e3ca4189d506c697f7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d61c4bec238dc52d1c613341e4205f96707f540afc74facb408949f77de67559",
+                    "hash" : "0xd61c4bec238dc52d1c613341e4205f96707f540afc74facb408949f77de67559",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "00abc60d5df4681fcccc44d024513cd0209d56e8ef7a08e3ca4189d506c697f7",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x44444131444055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest11.json b/GeneralStateTests/stRandom/randomStatetest11.json
index 19a665274..39bee407e 100644
--- a/GeneralStateTests/stRandom/randomStatetest11.json
+++ b/GeneralStateTests/stRandom/randomStatetest11.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest11" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "21431bffa196891aeae83aa7ba572949857238f8bf4fe3ea30ee2143d09e1033",
+                    "hash" : "0x21431bffa196891aeae83aa7ba572949857238f8bf4fe3ea30ee2143d09e1033",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "21431bffa196891aeae83aa7ba572949857238f8bf4fe3ea30ee2143d09e1033",
+                    "hash" : "0x21431bffa196891aeae83aa7ba572949857238f8bf4fe3ea30ee2143d09e1033",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "21431bffa196891aeae83aa7ba572949857238f8bf4fe3ea30ee2143d09e1033",
+                    "hash" : "0x21431bffa196891aeae83aa7ba572949857238f8bf4fe3ea30ee2143d09e1033",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "21431bffa196891aeae83aa7ba572949857238f8bf4fe3ea30ee2143d09e1033",
+                    "hash" : "0x21431bffa196891aeae83aa7ba572949857238f8bf4fe3ea30ee2143d09e1033",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "21431bffa196891aeae83aa7ba572949857238f8bf4fe3ea30ee2143d09e1033",
+                    "hash" : "0x21431bffa196891aeae83aa7ba572949857238f8bf4fe3ea30ee2143d09e1033",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "21431bffa196891aeae83aa7ba572949857238f8bf4fe3ea30ee2143d09e1033",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3506fa093f3408a6e531735960a7617127a5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1762251756"
+                "0x6909d3ec"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest110.json b/GeneralStateTests/stRandom/randomStatetest110.json
index 1e548c3d1..c2e9ca4c1 100644
--- a/GeneralStateTests/stRandom/randomStatetest110.json
+++ b/GeneralStateTests/stRandom/randomStatetest110.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest110" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6618aaa7ca6663ea4035f424722a4c23618f123fe893510595388ecd90001884",
+                    "hash" : "0x6618aaa7ca6663ea4035f424722a4c23618f123fe893510595388ecd90001884",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6618aaa7ca6663ea4035f424722a4c23618f123fe893510595388ecd90001884",
+                    "hash" : "0x6618aaa7ca6663ea4035f424722a4c23618f123fe893510595388ecd90001884",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6618aaa7ca6663ea4035f424722a4c23618f123fe893510595388ecd90001884",
+                    "hash" : "0x6618aaa7ca6663ea4035f424722a4c23618f123fe893510595388ecd90001884",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6618aaa7ca6663ea4035f424722a4c23618f123fe893510595388ecd90001884",
+                    "hash" : "0x6618aaa7ca6663ea4035f424722a4c23618f123fe893510595388ecd90001884",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6618aaa7ca6663ea4035f424722a4c23618f123fe893510595388ecd90001884",
+                    "hash" : "0x6618aaa7ca6663ea4035f424722a4c23618f123fe893510595388ecd90001884",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "6618aaa7ca6663ea4035f424722a4c23618f123fe893510595388ecd90001884",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe417f00000000000000000000000000000000000000000000000000000000000000016f97543c343476cb7c8c84066217f1025560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "736834619"
+                "0x2beb343b"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest111.json b/GeneralStateTests/stRandom/randomStatetest111.json
index 266254f51..422e3dc61 100644
--- a/GeneralStateTests/stRandom/randomStatetest111.json
+++ b/GeneralStateTests/stRandom/randomStatetest111.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest111" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
             {
@@ -22,7 +22,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "57a9813176db0f5c519221d0d8c132b50ab7d92fa3d9287027dcf454696c3c93",
+                    "hash" : "0x57a9813176db0f5c519221d0d8c132b50ab7d92fa3d9287027dcf454696c3c93",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -32,7 +32,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "57a9813176db0f5c519221d0d8c132b50ab7d92fa3d9287027dcf454696c3c93",
+                    "hash" : "0x57a9813176db0f5c519221d0d8c132b50ab7d92fa3d9287027dcf454696c3c93",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -42,7 +42,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "57a9813176db0f5c519221d0d8c132b50ab7d92fa3d9287027dcf454696c3c93",
+                    "hash" : "0x57a9813176db0f5c519221d0d8c132b50ab7d92fa3d9287027dcf454696c3c93",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -52,7 +52,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "57a9813176db0f5c519221d0d8c132b50ab7d92fa3d9287027dcf454696c3c93",
+                    "hash" : "0x57a9813176db0f5c519221d0d8c132b50ab7d92fa3d9287027dcf454696c3c93",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,7 +62,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "57a9813176db0f5c519221d0d8c132b50ab7d92fa3d9287027dcf454696c3c93",
+                    "hash" : "0x57a9813176db0f5c519221d0d8c132b50ab7d92fa3d9287027dcf454696c3c93",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -73,23 +73,23 @@
         },
         "postStateRoot" : "57a9813176db0f5c519221d0d8c132b50ab7d92fa3d9287027dcf454696c3c93",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c35059a17f0000000000000000000000000000000000000000000000000000000000000001f38f07bf60005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -104,10 +104,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "50481116"
+                "0x030247dc"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest112.json b/GeneralStateTests/stRandom/randomStatetest112.json
index 1b48d1801..55b426a78 100644
--- a/GeneralStateTests/stRandom/randomStatetest112.json
+++ b/GeneralStateTests/stRandom/randomStatetest112.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest112" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e2725b3947b8d142be9e23b9012e434357812dd671c988a449d113da0e793c71",
+                    "hash" : "0xe2725b3947b8d142be9e23b9012e434357812dd671c988a449d113da0e793c71",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e2725b3947b8d142be9e23b9012e434357812dd671c988a449d113da0e793c71",
+                    "hash" : "0xe2725b3947b8d142be9e23b9012e434357812dd671c988a449d113da0e793c71",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e2725b3947b8d142be9e23b9012e434357812dd671c988a449d113da0e793c71",
+                    "hash" : "0xe2725b3947b8d142be9e23b9012e434357812dd671c988a449d113da0e793c71",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e2725b3947b8d142be9e23b9012e434357812dd671c988a449d113da0e793c71",
+                    "hash" : "0xe2725b3947b8d142be9e23b9012e434357812dd671c988a449d113da0e793c71",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e2725b3947b8d142be9e23b9012e434357812dd671c988a449d113da0e793c71",
+                    "hash" : "0xe2725b3947b8d142be9e23b9012e434357812dd671c988a449d113da0e793c71",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "e2725b3947b8d142be9e23b9012e434357812dd671c988a449d113da0e793c71",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff45447fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000006f549c5779398a848c353075146505415560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "2006825126"
+                "0x779db8a6"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest113.json b/GeneralStateTests/stRandom/randomStatetest113.json
index 469029653..9569e1712 100644
--- a/GeneralStateTests/stRandom/randomStatetest113.json
+++ b/GeneralStateTests/stRandom/randomStatetest113.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest113" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f32266a03318226789312953ea4ab0edac1bc5e6fa59e9fd3afcc32de6c9a91c",
+                    "hash" : "0xf32266a03318226789312953ea4ab0edac1bc5e6fa59e9fd3afcc32de6c9a91c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f32266a03318226789312953ea4ab0edac1bc5e6fa59e9fd3afcc32de6c9a91c",
+                    "hash" : "0xf32266a03318226789312953ea4ab0edac1bc5e6fa59e9fd3afcc32de6c9a91c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f32266a03318226789312953ea4ab0edac1bc5e6fa59e9fd3afcc32de6c9a91c",
+                    "hash" : "0xf32266a03318226789312953ea4ab0edac1bc5e6fa59e9fd3afcc32de6c9a91c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f32266a03318226789312953ea4ab0edac1bc5e6fa59e9fd3afcc32de6c9a91c",
+                    "hash" : "0xf32266a03318226789312953ea4ab0edac1bc5e6fa59e9fd3afcc32de6c9a91c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f32266a03318226789312953ea4ab0edac1bc5e6fa59e9fd3afcc32de6c9a91c",
+                    "hash" : "0xf32266a03318226789312953ea4ab0edac1bc5e6fa59e9fd3afcc32de6c9a91c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "f32266a03318226789312953ea4ab0edac1bc5e6fa59e9fd3afcc32de6c9a91c",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f6582a26ef383339ff078f0f00779785560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "855218549"
+                "0x32f99975"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest114.json b/GeneralStateTests/stRandom/randomStatetest114.json
index c3027fdc0..7ca009b4c 100644
--- a/GeneralStateTests/stRandom/randomStatetest114.json
+++ b/GeneralStateTests/stRandom/randomStatetest114.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest114" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "cb3c0ebc82468c2f0a9bfdbbb3f33872e05f07d55af779f82671a113826d6654",
+                    "hash" : "0xcb3c0ebc82468c2f0a9bfdbbb3f33872e05f07d55af779f82671a113826d6654",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "cb3c0ebc82468c2f0a9bfdbbb3f33872e05f07d55af779f82671a113826d6654",
+                    "hash" : "0xcb3c0ebc82468c2f0a9bfdbbb3f33872e05f07d55af779f82671a113826d6654",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "cb3c0ebc82468c2f0a9bfdbbb3f33872e05f07d55af779f82671a113826d6654",
+                    "hash" : "0xcb3c0ebc82468c2f0a9bfdbbb3f33872e05f07d55af779f82671a113826d6654",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "cb3c0ebc82468c2f0a9bfdbbb3f33872e05f07d55af779f82671a113826d6654",
+                    "hash" : "0xcb3c0ebc82468c2f0a9bfdbbb3f33872e05f07d55af779f82671a113826d6654",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "cb3c0ebc82468c2f0a9bfdbbb3f33872e05f07d55af779f82671a113826d6654",
+                    "hash" : "0xcb3c0ebc82468c2f0a9bfdbbb3f33872e05f07d55af779f82671a113826d6654",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "cb3c0ebc82468c2f0a9bfdbbb3f33872e05f07d55af779f82671a113826d6654",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f3584357ea388725483637d4471727f5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1067998899"
+                "0x3fa85eb3"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest115.json b/GeneralStateTests/stRandom/randomStatetest115.json
index a182585d8..b63660454 100644
--- a/GeneralStateTests/stRandom/randomStatetest115.json
+++ b/GeneralStateTests/stRandom/randomStatetest115.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest115" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "4d35f1a45da716536947e9cad2b6b9d9e114b77083984d67ea5daa980667125a",
+                    "hash" : "0x4d35f1a45da716536947e9cad2b6b9d9e114b77083984d67ea5daa980667125a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "4d35f1a45da716536947e9cad2b6b9d9e114b77083984d67ea5daa980667125a",
+                    "hash" : "0x4d35f1a45da716536947e9cad2b6b9d9e114b77083984d67ea5daa980667125a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4d35f1a45da716536947e9cad2b6b9d9e114b77083984d67ea5daa980667125a",
+                    "hash" : "0x4d35f1a45da716536947e9cad2b6b9d9e114b77083984d67ea5daa980667125a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4d35f1a45da716536947e9cad2b6b9d9e114b77083984d67ea5daa980667125a",
+                    "hash" : "0x4d35f1a45da716536947e9cad2b6b9d9e114b77083984d67ea5daa980667125a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "4d35f1a45da716536947e9cad2b6b9d9e114b77083984d67ea5daa980667125a",
+                    "hash" : "0x4d35f1a45da716536947e9cad2b6b9d9e114b77083984d67ea5daa980667125a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "4d35f1a45da716536947e9cad2b6b9d9e114b77083984d67ea5daa980667125a",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3506f15448e363302150a6f56518aa005315560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1948713091"
+                "0x74270083"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest116.json b/GeneralStateTests/stRandom/randomStatetest116.json
index 6a7edee73..a086e8d87 100644
--- a/GeneralStateTests/stRandom/randomStatetest116.json
+++ b/GeneralStateTests/stRandom/randomStatetest116.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest116" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "3b744e6037075a1c3b6b18ccdf377d3815369ad8b476da92bc6db4b37ae4aa29",
+                    "hash" : "0x3b744e6037075a1c3b6b18ccdf377d3815369ad8b476da92bc6db4b37ae4aa29",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "3b744e6037075a1c3b6b18ccdf377d3815369ad8b476da92bc6db4b37ae4aa29",
+                    "hash" : "0x3b744e6037075a1c3b6b18ccdf377d3815369ad8b476da92bc6db4b37ae4aa29",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3b744e6037075a1c3b6b18ccdf377d3815369ad8b476da92bc6db4b37ae4aa29",
+                    "hash" : "0x3b744e6037075a1c3b6b18ccdf377d3815369ad8b476da92bc6db4b37ae4aa29",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3b744e6037075a1c3b6b18ccdf377d3815369ad8b476da92bc6db4b37ae4aa29",
+                    "hash" : "0x3b744e6037075a1c3b6b18ccdf377d3815369ad8b476da92bc6db4b37ae4aa29",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "3b744e6037075a1c3b6b18ccdf377d3815369ad8b476da92bc6db4b37ae4aa29",
+                    "hash" : "0x3b744e6037075a1c3b6b18ccdf377d3815369ad8b476da92bc6db4b37ae4aa29",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "3b744e6037075a1c3b6b18ccdf377d3815369ad8b476da92bc6db4b37ae4aa29",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b50753933760005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "372067975"
+                "0x162d4e87"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest117.json b/GeneralStateTests/stRandom/randomStatetest117.json
index 0b65134f8..afd5c7c79 100644
--- a/GeneralStateTests/stRandom/randomStatetest117.json
+++ b/GeneralStateTests/stRandom/randomStatetest117.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest117" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1fb154a77c21b091d12540cc44d8156e1e80a1e02696e9110b425fcfc49de65d",
+                    "hash" : "0x1fb154a77c21b091d12540cc44d8156e1e80a1e02696e9110b425fcfc49de65d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "1fb154a77c21b091d12540cc44d8156e1e80a1e02696e9110b425fcfc49de65d",
+                    "hash" : "0x1fb154a77c21b091d12540cc44d8156e1e80a1e02696e9110b425fcfc49de65d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "1fb154a77c21b091d12540cc44d8156e1e80a1e02696e9110b425fcfc49de65d",
+                    "hash" : "0x1fb154a77c21b091d12540cc44d8156e1e80a1e02696e9110b425fcfc49de65d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "1fb154a77c21b091d12540cc44d8156e1e80a1e02696e9110b425fcfc49de65d",
+                    "hash" : "0x1fb154a77c21b091d12540cc44d8156e1e80a1e02696e9110b425fcfc49de65d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "1fb154a77c21b091d12540cc44d8156e1e80a1e02696e9110b425fcfc49de65d",
+                    "hash" : "0x1fb154a77c21b091d12540cc44d8156e1e80a1e02696e9110b425fcfc49de65d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "1fb154a77c21b091d12540cc44d8156e1e80a1e02696e9110b425fcfc49de65d",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x447f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f8aa4a4980274f18c6158368d4157145560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1763362724"
+                "0x691ac7a4"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest118.json b/GeneralStateTests/stRandom/randomStatetest118.json
index e4743b3a5..99fa5b7af 100644
--- a/GeneralStateTests/stRandom/randomStatetest118.json
+++ b/GeneralStateTests/stRandom/randomStatetest118.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest118" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f43a4635fb51a00f490ca4c1aa10d7bf565a3b29863df59516e9e9dde53d2997",
+                    "hash" : "0xf43a4635fb51a00f490ca4c1aa10d7bf565a3b29863df59516e9e9dde53d2997",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f43a4635fb51a00f490ca4c1aa10d7bf565a3b29863df59516e9e9dde53d2997",
+                    "hash" : "0xf43a4635fb51a00f490ca4c1aa10d7bf565a3b29863df59516e9e9dde53d2997",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f43a4635fb51a00f490ca4c1aa10d7bf565a3b29863df59516e9e9dde53d2997",
+                    "hash" : "0xf43a4635fb51a00f490ca4c1aa10d7bf565a3b29863df59516e9e9dde53d2997",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f43a4635fb51a00f490ca4c1aa10d7bf565a3b29863df59516e9e9dde53d2997",
+                    "hash" : "0xf43a4635fb51a00f490ca4c1aa10d7bf565a3b29863df59516e9e9dde53d2997",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f43a4635fb51a00f490ca4c1aa10d7bf565a3b29863df59516e9e9dde53d2997",
+                    "hash" : "0xf43a4635fb51a00f490ca4c1aa10d7bf565a3b29863df59516e9e9dde53d2997",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "f43a4635fb51a00f490ca4c1aa10d7bf565a3b29863df59516e9e9dde53d2997",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000006f55817c037fa45bf3850320309a8f025560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1190213224"
+                "0x46f13668"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest119.json b/GeneralStateTests/stRandom/randomStatetest119.json
index dea84b3ed..133401b4a 100644
--- a/GeneralStateTests/stRandom/randomStatetest119.json
+++ b/GeneralStateTests/stRandom/randomStatetest119.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest119" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "80514a4aef23c793c0ed0f3bf1e9f658e8a8b1589bcfab8a41e4259948263986",
+                    "hash" : "0x80514a4aef23c793c0ed0f3bf1e9f658e8a8b1589bcfab8a41e4259948263986",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "80514a4aef23c793c0ed0f3bf1e9f658e8a8b1589bcfab8a41e4259948263986",
+                    "hash" : "0x80514a4aef23c793c0ed0f3bf1e9f658e8a8b1589bcfab8a41e4259948263986",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "80514a4aef23c793c0ed0f3bf1e9f658e8a8b1589bcfab8a41e4259948263986",
+                    "hash" : "0x80514a4aef23c793c0ed0f3bf1e9f658e8a8b1589bcfab8a41e4259948263986",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "80514a4aef23c793c0ed0f3bf1e9f658e8a8b1589bcfab8a41e4259948263986",
+                    "hash" : "0x80514a4aef23c793c0ed0f3bf1e9f658e8a8b1589bcfab8a41e4259948263986",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "80514a4aef23c793c0ed0f3bf1e9f658e8a8b1589bcfab8a41e4259948263986",
+                    "hash" : "0x80514a4aef23c793c0ed0f3bf1e9f658e8a8b1589bcfab8a41e4259948263986",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "80514a4aef23c793c0ed0f3bf1e9f658e8a8b1589bcfab8a41e4259948263986",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x4559437f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000006f52503b127c115a9673a431379095665560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "412561866"
+                "0x189731ca"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest12.json b/GeneralStateTests/stRandom/randomStatetest12.json
index 52d282d35..18fddbe0a 100644
--- a/GeneralStateTests/stRandom/randomStatetest12.json
+++ b/GeneralStateTests/stRandom/randomStatetest12.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest12" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "111caf92598747d220f22f4088e80789baf444a47e384dc5266c790354b95f62",
+                    "hash" : "0x111caf92598747d220f22f4088e80789baf444a47e384dc5266c790354b95f62",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "111caf92598747d220f22f4088e80789baf444a47e384dc5266c790354b95f62",
+                    "hash" : "0x111caf92598747d220f22f4088e80789baf444a47e384dc5266c790354b95f62",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "111caf92598747d220f22f4088e80789baf444a47e384dc5266c790354b95f62",
+                    "hash" : "0x111caf92598747d220f22f4088e80789baf444a47e384dc5266c790354b95f62",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "111caf92598747d220f22f4088e80789baf444a47e384dc5266c790354b95f62",
+                    "hash" : "0x111caf92598747d220f22f4088e80789baf444a47e384dc5266c790354b95f62",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "111caf92598747d220f22f4088e80789baf444a47e384dc5266c790354b95f62",
+                    "hash" : "0x111caf92598747d220f22f4088e80789baf444a47e384dc5266c790354b95f62",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "111caf92598747d220f22f4088e80789baf444a47e384dc5266c790354b95f62",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5027f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f165490a41215369ef27603794116335560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1165421411"
+                "0x4576eb63"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest120.json b/GeneralStateTests/stRandom/randomStatetest120.json
index ffebeb2f5..765e6bf11 100644
--- a/GeneralStateTests/stRandom/randomStatetest120.json
+++ b/GeneralStateTests/stRandom/randomStatetest120.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest120" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "811ace7d10136466c4a277f2a5f174989223efcccb2ded685e51b7db83b96899",
+                    "hash" : "0x811ace7d10136466c4a277f2a5f174989223efcccb2ded685e51b7db83b96899",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "811ace7d10136466c4a277f2a5f174989223efcccb2ded685e51b7db83b96899",
+                    "hash" : "0x811ace7d10136466c4a277f2a5f174989223efcccb2ded685e51b7db83b96899",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "811ace7d10136466c4a277f2a5f174989223efcccb2ded685e51b7db83b96899",
+                    "hash" : "0x811ace7d10136466c4a277f2a5f174989223efcccb2ded685e51b7db83b96899",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "811ace7d10136466c4a277f2a5f174989223efcccb2ded685e51b7db83b96899",
+                    "hash" : "0x811ace7d10136466c4a277f2a5f174989223efcccb2ded685e51b7db83b96899",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "811ace7d10136466c4a277f2a5f174989223efcccb2ded685e51b7db83b96899",
+                    "hash" : "0x811ace7d10136466c4a277f2a5f174989223efcccb2ded685e51b7db83b96899",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "811ace7d10136466c4a277f2a5f174989223efcccb2ded685e51b7db83b96899",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe820860005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1887172074"
+                "0x707bf5ea"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest121.json b/GeneralStateTests/stRandom/randomStatetest121.json
index e1c358e06..4b9722d59 100644
--- a/GeneralStateTests/stRandom/randomStatetest121.json
+++ b/GeneralStateTests/stRandom/randomStatetest121.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest121" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9678766b3ae962bafefb2caf76cea13316a87de825d8e5f4717f142fc13d03a8",
+                    "hash" : "0x9678766b3ae962bafefb2caf76cea13316a87de825d8e5f4717f142fc13d03a8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9678766b3ae962bafefb2caf76cea13316a87de825d8e5f4717f142fc13d03a8",
+                    "hash" : "0x9678766b3ae962bafefb2caf76cea13316a87de825d8e5f4717f142fc13d03a8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9678766b3ae962bafefb2caf76cea13316a87de825d8e5f4717f142fc13d03a8",
+                    "hash" : "0x9678766b3ae962bafefb2caf76cea13316a87de825d8e5f4717f142fc13d03a8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9678766b3ae962bafefb2caf76cea13316a87de825d8e5f4717f142fc13d03a8",
+                    "hash" : "0x9678766b3ae962bafefb2caf76cea13316a87de825d8e5f4717f142fc13d03a8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9678766b3ae962bafefb2caf76cea13316a87de825d8e5f4717f142fc13d03a8",
+                    "hash" : "0x9678766b3ae962bafefb2caf76cea13316a87de825d8e5f4717f142fc13d03a8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "9678766b3ae962bafefb2caf76cea13316a87de825d8e5f4717f142fc13d03a8",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c350456f305842321509108c689f7ca3195a9d5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1227523279"
+                "0x492a84cf"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest122.json b/GeneralStateTests/stRandom/randomStatetest122.json
index a7a319234..c527f0275 100644
--- a/GeneralStateTests/stRandom/randomStatetest122.json
+++ b/GeneralStateTests/stRandom/randomStatetest122.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest122" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "109a4092736ba92807a8a26ef51660765630610e5384966972a7dc3985533b94",
+                    "hash" : "0x109a4092736ba92807a8a26ef51660765630610e5384966972a7dc3985533b94",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "109a4092736ba92807a8a26ef51660765630610e5384966972a7dc3985533b94",
+                    "hash" : "0x109a4092736ba92807a8a26ef51660765630610e5384966972a7dc3985533b94",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "109a4092736ba92807a8a26ef51660765630610e5384966972a7dc3985533b94",
+                    "hash" : "0x109a4092736ba92807a8a26ef51660765630610e5384966972a7dc3985533b94",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "109a4092736ba92807a8a26ef51660765630610e5384966972a7dc3985533b94",
+                    "hash" : "0x109a4092736ba92807a8a26ef51660765630610e5384966972a7dc3985533b94",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "109a4092736ba92807a8a26ef51660765630610e5384966972a7dc3985533b94",
+                    "hash" : "0x109a4092736ba92807a8a26ef51660765630610e5384966972a7dc3985533b94",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "109a4092736ba92807a8a26ef51660765630610e5384966972a7dc3985533b94",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6fa2825b6c338f8d717156560af045136b60005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "538407333"
+                "0x201771a5"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest123.json b/GeneralStateTests/stRandom/randomStatetest123.json
index a1bb6507b..1a9d052c0 100644
--- a/GeneralStateTests/stRandom/randomStatetest123.json
+++ b/GeneralStateTests/stRandom/randomStatetest123.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest123" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "8e74561ec1de2e9759c57140194080c9bbb85e01dba0746585ebfc7ce2be027c",
+                    "hash" : "0x8e74561ec1de2e9759c57140194080c9bbb85e01dba0746585ebfc7ce2be027c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "8e74561ec1de2e9759c57140194080c9bbb85e01dba0746585ebfc7ce2be027c",
+                    "hash" : "0x8e74561ec1de2e9759c57140194080c9bbb85e01dba0746585ebfc7ce2be027c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "8e74561ec1de2e9759c57140194080c9bbb85e01dba0746585ebfc7ce2be027c",
+                    "hash" : "0x8e74561ec1de2e9759c57140194080c9bbb85e01dba0746585ebfc7ce2be027c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "8e74561ec1de2e9759c57140194080c9bbb85e01dba0746585ebfc7ce2be027c",
+                    "hash" : "0x8e74561ec1de2e9759c57140194080c9bbb85e01dba0746585ebfc7ce2be027c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "8e74561ec1de2e9759c57140194080c9bbb85e01dba0746585ebfc7ce2be027c",
+                    "hash" : "0x8e74561ec1de2e9759c57140194080c9bbb85e01dba0746585ebfc7ce2be027c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "7363d4d46695459db58a5980a05216d2688f008024035cbc15cf94d7a9436b38",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x41444541084455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest124.json b/GeneralStateTests/stRandom/randomStatetest124.json
index d6a8f5ef2..04ed915fb 100644
--- a/GeneralStateTests/stRandom/randomStatetest124.json
+++ b/GeneralStateTests/stRandom/randomStatetest124.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest124" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "2aaf8251e93daaa5759026ba6e4721a61cbe87bb75a66bb33c806157f0f9740d",
+                    "hash" : "0x2aaf8251e93daaa5759026ba6e4721a61cbe87bb75a66bb33c806157f0f9740d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "2aaf8251e93daaa5759026ba6e4721a61cbe87bb75a66bb33c806157f0f9740d",
+                    "hash" : "0x2aaf8251e93daaa5759026ba6e4721a61cbe87bb75a66bb33c806157f0f9740d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2aaf8251e93daaa5759026ba6e4721a61cbe87bb75a66bb33c806157f0f9740d",
+                    "hash" : "0x2aaf8251e93daaa5759026ba6e4721a61cbe87bb75a66bb33c806157f0f9740d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "2aaf8251e93daaa5759026ba6e4721a61cbe87bb75a66bb33c806157f0f9740d",
+                    "hash" : "0x2aaf8251e93daaa5759026ba6e4721a61cbe87bb75a66bb33c806157f0f9740d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "2aaf8251e93daaa5759026ba6e4721a61cbe87bb75a66bb33c806157f0f9740d",
+                    "hash" : "0x2aaf8251e93daaa5759026ba6e4721a61cbe87bb75a66bb33c806157f0f9740d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "2aaf8251e93daaa5759026ba6e4721a61cbe87bb75a66bb33c806157f0f9740d",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08125580355b17457f7463587b9a7a435560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1751381635"
+                "0x6863f683"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest125.json b/GeneralStateTests/stRandom/randomStatetest125.json
index 94c39c9ce..adb5541a6 100644
--- a/GeneralStateTests/stRandom/randomStatetest125.json
+++ b/GeneralStateTests/stRandom/randomStatetest125.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest125" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e1881131f80068947922f01c78464f93c46e6e11314d0deceb55809e594aec0a",
+                    "hash" : "0xe1881131f80068947922f01c78464f93c46e6e11314d0deceb55809e594aec0a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e1881131f80068947922f01c78464f93c46e6e11314d0deceb55809e594aec0a",
+                    "hash" : "0xe1881131f80068947922f01c78464f93c46e6e11314d0deceb55809e594aec0a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e1881131f80068947922f01c78464f93c46e6e11314d0deceb55809e594aec0a",
+                    "hash" : "0xe1881131f80068947922f01c78464f93c46e6e11314d0deceb55809e594aec0a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e1881131f80068947922f01c78464f93c46e6e11314d0deceb55809e594aec0a",
+                    "hash" : "0xe1881131f80068947922f01c78464f93c46e6e11314d0deceb55809e594aec0a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e1881131f80068947922f01c78464f93c46e6e11314d0deceb55809e594aec0a",
+                    "hash" : "0xe1881131f80068947922f01c78464f93c46e6e11314d0deceb55809e594aec0a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "e1881131f80068947922f01c78464f93c46e6e11314d0deceb55809e594aec0a",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f0000000000000000000000000000000000000000000000000000000000000001207f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe406f",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "781711523"
+                "0x2e97f8a3"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest126.json b/GeneralStateTests/stRandom/randomStatetest126.json
index cc5aff2c9..535fde69e 100644
--- a/GeneralStateTests/stRandom/randomStatetest126.json
+++ b/GeneralStateTests/stRandom/randomStatetest126.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest126" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7397124f53f97e2feb584a04b7216775fcfe101d1460853b392ae38c671b4793",
+                    "hash" : "0x7397124f53f97e2feb584a04b7216775fcfe101d1460853b392ae38c671b4793",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7397124f53f97e2feb584a04b7216775fcfe101d1460853b392ae38c671b4793",
+                    "hash" : "0x7397124f53f97e2feb584a04b7216775fcfe101d1460853b392ae38c671b4793",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "7397124f53f97e2feb584a04b7216775fcfe101d1460853b392ae38c671b4793",
+                    "hash" : "0x7397124f53f97e2feb584a04b7216775fcfe101d1460853b392ae38c671b4793",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "7397124f53f97e2feb584a04b7216775fcfe101d1460853b392ae38c671b4793",
+                    "hash" : "0x7397124f53f97e2feb584a04b7216775fcfe101d1460853b392ae38c671b4793",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7397124f53f97e2feb584a04b7216775fcfe101d1460853b392ae38c671b4793",
+                    "hash" : "0x7397124f53f97e2feb584a04b7216775fcfe101d1460853b392ae38c671b4793",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "7397124f53f97e2feb584a04b7216775fcfe101d1460853b392ae38c671b4793",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x4142",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest127.json b/GeneralStateTests/stRandom/randomStatetest127.json
index b141b6945..cf4a63111 100644
--- a/GeneralStateTests/stRandom/randomStatetest127.json
+++ b/GeneralStateTests/stRandom/randomStatetest127.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest127" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "57ed8a560ef4794a1b1c45c66176da7578f2b36da707c4509e58e05e4959a3b4",
+                    "hash" : "0x57ed8a560ef4794a1b1c45c66176da7578f2b36da707c4509e58e05e4959a3b4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "57ed8a560ef4794a1b1c45c66176da7578f2b36da707c4509e58e05e4959a3b4",
+                    "hash" : "0x57ed8a560ef4794a1b1c45c66176da7578f2b36da707c4509e58e05e4959a3b4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "57ed8a560ef4794a1b1c45c66176da7578f2b36da707c4509e58e05e4959a3b4",
+                    "hash" : "0x57ed8a560ef4794a1b1c45c66176da7578f2b36da707c4509e58e05e4959a3b4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "57ed8a560ef4794a1b1c45c66176da7578f2b36da707c4509e58e05e4959a3b4",
+                    "hash" : "0x57ed8a560ef4794a1b1c45c66176da7578f2b36da707c4509e58e05e4959a3b4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "57ed8a560ef4794a1b1c45c66176da7578f2b36da707c4509e58e05e4959a3b4",
+                    "hash" : "0x57ed8a560ef4794a1b1c45c66176da7578f2b36da707c4509e58e05e4959a3b4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "088dada15ddaf80bb3aade100de70bbe8b10e0bdc7c65e79693a406385fc2619",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x4241424540444145084555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest128.json b/GeneralStateTests/stRandom/randomStatetest128.json
index 664b91be5..3e5f0717e 100644
--- a/GeneralStateTests/stRandom/randomStatetest128.json
+++ b/GeneralStateTests/stRandom/randomStatetest128.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest128" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "2820ee1d073e9a2faa25df9121608e23f0ee2c4c4fe8ebe56994e21e00ea6318",
+                    "hash" : "0x2820ee1d073e9a2faa25df9121608e23f0ee2c4c4fe8ebe56994e21e00ea6318",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "2820ee1d073e9a2faa25df9121608e23f0ee2c4c4fe8ebe56994e21e00ea6318",
+                    "hash" : "0x2820ee1d073e9a2faa25df9121608e23f0ee2c4c4fe8ebe56994e21e00ea6318",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2820ee1d073e9a2faa25df9121608e23f0ee2c4c4fe8ebe56994e21e00ea6318",
+                    "hash" : "0x2820ee1d073e9a2faa25df9121608e23f0ee2c4c4fe8ebe56994e21e00ea6318",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "2820ee1d073e9a2faa25df9121608e23f0ee2c4c4fe8ebe56994e21e00ea6318",
+                    "hash" : "0x2820ee1d073e9a2faa25df9121608e23f0ee2c4c4fe8ebe56994e21e00ea6318",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "2820ee1d073e9a2faa25df9121608e23f0ee2c4c4fe8ebe56994e21e00ea6318",
+                    "hash" : "0x2820ee1d073e9a2faa25df9121608e23f0ee2c4c4fe8ebe56994e21e00ea6318",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "2820ee1d073e9a2faa25df9121608e23f0ee2c4c4fe8ebe56994e21e00ea6318",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b540527f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000006f786ef19163848934f380343807968c6160005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "877917874"
+                "0x3453f6b2"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest129.json b/GeneralStateTests/stRandom/randomStatetest129.json
index 1c8cc5407..525dddb23 100644
--- a/GeneralStateTests/stRandom/randomStatetest129.json
+++ b/GeneralStateTests/stRandom/randomStatetest129.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest129" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6ec43313620a502abde8528b2b660f8c45ef5f3dbb4d7839ec6c1f45ec3c87ee",
+                    "hash" : "0x6ec43313620a502abde8528b2b660f8c45ef5f3dbb4d7839ec6c1f45ec3c87ee",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6ec43313620a502abde8528b2b660f8c45ef5f3dbb4d7839ec6c1f45ec3c87ee",
+                    "hash" : "0x6ec43313620a502abde8528b2b660f8c45ef5f3dbb4d7839ec6c1f45ec3c87ee",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6ec43313620a502abde8528b2b660f8c45ef5f3dbb4d7839ec6c1f45ec3c87ee",
+                    "hash" : "0x6ec43313620a502abde8528b2b660f8c45ef5f3dbb4d7839ec6c1f45ec3c87ee",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6ec43313620a502abde8528b2b660f8c45ef5f3dbb4d7839ec6c1f45ec3c87ee",
+                    "hash" : "0x6ec43313620a502abde8528b2b660f8c45ef5f3dbb4d7839ec6c1f45ec3c87ee",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6ec43313620a502abde8528b2b660f8c45ef5f3dbb4d7839ec6c1f45ec3c87ee",
+                    "hash" : "0x6ec43313620a502abde8528b2b660f8c45ef5f3dbb4d7839ec6c1f45ec3c87ee",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "6ec43313620a502abde8528b2b660f8c45ef5f3dbb4d7839ec6c1f45ec3c87ee",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f166e733343093a31a33b8e025a02705560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1110233548"
+                "0x422cd1cc"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest13.json b/GeneralStateTests/stRandom/randomStatetest13.json
index 5e484eb83..fd70f7747 100644
--- a/GeneralStateTests/stRandom/randomStatetest13.json
+++ b/GeneralStateTests/stRandom/randomStatetest13.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest13" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "224160a19d11a6252067a26ecfc2963fd1aff5c2b484a2f12c12ec7d5bbc547d",
+                    "hash" : "0x224160a19d11a6252067a26ecfc2963fd1aff5c2b484a2f12c12ec7d5bbc547d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "224160a19d11a6252067a26ecfc2963fd1aff5c2b484a2f12c12ec7d5bbc547d",
+                    "hash" : "0x224160a19d11a6252067a26ecfc2963fd1aff5c2b484a2f12c12ec7d5bbc547d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "224160a19d11a6252067a26ecfc2963fd1aff5c2b484a2f12c12ec7d5bbc547d",
+                    "hash" : "0x224160a19d11a6252067a26ecfc2963fd1aff5c2b484a2f12c12ec7d5bbc547d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "224160a19d11a6252067a26ecfc2963fd1aff5c2b484a2f12c12ec7d5bbc547d",
+                    "hash" : "0x224160a19d11a6252067a26ecfc2963fd1aff5c2b484a2f12c12ec7d5bbc547d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "224160a19d11a6252067a26ecfc2963fd1aff5c2b484a2f12c12ec7d5bbc547d",
+                    "hash" : "0x224160a19d11a6252067a26ecfc2963fd1aff5c2b484a2f12c12ec7d5bbc547d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "224160a19d11a6252067a26ecfc2963fd1aff5c2b484a2f12c12ec7d5bbc547d",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000027ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe307f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000005255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "936808044"
+                "0x37d68e6c"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest130.json b/GeneralStateTests/stRandom/randomStatetest130.json
index 139922566..77ab99339 100644
--- a/GeneralStateTests/stRandom/randomStatetest130.json
+++ b/GeneralStateTests/stRandom/randomStatetest130.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest130" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9386e629909f1e3f60c0697bc0940935b0e770f2f13db8ed40cfd4031db63f74",
+                    "hash" : "0x9386e629909f1e3f60c0697bc0940935b0e770f2f13db8ed40cfd4031db63f74",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9386e629909f1e3f60c0697bc0940935b0e770f2f13db8ed40cfd4031db63f74",
+                    "hash" : "0x9386e629909f1e3f60c0697bc0940935b0e770f2f13db8ed40cfd4031db63f74",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9386e629909f1e3f60c0697bc0940935b0e770f2f13db8ed40cfd4031db63f74",
+                    "hash" : "0x9386e629909f1e3f60c0697bc0940935b0e770f2f13db8ed40cfd4031db63f74",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9386e629909f1e3f60c0697bc0940935b0e770f2f13db8ed40cfd4031db63f74",
+                    "hash" : "0x9386e629909f1e3f60c0697bc0940935b0e770f2f13db8ed40cfd4031db63f74",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9386e629909f1e3f60c0697bc0940935b0e770f2f13db8ed40cfd4031db63f74",
+                    "hash" : "0x9386e629909f1e3f60c0697bc0940935b0e770f2f13db8ed40cfd4031db63f74",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "9386e629909f1e3f60c0697bc0940935b0e770f2f13db8ed40cfd4031db63f74",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000016f368a668b76306d181a3936119883175560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1912800960"
+                "0x720306c0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest131.json b/GeneralStateTests/stRandom/randomStatetest131.json
index a28299d20..b7e993971 100644
--- a/GeneralStateTests/stRandom/randomStatetest131.json
+++ b/GeneralStateTests/stRandom/randomStatetest131.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest131" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a4d42afdd9445251ba8569c7ae3ffd34e4d5b79316085a4da5739cb050e064a0",
+                    "hash" : "0xa4d42afdd9445251ba8569c7ae3ffd34e4d5b79316085a4da5739cb050e064a0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a4d42afdd9445251ba8569c7ae3ffd34e4d5b79316085a4da5739cb050e064a0",
+                    "hash" : "0xa4d42afdd9445251ba8569c7ae3ffd34e4d5b79316085a4da5739cb050e064a0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a4d42afdd9445251ba8569c7ae3ffd34e4d5b79316085a4da5739cb050e064a0",
+                    "hash" : "0xa4d42afdd9445251ba8569c7ae3ffd34e4d5b79316085a4da5739cb050e064a0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a4d42afdd9445251ba8569c7ae3ffd34e4d5b79316085a4da5739cb050e064a0",
+                    "hash" : "0xa4d42afdd9445251ba8569c7ae3ffd34e4d5b79316085a4da5739cb050e064a0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a4d42afdd9445251ba8569c7ae3ffd34e4d5b79316085a4da5739cb050e064a0",
+                    "hash" : "0xa4d42afdd9445251ba8569c7ae3ffd34e4d5b79316085a4da5739cb050e064a0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "a4d42afdd9445251ba8569c7ae3ffd34e4d5b79316085a4da5739cb050e064a0",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000001000000000000000000000000000000000000000014416f36ff85758270710168547a977788609660005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "474455952"
+                "0x1c479f90"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest132.json b/GeneralStateTests/stRandom/randomStatetest132.json
index db00d7ad7..bb315a8b4 100644
--- a/GeneralStateTests/stRandom/randomStatetest132.json
+++ b/GeneralStateTests/stRandom/randomStatetest132.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest132" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6dfa0128d84f49f7d56847c54a025249ec1ee398116d88b293844dc3269f2807",
+                    "hash" : "0x6dfa0128d84f49f7d56847c54a025249ec1ee398116d88b293844dc3269f2807",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6dfa0128d84f49f7d56847c54a025249ec1ee398116d88b293844dc3269f2807",
+                    "hash" : "0x6dfa0128d84f49f7d56847c54a025249ec1ee398116d88b293844dc3269f2807",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6dfa0128d84f49f7d56847c54a025249ec1ee398116d88b293844dc3269f2807",
+                    "hash" : "0x6dfa0128d84f49f7d56847c54a025249ec1ee398116d88b293844dc3269f2807",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6dfa0128d84f49f7d56847c54a025249ec1ee398116d88b293844dc3269f2807",
+                    "hash" : "0x6dfa0128d84f49f7d56847c54a025249ec1ee398116d88b293844dc3269f2807",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6dfa0128d84f49f7d56847c54a025249ec1ee398116d88b293844dc3269f2807",
+                    "hash" : "0x6dfa0128d84f49f7d56847c54a025249ec1ee398116d88b293844dc3269f2807",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "6dfa0128d84f49f7d56847c54a025249ec1ee398116d88b293844dc3269f2807",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5407f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09516b369855",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1234618828"
+                "0x4996c9cc"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest133.json b/GeneralStateTests/stRandom/randomStatetest133.json
index 2a6f33aaa..953dfca77 100644
--- a/GeneralStateTests/stRandom/randomStatetest133.json
+++ b/GeneralStateTests/stRandom/randomStatetest133.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest133" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "af91f9bd7acf0fb856104c09018d84bca503d17a152c5a8bee2be74639cf2a8c",
+                    "hash" : "0xaf91f9bd7acf0fb856104c09018d84bca503d17a152c5a8bee2be74639cf2a8c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "af91f9bd7acf0fb856104c09018d84bca503d17a152c5a8bee2be74639cf2a8c",
+                    "hash" : "0xaf91f9bd7acf0fb856104c09018d84bca503d17a152c5a8bee2be74639cf2a8c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "af91f9bd7acf0fb856104c09018d84bca503d17a152c5a8bee2be74639cf2a8c",
+                    "hash" : "0xaf91f9bd7acf0fb856104c09018d84bca503d17a152c5a8bee2be74639cf2a8c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "af91f9bd7acf0fb856104c09018d84bca503d17a152c5a8bee2be74639cf2a8c",
+                    "hash" : "0xaf91f9bd7acf0fb856104c09018d84bca503d17a152c5a8bee2be74639cf2a8c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "af91f9bd7acf0fb856104c09018d84bca503d17a152c5a8bee2be74639cf2a8c",
+                    "hash" : "0xaf91f9bd7acf0fb856104c09018d84bca503d17a152c5a8bee2be74639cf2a8c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "af91f9bd7acf0fb856104c09018d84bca503d17a152c5a8bee2be74639cf2a8c",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001357f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000000035830b503516a46d0b03",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1524251084"
+                "0x5ada39cc"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest134.json b/GeneralStateTests/stRandom/randomStatetest134.json
index 7cf82f8e8..fdc7385ba 100644
--- a/GeneralStateTests/stRandom/randomStatetest134.json
+++ b/GeneralStateTests/stRandom/randomStatetest134.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest134" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f9df7b55786a1a71b57305516ddfea66ebbc4ad7d015f5e23ab4a00524273e1b",
+                    "hash" : "0xf9df7b55786a1a71b57305516ddfea66ebbc4ad7d015f5e23ab4a00524273e1b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f9df7b55786a1a71b57305516ddfea66ebbc4ad7d015f5e23ab4a00524273e1b",
+                    "hash" : "0xf9df7b55786a1a71b57305516ddfea66ebbc4ad7d015f5e23ab4a00524273e1b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f9df7b55786a1a71b57305516ddfea66ebbc4ad7d015f5e23ab4a00524273e1b",
+                    "hash" : "0xf9df7b55786a1a71b57305516ddfea66ebbc4ad7d015f5e23ab4a00524273e1b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f9df7b55786a1a71b57305516ddfea66ebbc4ad7d015f5e23ab4a00524273e1b",
+                    "hash" : "0xf9df7b55786a1a71b57305516ddfea66ebbc4ad7d015f5e23ab4a00524273e1b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f9df7b55786a1a71b57305516ddfea66ebbc4ad7d015f5e23ab4a00524273e1b",
+                    "hash" : "0xf9df7b55786a1a71b57305516ddfea66ebbc4ad7d015f5e23ab4a00524273e1b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "f9df7b55786a1a71b57305516ddfea66ebbc4ad7d015f5e23ab4a00524273e1b",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x417f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff557f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff55836b636c9c395a0732014533405560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "65268053"
+                "0x03e3e955"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest135.json b/GeneralStateTests/stRandom/randomStatetest135.json
index a96988f59..352a51c79 100644
--- a/GeneralStateTests/stRandom/randomStatetest135.json
+++ b/GeneralStateTests/stRandom/randomStatetest135.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest135" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "fdfe1d801240a43ff8708f16b426826801ecb0a34ee05d3b6b93937cf359b2b4",
+                    "hash" : "0xfdfe1d801240a43ff8708f16b426826801ecb0a34ee05d3b6b93937cf359b2b4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "fdfe1d801240a43ff8708f16b426826801ecb0a34ee05d3b6b93937cf359b2b4",
+                    "hash" : "0xfdfe1d801240a43ff8708f16b426826801ecb0a34ee05d3b6b93937cf359b2b4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "fdfe1d801240a43ff8708f16b426826801ecb0a34ee05d3b6b93937cf359b2b4",
+                    "hash" : "0xfdfe1d801240a43ff8708f16b426826801ecb0a34ee05d3b6b93937cf359b2b4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "fdfe1d801240a43ff8708f16b426826801ecb0a34ee05d3b6b93937cf359b2b4",
+                    "hash" : "0xfdfe1d801240a43ff8708f16b426826801ecb0a34ee05d3b6b93937cf359b2b4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "fdfe1d801240a43ff8708f16b426826801ecb0a34ee05d3b6b93937cf359b2b4",
+                    "hash" : "0xfdfe1d801240a43ff8708f16b426826801ecb0a34ee05d3b6b93937cf359b2b4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "fdfe1d801240a43ff8708f16b426826801ecb0a34ee05d3b6b93937cf359b2b4",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000010000000000000000000000000000000000000000417f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0075a0b64319218663016870455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1650167023"
+                "0x625b8cef"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest136.json b/GeneralStateTests/stRandom/randomStatetest136.json
index 8714c96b6..581f43fc3 100644
--- a/GeneralStateTests/stRandom/randomStatetest136.json
+++ b/GeneralStateTests/stRandom/randomStatetest136.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest136" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
             {
@@ -23,7 +23,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6238a718c4abed3110effdeb85da950366d8eea029b6cf386fb03a9d232cbc6d",
+                    "hash" : "0x6238a718c4abed3110effdeb85da950366d8eea029b6cf386fb03a9d232cbc6d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -33,7 +33,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6238a718c4abed3110effdeb85da950366d8eea029b6cf386fb03a9d232cbc6d",
+                    "hash" : "0x6238a718c4abed3110effdeb85da950366d8eea029b6cf386fb03a9d232cbc6d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -43,7 +43,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6238a718c4abed3110effdeb85da950366d8eea029b6cf386fb03a9d232cbc6d",
+                    "hash" : "0x6238a718c4abed3110effdeb85da950366d8eea029b6cf386fb03a9d232cbc6d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -53,7 +53,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6238a718c4abed3110effdeb85da950366d8eea029b6cf386fb03a9d232cbc6d",
+                    "hash" : "0x6238a718c4abed3110effdeb85da950366d8eea029b6cf386fb03a9d232cbc6d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -63,7 +63,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6238a718c4abed3110effdeb85da950366d8eea029b6cf386fb03a9d232cbc6d",
+                    "hash" : "0x6238a718c4abed3110effdeb85da950366d8eea029b6cf386fb03a9d232cbc6d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -74,23 +74,23 @@
         },
         "postStateRoot" : "07dae57ec1fc6c5bda381ac8f38ddf754fa1c27c0594e2ad04c1ff8f472e444d",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe45437f0000000000000000000000000000000000000000000000000000000000000001a26f5a6e9570705019164232776c738c8d8760005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -105,10 +105,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "890399965"
+                "0x35126cdd"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest137.json b/GeneralStateTests/stRandom/randomStatetest137.json
index e7b2dd903..364bb0346 100644
--- a/GeneralStateTests/stRandom/randomStatetest137.json
+++ b/GeneralStateTests/stRandom/randomStatetest137.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest137" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d7050c99c8117be3bcfbcad84e3b43f9ea15afa5ce5b6202bf9a6a6d17dbaf01",
+                    "hash" : "0xd7050c99c8117be3bcfbcad84e3b43f9ea15afa5ce5b6202bf9a6a6d17dbaf01",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d7050c99c8117be3bcfbcad84e3b43f9ea15afa5ce5b6202bf9a6a6d17dbaf01",
+                    "hash" : "0xd7050c99c8117be3bcfbcad84e3b43f9ea15afa5ce5b6202bf9a6a6d17dbaf01",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "d7050c99c8117be3bcfbcad84e3b43f9ea15afa5ce5b6202bf9a6a6d17dbaf01",
+                    "hash" : "0xd7050c99c8117be3bcfbcad84e3b43f9ea15afa5ce5b6202bf9a6a6d17dbaf01",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "d7050c99c8117be3bcfbcad84e3b43f9ea15afa5ce5b6202bf9a6a6d17dbaf01",
+                    "hash" : "0xd7050c99c8117be3bcfbcad84e3b43f9ea15afa5ce5b6202bf9a6a6d17dbaf01",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d7050c99c8117be3bcfbcad84e3b43f9ea15afa5ce5b6202bf9a6a6d17dbaf01",
+                    "hash" : "0xd7050c99c8117be3bcfbcad84e3b43f9ea15afa5ce5b6202bf9a6a6d17dbaf01",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "d7050c99c8117be3bcfbcad84e3b43f9ea15afa5ce5b6202bf9a6a6d17dbaf01",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000087f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5a130e86ca17390989355f092a25560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "866944487"
+                "0x33ac85e7"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest138.json b/GeneralStateTests/stRandom/randomStatetest138.json
index 52c893648..e84315901 100644
--- a/GeneralStateTests/stRandom/randomStatetest138.json
+++ b/GeneralStateTests/stRandom/randomStatetest138.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest138" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "ba802980b51f6b1a6ce22048c065fa9d0c9c76de7d31cc359b2f87c98fb5ad9a",
+                    "hash" : "0xba802980b51f6b1a6ce22048c065fa9d0c9c76de7d31cc359b2f87c98fb5ad9a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "ba802980b51f6b1a6ce22048c065fa9d0c9c76de7d31cc359b2f87c98fb5ad9a",
+                    "hash" : "0xba802980b51f6b1a6ce22048c065fa9d0c9c76de7d31cc359b2f87c98fb5ad9a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "ebce247845422a619a96f712b4087dd7e6fc14447f8844769c3dc16a64e128b9",
+                    "hash" : "0xebce247845422a619a96f712b4087dd7e6fc14447f8844769c3dc16a64e128b9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ebce247845422a619a96f712b4087dd7e6fc14447f8844769c3dc16a64e128b9",
+                    "hash" : "0xebce247845422a619a96f712b4087dd7e6fc14447f8844769c3dc16a64e128b9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "ba802980b51f6b1a6ce22048c065fa9d0c9c76de7d31cc359b2f87c98fb5ad9a",
+                    "hash" : "0xba802980b51f6b1a6ce22048c065fa9d0c9c76de7d31cc359b2f87c98fb5ad9a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "2f133d841f22cff6b08e3419a00fbce0866b33432111328d3b6bbd783c3d9502",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350447f0000000000000000000000000000000000000000000000000000000000000001f1595160005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1998228906"
+                "0x771a8daa"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest139.json b/GeneralStateTests/stRandom/randomStatetest139.json
index 025c85c4b..f16536ed4 100644
--- a/GeneralStateTests/stRandom/randomStatetest139.json
+++ b/GeneralStateTests/stRandom/randomStatetest139.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest139" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "ad4d0d965899b7919d89a9bea0d705e66caf30fdad951954132e533ee616574e",
+                    "hash" : "0xad4d0d965899b7919d89a9bea0d705e66caf30fdad951954132e533ee616574e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "ad4d0d965899b7919d89a9bea0d705e66caf30fdad951954132e533ee616574e",
+                    "hash" : "0xad4d0d965899b7919d89a9bea0d705e66caf30fdad951954132e533ee616574e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "ad4d0d965899b7919d89a9bea0d705e66caf30fdad951954132e533ee616574e",
+                    "hash" : "0xad4d0d965899b7919d89a9bea0d705e66caf30fdad951954132e533ee616574e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ad4d0d965899b7919d89a9bea0d705e66caf30fdad951954132e533ee616574e",
+                    "hash" : "0xad4d0d965899b7919d89a9bea0d705e66caf30fdad951954132e533ee616574e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "ad4d0d965899b7919d89a9bea0d705e66caf30fdad951954132e533ee616574e",
+                    "hash" : "0xad4d0d965899b7919d89a9bea0d705e66caf30fdad951954132e533ee616574e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "3e8b2d40bcb72a4f7e20754b41def5098d6925492201aab4f911573db4d80635",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x33447f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff434461334515455560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,8 +96,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x409ceff3"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest14.json b/GeneralStateTests/stRandom/randomStatetest14.json
index 7d63b1876..d1fd47c8d 100644
--- a/GeneralStateTests/stRandom/randomStatetest14.json
+++ b/GeneralStateTests/stRandom/randomStatetest14.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest14" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9467383579c3e255b75479397b2e2d2d0b84ed88ee619b1dee0ec233d0133e36",
+                    "hash" : "0x9467383579c3e255b75479397b2e2d2d0b84ed88ee619b1dee0ec233d0133e36",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9467383579c3e255b75479397b2e2d2d0b84ed88ee619b1dee0ec233d0133e36",
+                    "hash" : "0x9467383579c3e255b75479397b2e2d2d0b84ed88ee619b1dee0ec233d0133e36",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "09299b57ad249c83444f382e4a185543b9df064510d430447284c0c9ffe51933",
+                    "hash" : "0x09299b57ad249c83444f382e4a185543b9df064510d430447284c0c9ffe51933",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "09299b57ad249c83444f382e4a185543b9df064510d430447284c0c9ffe51933",
+                    "hash" : "0x09299b57ad249c83444f382e4a185543b9df064510d430447284c0c9ffe51933",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9467383579c3e255b75479397b2e2d2d0b84ed88ee619b1dee0ec233d0133e36",
+                    "hash" : "0x9467383579c3e255b75479397b2e2d2d0b84ed88ee619b1dee0ec233d0133e36",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "09299b57ad249c83444f382e4a185543b9df064510d430447284c0c9ffe51933",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff20547f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffeff61853634f06b907f899d7455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "308810775"
+                "0x12681417"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest140.json b/GeneralStateTests/stRandom/randomStatetest140.json
index caa8a262c..a95b86e74 100644
--- a/GeneralStateTests/stRandom/randomStatetest140.json
+++ b/GeneralStateTests/stRandom/randomStatetest140.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest140" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d680f860bc04f1ccb1a8cf8928d9bf4046f560d79a0a2387dadf5a34487aa947",
+                    "hash" : "0xd680f860bc04f1ccb1a8cf8928d9bf4046f560d79a0a2387dadf5a34487aa947",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d680f860bc04f1ccb1a8cf8928d9bf4046f560d79a0a2387dadf5a34487aa947",
+                    "hash" : "0xd680f860bc04f1ccb1a8cf8928d9bf4046f560d79a0a2387dadf5a34487aa947",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "d680f860bc04f1ccb1a8cf8928d9bf4046f560d79a0a2387dadf5a34487aa947",
+                    "hash" : "0xd680f860bc04f1ccb1a8cf8928d9bf4046f560d79a0a2387dadf5a34487aa947",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "d680f860bc04f1ccb1a8cf8928d9bf4046f560d79a0a2387dadf5a34487aa947",
+                    "hash" : "0xd680f860bc04f1ccb1a8cf8928d9bf4046f560d79a0a2387dadf5a34487aa947",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d680f860bc04f1ccb1a8cf8928d9bf4046f560d79a0a2387dadf5a34487aa947",
+                    "hash" : "0xd680f860bc04f1ccb1a8cf8928d9bf4046f560d79a0a2387dadf5a34487aa947",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "d680f860bc04f1ccb1a8cf8928d9bf4046f560d79a0a2387dadf5a34487aa947",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe447f0000000000000000000000000000000000000000000000000000000000000001407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f2d6f4162696d5767078708977c37545560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1574880944"
+                "0x5ddec6b0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest141.json b/GeneralStateTests/stRandom/randomStatetest141.json
index dfb6396ac..54a526a6b 100644
--- a/GeneralStateTests/stRandom/randomStatetest141.json
+++ b/GeneralStateTests/stRandom/randomStatetest141.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest141" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "8059abf68d184cb2191fe885c5933ebf61dde3e8521ffe3c1e4addbe04105a9a",
+                    "hash" : "0x8059abf68d184cb2191fe885c5933ebf61dde3e8521ffe3c1e4addbe04105a9a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "8059abf68d184cb2191fe885c5933ebf61dde3e8521ffe3c1e4addbe04105a9a",
+                    "hash" : "0x8059abf68d184cb2191fe885c5933ebf61dde3e8521ffe3c1e4addbe04105a9a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "8059abf68d184cb2191fe885c5933ebf61dde3e8521ffe3c1e4addbe04105a9a",
+                    "hash" : "0x8059abf68d184cb2191fe885c5933ebf61dde3e8521ffe3c1e4addbe04105a9a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "8059abf68d184cb2191fe885c5933ebf61dde3e8521ffe3c1e4addbe04105a9a",
+                    "hash" : "0x8059abf68d184cb2191fe885c5933ebf61dde3e8521ffe3c1e4addbe04105a9a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "8059abf68d184cb2191fe885c5933ebf61dde3e8521ffe3c1e4addbe04105a9a",
+                    "hash" : "0x8059abf68d184cb2191fe885c5933ebf61dde3e8521ffe3c1e4addbe04105a9a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "3286cec1eb6d2413d2554b3c3ccf31fc314fe0f8ec18e827203c413dc7cd624c",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x4544424140204555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest142.json b/GeneralStateTests/stRandom/randomStatetest142.json
index 449191327..b18a3c81c 100644
--- a/GeneralStateTests/stRandom/randomStatetest142.json
+++ b/GeneralStateTests/stRandom/randomStatetest142.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest142" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "fc2728bac73c9c75f74cb85424dc1c8134b0a89ea7e07cd66391b2f28bd4d566",
+                    "hash" : "0xfc2728bac73c9c75f74cb85424dc1c8134b0a89ea7e07cd66391b2f28bd4d566",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "fc2728bac73c9c75f74cb85424dc1c8134b0a89ea7e07cd66391b2f28bd4d566",
+                    "hash" : "0xfc2728bac73c9c75f74cb85424dc1c8134b0a89ea7e07cd66391b2f28bd4d566",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "fc2728bac73c9c75f74cb85424dc1c8134b0a89ea7e07cd66391b2f28bd4d566",
+                    "hash" : "0xfc2728bac73c9c75f74cb85424dc1c8134b0a89ea7e07cd66391b2f28bd4d566",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "fc2728bac73c9c75f74cb85424dc1c8134b0a89ea7e07cd66391b2f28bd4d566",
+                    "hash" : "0xfc2728bac73c9c75f74cb85424dc1c8134b0a89ea7e07cd66391b2f28bd4d566",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "fc2728bac73c9c75f74cb85424dc1c8134b0a89ea7e07cd66391b2f28bd4d566",
+                    "hash" : "0xfc2728bac73c9c75f74cb85424dc1c8134b0a89ea7e07cd66391b2f28bd4d566",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "fc2728bac73c9c75f74cb85424dc1c8134b0a89ea7e07cd66391b2f28bd4d566",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff959137630364087e1a640431107c880160005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1842485664"
+                "0x6dd219a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest143.json b/GeneralStateTests/stRandom/randomStatetest143.json
index 7d504e5d0..63091b171 100644
--- a/GeneralStateTests/stRandom/randomStatetest143.json
+++ b/GeneralStateTests/stRandom/randomStatetest143.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest143" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "59263b379a71605bead6356bfdfea192615c16280d3b60d3a18d2593b5d9ee10",
+                    "hash" : "0x59263b379a71605bead6356bfdfea192615c16280d3b60d3a18d2593b5d9ee10",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "59263b379a71605bead6356bfdfea192615c16280d3b60d3a18d2593b5d9ee10",
+                    "hash" : "0x59263b379a71605bead6356bfdfea192615c16280d3b60d3a18d2593b5d9ee10",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "59263b379a71605bead6356bfdfea192615c16280d3b60d3a18d2593b5d9ee10",
+                    "hash" : "0x59263b379a71605bead6356bfdfea192615c16280d3b60d3a18d2593b5d9ee10",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "59263b379a71605bead6356bfdfea192615c16280d3b60d3a18d2593b5d9ee10",
+                    "hash" : "0x59263b379a71605bead6356bfdfea192615c16280d3b60d3a18d2593b5d9ee10",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "59263b379a71605bead6356bfdfea192615c16280d3b60d3a18d2593b5d9ee10",
+                    "hash" : "0x59263b379a71605bead6356bfdfea192615c16280d3b60d3a18d2593b5d9ee10",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "0fbb14a00e6b0a659d75598cbd1dbcfa6cfb9abaf3c9584f49f438baa9d1b684",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x414341414243421a2055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest144.json b/GeneralStateTests/stRandom/randomStatetest144.json
index e79011265..70846c1a6 100644
--- a/GeneralStateTests/stRandom/randomStatetest144.json
+++ b/GeneralStateTests/stRandom/randomStatetest144.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest144" : {
         "env" : {
-            "currentCoinbase" : "b0085a57673c8f7d78fb870418f622e42fd686e4",
+            "currentCoinbase" : "0xb0085a57673c8f7d78fb870418f622e42fd686e4",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x5c1948c7",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "b93e460c74488b6f2f57690e5fa535c88ad8db30408cad2d66e104795e8ac02e"
+            "previousHash" : "0xb93e460c74488b6f2f57690e5fa535c88ad8db30408cad2d66e104795e8ac02e"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f62ef5d0c1e98204d9e8fb34174186d9491411d3641588097e9eb037429d4efb",
+                    "hash" : "0xf62ef5d0c1e98204d9e8fb34174186d9491411d3641588097e9eb037429d4efb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f62ef5d0c1e98204d9e8fb34174186d9491411d3641588097e9eb037429d4efb",
+                    "hash" : "0xf62ef5d0c1e98204d9e8fb34174186d9491411d3641588097e9eb037429d4efb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f62ef5d0c1e98204d9e8fb34174186d9491411d3641588097e9eb037429d4efb",
+                    "hash" : "0xf62ef5d0c1e98204d9e8fb34174186d9491411d3641588097e9eb037429d4efb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f62ef5d0c1e98204d9e8fb34174186d9491411d3641588097e9eb037429d4efb",
+                    "hash" : "0xf62ef5d0c1e98204d9e8fb34174186d9491411d3641588097e9eb037429d4efb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f62ef5d0c1e98204d9e8fb34174186d9491411d3641588097e9eb037429d4efb",
+                    "hash" : "0xf62ef5d0c1e98204d9e8fb34174186d9491411d3641588097e9eb037429d4efb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "f62ef5d0c1e98204d9e8fb34174186d9491411d3641588097e9eb037429d4efb",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x03255f99de856501",
                 "code" : "0x621da82575e942e4fd977abdb407069cf700116e02b4f9b25d866b6d13163fff2b8ef03cf8ab5d662afb7bb5c9e68462741090bc0976c9705b40411efe39e80c20b572c5e3d75f788f9be2f0981672b8de37f9e2d1515046cb77cc3ee74646fb096eadce98908499b6fd54725f3c6a725968761ba50494d1ecaf1e787db9a052952427c4f271c28d3e25728b2b76439a3166cd0ed37f30ec2421ed38ebd3b00b89ba9208391dc274e4eefa69161a37dfff7111756dd7971065f05aa9de4867609e7d847a290d0eeb08cde2ff294ae11dd16f8a3e32494d943fa0622cc04cd7476b6d2a1008e4ad1e2c33e2928e707c797f2a1a586bbf78658189bf58172ff77130be2ffc9bbf7f171939be260b30eb65b46a6cf107be1c9ed5c92c99d69fe0559389600e6013601c60096016601260016001600c6017016d200351654b9773409608aaa7db1f67b518d025727bdc6e0463b2bc334b658536d84dadc47a2288da62c36b9a35bf8934e3781a4c44e91637ce5c6b2f916d76706529d728b6f5ee076013601e601960086005601c6013601d96423568ce21a850c04a77ceb9",
                 "nonce" : "0x59",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2401ac5958344e85",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x35",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x71e90493e6eb4c59",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,8 +96,8 @@
             ],
             "gasPrice" : "0xe8",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x3ced74ed"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest145.json b/GeneralStateTests/stRandom/randomStatetest145.json
index 1a2f0d051..b801053aa 100644
--- a/GeneralStateTests/stRandom/randomStatetest145.json
+++ b/GeneralStateTests/stRandom/randomStatetest145.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest145" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f742511c9e00d2b3400e0d597ca2cfa7e0d263b575014f12b36142bebc1cc1a0",
+                    "hash" : "0xf742511c9e00d2b3400e0d597ca2cfa7e0d263b575014f12b36142bebc1cc1a0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f742511c9e00d2b3400e0d597ca2cfa7e0d263b575014f12b36142bebc1cc1a0",
+                    "hash" : "0xf742511c9e00d2b3400e0d597ca2cfa7e0d263b575014f12b36142bebc1cc1a0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f742511c9e00d2b3400e0d597ca2cfa7e0d263b575014f12b36142bebc1cc1a0",
+                    "hash" : "0xf742511c9e00d2b3400e0d597ca2cfa7e0d263b575014f12b36142bebc1cc1a0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f742511c9e00d2b3400e0d597ca2cfa7e0d263b575014f12b36142bebc1cc1a0",
+                    "hash" : "0xf742511c9e00d2b3400e0d597ca2cfa7e0d263b575014f12b36142bebc1cc1a0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f742511c9e00d2b3400e0d597ca2cfa7e0d263b575014f12b36142bebc1cc1a0",
+                    "hash" : "0xf742511c9e00d2b3400e0d597ca2cfa7e0d263b575014f12b36142bebc1cc1a0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "f742511c9e00d2b3400e0d597ca2cfa7e0d263b575014f12b36142bebc1cc1a0",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f0000000000000000000000000000000000000000000000000000000000000000427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000139133360005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "2115970778"
+                "0x7e1f26da"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest146.json b/GeneralStateTests/stRandom/randomStatetest146.json
index bc6c65657..7e26d5a9f 100644
--- a/GeneralStateTests/stRandom/randomStatetest146.json
+++ b/GeneralStateTests/stRandom/randomStatetest146.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest146" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "905fa642806a48fa50e933dff10e4a5ab8a67e9ab59a82a56ca70d916722dca0",
+                    "hash" : "0x905fa642806a48fa50e933dff10e4a5ab8a67e9ab59a82a56ca70d916722dca0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "515cd8699abad08dcd173cae89e9e58b11fd822f7545dcf276f1eb40c1e4fd93",
+                    "hash" : "0x515cd8699abad08dcd173cae89e9e58b11fd822f7545dcf276f1eb40c1e4fd93",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "7cb038e6078df23e57b705eab4969c36f24e8ca8a13cf781d22410a029823245",
+                    "hash" : "0x7cb038e6078df23e57b705eab4969c36f24e8ca8a13cf781d22410a029823245",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "7cb038e6078df23e57b705eab4969c36f24e8ca8a13cf781d22410a029823245",
+                    "hash" : "0x7cb038e6078df23e57b705eab4969c36f24e8ca8a13cf781d22410a029823245",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "515cd8699abad08dcd173cae89e9e58b11fd822f7545dcf276f1eb40c1e4fd93",
+                    "hash" : "0x515cd8699abad08dcd173cae89e9e58b11fd822f7545dcf276f1eb40c1e4fd93",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "3ec3270c32b915349f7f0be6bc50eab148c225596906df7ead581b41267a9262",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x434243434444424350303614f20a",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest147.json b/GeneralStateTests/stRandom/randomStatetest147.json
index 826d97c39..4ea3aadbe 100644
--- a/GeneralStateTests/stRandom/randomStatetest147.json
+++ b/GeneralStateTests/stRandom/randomStatetest147.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest147" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e43c310760c26b252e3433b91fa8b143f14b6bfb0350c75bf673d5d415364573",
+                    "hash" : "0xe43c310760c26b252e3433b91fa8b143f14b6bfb0350c75bf673d5d415364573",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e43c310760c26b252e3433b91fa8b143f14b6bfb0350c75bf673d5d415364573",
+                    "hash" : "0xe43c310760c26b252e3433b91fa8b143f14b6bfb0350c75bf673d5d415364573",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "ba463233d6fc930224054669afa5005e13f881984266ad54742d6483cb87995a",
+                    "hash" : "0xba463233d6fc930224054669afa5005e13f881984266ad54742d6483cb87995a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ba463233d6fc930224054669afa5005e13f881984266ad54742d6483cb87995a",
+                    "hash" : "0xba463233d6fc930224054669afa5005e13f881984266ad54742d6483cb87995a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e43c310760c26b252e3433b91fa8b143f14b6bfb0350c75bf673d5d415364573",
+                    "hash" : "0xe43c310760c26b252e3433b91fa8b143f14b6bfb0350c75bf673d5d415364573",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "ba463233d6fc930224054669afa5005e13f881984266ad54742d6483cb87995a",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x657ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe43659a936055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1090344298"
+                "0x40fd556a"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest148.json b/GeneralStateTests/stRandom/randomStatetest148.json
index 62e8856ef..2a2b08bf8 100644
--- a/GeneralStateTests/stRandom/randomStatetest148.json
+++ b/GeneralStateTests/stRandom/randomStatetest148.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest148" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "77a4cc50de3817adbf7379144c20b651b214aacc1c037d255fdc3c87195c0fb7",
+                    "hash" : "0x77a4cc50de3817adbf7379144c20b651b214aacc1c037d255fdc3c87195c0fb7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "77a4cc50de3817adbf7379144c20b651b214aacc1c037d255fdc3c87195c0fb7",
+                    "hash" : "0x77a4cc50de3817adbf7379144c20b651b214aacc1c037d255fdc3c87195c0fb7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "77a4cc50de3817adbf7379144c20b651b214aacc1c037d255fdc3c87195c0fb7",
+                    "hash" : "0x77a4cc50de3817adbf7379144c20b651b214aacc1c037d255fdc3c87195c0fb7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "77a4cc50de3817adbf7379144c20b651b214aacc1c037d255fdc3c87195c0fb7",
+                    "hash" : "0x77a4cc50de3817adbf7379144c20b651b214aacc1c037d255fdc3c87195c0fb7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "77a4cc50de3817adbf7379144c20b651b214aacc1c037d255fdc3c87195c0fb7",
+                    "hash" : "0x77a4cc50de3817adbf7379144c20b651b214aacc1c037d255fdc3c87195c0fb7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "77a4cc50de3817adbf7379144c20b651b214aacc1c037d255fdc3c87195c0fb7",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001537f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b56f34847e390773919b165590771644725560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "811630515"
+                "0x30607fb3"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest149.json b/GeneralStateTests/stRandom/randomStatetest149.json
index 4db945325..eea5d9db5 100644
--- a/GeneralStateTests/stRandom/randomStatetest149.json
+++ b/GeneralStateTests/stRandom/randomStatetest149.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest149" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f052b9992c4c5d67b47396b5e0bbce60de54f56ec06cf726b1a989ae46d3199e",
+                    "hash" : "0xf052b9992c4c5d67b47396b5e0bbce60de54f56ec06cf726b1a989ae46d3199e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f052b9992c4c5d67b47396b5e0bbce60de54f56ec06cf726b1a989ae46d3199e",
+                    "hash" : "0xf052b9992c4c5d67b47396b5e0bbce60de54f56ec06cf726b1a989ae46d3199e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f052b9992c4c5d67b47396b5e0bbce60de54f56ec06cf726b1a989ae46d3199e",
+                    "hash" : "0xf052b9992c4c5d67b47396b5e0bbce60de54f56ec06cf726b1a989ae46d3199e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f052b9992c4c5d67b47396b5e0bbce60de54f56ec06cf726b1a989ae46d3199e",
+                    "hash" : "0xf052b9992c4c5d67b47396b5e0bbce60de54f56ec06cf726b1a989ae46d3199e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f052b9992c4c5d67b47396b5e0bbce60de54f56ec06cf726b1a989ae46d3199e",
+                    "hash" : "0xf052b9992c4c5d67b47396b5e0bbce60de54f56ec06cf726b1a989ae46d3199e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "f052b9992c4c5d67b47396b5e0bbce60de54f56ec06cf726b1a989ae46d3199e",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff099055510760005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1968716197"
+                "0x755839a5"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest15.json b/GeneralStateTests/stRandom/randomStatetest15.json
index ebf776d86..d3b9ffe9e 100644
--- a/GeneralStateTests/stRandom/randomStatetest15.json
+++ b/GeneralStateTests/stRandom/randomStatetest15.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest15" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "996467f7608f55b555ebfee03af8bb04ae2911e1277e43c63e5a2fd1062fe961",
+                    "hash" : "0x996467f7608f55b555ebfee03af8bb04ae2911e1277e43c63e5a2fd1062fe961",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "996467f7608f55b555ebfee03af8bb04ae2911e1277e43c63e5a2fd1062fe961",
+                    "hash" : "0x996467f7608f55b555ebfee03af8bb04ae2911e1277e43c63e5a2fd1062fe961",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "996467f7608f55b555ebfee03af8bb04ae2911e1277e43c63e5a2fd1062fe961",
+                    "hash" : "0x996467f7608f55b555ebfee03af8bb04ae2911e1277e43c63e5a2fd1062fe961",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "996467f7608f55b555ebfee03af8bb04ae2911e1277e43c63e5a2fd1062fe961",
+                    "hash" : "0x996467f7608f55b555ebfee03af8bb04ae2911e1277e43c63e5a2fd1062fe961",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "996467f7608f55b555ebfee03af8bb04ae2911e1277e43c63e5a2fd1062fe961",
+                    "hash" : "0x996467f7608f55b555ebfee03af8bb04ae2911e1277e43c63e5a2fd1062fe961",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "996467f7608f55b555ebfee03af8bb04ae2911e1277e43c63e5a2fd1062fe961",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000016f436af043189b6197733280a2f1f0385560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1501832876"
+                "0x598426ac"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest150.json b/GeneralStateTests/stRandom/randomStatetest150.json
index 109dade67..acc5e1b62 100644
--- a/GeneralStateTests/stRandom/randomStatetest150.json
+++ b/GeneralStateTests/stRandom/randomStatetest150.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest150" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
             {
@@ -23,7 +23,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1575ae5ec82d3531c91a4a88b000c41a091437788756bb4ec5b173e6eb61ac7d",
+                    "hash" : "0x1575ae5ec82d3531c91a4a88b000c41a091437788756bb4ec5b173e6eb61ac7d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -33,7 +33,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "1575ae5ec82d3531c91a4a88b000c41a091437788756bb4ec5b173e6eb61ac7d",
+                    "hash" : "0x1575ae5ec82d3531c91a4a88b000c41a091437788756bb4ec5b173e6eb61ac7d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -43,7 +43,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "91fa6c25306677bce7d72beb5e71a5b6f92288071f8aba0371959b7df362daf4",
+                    "hash" : "0x91fa6c25306677bce7d72beb5e71a5b6f92288071f8aba0371959b7df362daf4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -53,7 +53,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "91fa6c25306677bce7d72beb5e71a5b6f92288071f8aba0371959b7df362daf4",
+                    "hash" : "0x91fa6c25306677bce7d72beb5e71a5b6f92288071f8aba0371959b7df362daf4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -63,7 +63,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "1575ae5ec82d3531c91a4a88b000c41a091437788756bb4ec5b173e6eb61ac7d",
+                    "hash" : "0x1575ae5ec82d3531c91a4a88b000c41a091437788756bb4ec5b173e6eb61ac7d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -74,23 +74,23 @@
         },
         "postStateRoot" : "91fa6c25306677bce7d72beb5e71a5b6f92288071f8aba0371959b7df362daf4",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x668254d76c6f24d4806677d83f3a46a1a66f20ae2688cf4b75842ac7265966f5f5ca603e6062a268aba89067dc278e1f86710462dae624ac683889038d26894af02617c06b39c4988a5a60a12c0d9ad0ca65839c92f7c75c6ad3d6a7b617ac7fbd41f5a29377ca6ad48748a94e31302254147fb3b5857568e516cb6e8aa23577af85d0e508dc17dc50e246130be577cb59826adc86af6c107fd8a98f47cccd9d22a867a43cd8ad77bbe8bb737af5acc0be67fd7b054f7281e771891dc4aad180996b9cb71c6016d0f6a9148c775e57ac8456a883eedc3182623898f32b5c83760465a2061c7652e785e7eef7a97b0aa6d6c15b5c296bcf05ee2e9b87aa60b5741b3f7d69a1df03df117b848b3a75f81c12dee2244f76e56bb261e9c75fb5ccc769db72bfaeadee3f68cf22bbca665b0647ac74c1409778c71b73ed4adaa2c6ba1c181b0747c27506478c403b3943129e79223e788bf8b81f60abecb73be035d03a8bbdfa112cd8cb2f7a1065250292740d2d72259b4d7e3ef844783da8118b72912b9f96a61f6168f160ef69d7dd3dfc7e4ef204766f789cbaf2abeceadcf5bdd8dddfef773f0a628afdf3988861662b77882a5cebffc61e75f11835b109e81f7c915a91c13b09097b792d3d59de0ef5b0f00f95ea49860917656263925da2fd6685359c6d7e4c3c4d2001a30111de14c56503788453df98a29b8715561b2c2021cf78e0ccc4701b192ebf67bb6f522656788b3d21428b50a2fa16224d926ce2ea5944760d501bfa0774238c6351dd224b743d3fc4d5a309166016a71b1c230fe9afd6479324716e71e3b27bdd3fb18cccc42f6ec973129f7958435f45da181aeb1608ed31713c33330ab4d2d4af54dd92d1df1560086014601d601f636b1d9a3573095e7baea6a6c7c4c2dfeb977efac326af552d87632aec0540f16cfb040c16bd7c3761bdb86dd6be658d2aefe157396217393663769965a66479176d702e7e2d5697681aac1beccc55825241cd77551f39526cfa77838faa9c4759aafa5c64df5e9199976f35f8298acd398d1913c1fd2ddacbbeac7cc29daee12c057385808f19d07110f30cfd900a130b0a713468bceaf4236153ab6c7bdc39cf86d0a5b03684624d187473b42a2968f1128872724b3d42218dbac11f5a9492651f09a866f61a72535c373274618d5914163abc7481bb7789394e62f247e78e7f83af55a5686926972af7c6519658aee40a564e3c2950f874def7a2110af0526f75629b20a108e1cfba0db03fcdee497ee2f8bcf78ef14317",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -105,8 +105,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x6c44fb37"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest151.json b/GeneralStateTests/stRandom/randomStatetest151.json
index 766d65a3a..3f172dcd6 100644
--- a/GeneralStateTests/stRandom/randomStatetest151.json
+++ b/GeneralStateTests/stRandom/randomStatetest151.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest151" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "fd87625e181210729a2eb90f115a5d8071e58b87b3ea32f95c85842cf2cdc2f4",
+                    "hash" : "0xfd87625e181210729a2eb90f115a5d8071e58b87b3ea32f95c85842cf2cdc2f4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "fd87625e181210729a2eb90f115a5d8071e58b87b3ea32f95c85842cf2cdc2f4",
+                    "hash" : "0xfd87625e181210729a2eb90f115a5d8071e58b87b3ea32f95c85842cf2cdc2f4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "fd87625e181210729a2eb90f115a5d8071e58b87b3ea32f95c85842cf2cdc2f4",
+                    "hash" : "0xfd87625e181210729a2eb90f115a5d8071e58b87b3ea32f95c85842cf2cdc2f4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "fd87625e181210729a2eb90f115a5d8071e58b87b3ea32f95c85842cf2cdc2f4",
+                    "hash" : "0xfd87625e181210729a2eb90f115a5d8071e58b87b3ea32f95c85842cf2cdc2f4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "fd87625e181210729a2eb90f115a5d8071e58b87b3ea32f95c85842cf2cdc2f4",
+                    "hash" : "0xfd87625e181210729a2eb90f115a5d8071e58b87b3ea32f95c85842cf2cdc2f4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "8464ad6046be49963917e36af7d10ff41bc25f298dcb87c1e1a464bd05238f0b",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x41424143445a42f35b10773574016c9f",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest152.json b/GeneralStateTests/stRandom/randomStatetest152.json
index 7584b1259..682710fa4 100644
--- a/GeneralStateTests/stRandom/randomStatetest152.json
+++ b/GeneralStateTests/stRandom/randomStatetest152.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest152" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "8c56be04f33bdedab2d81f7737dc6ac038e1fc4a3c7b9d0b45d7919a4422f1a1",
+                    "hash" : "0x8c56be04f33bdedab2d81f7737dc6ac038e1fc4a3c7b9d0b45d7919a4422f1a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "8c56be04f33bdedab2d81f7737dc6ac038e1fc4a3c7b9d0b45d7919a4422f1a1",
+                    "hash" : "0x8c56be04f33bdedab2d81f7737dc6ac038e1fc4a3c7b9d0b45d7919a4422f1a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "8c56be04f33bdedab2d81f7737dc6ac038e1fc4a3c7b9d0b45d7919a4422f1a1",
+                    "hash" : "0x8c56be04f33bdedab2d81f7737dc6ac038e1fc4a3c7b9d0b45d7919a4422f1a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "8c56be04f33bdedab2d81f7737dc6ac038e1fc4a3c7b9d0b45d7919a4422f1a1",
+                    "hash" : "0x8c56be04f33bdedab2d81f7737dc6ac038e1fc4a3c7b9d0b45d7919a4422f1a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "8c56be04f33bdedab2d81f7737dc6ac038e1fc4a3c7b9d0b45d7919a4422f1a1",
+                    "hash" : "0x8c56be04f33bdedab2d81f7737dc6ac038e1fc4a3c7b9d0b45d7919a4422f1a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "5aa134e47942d5c0129aff725cfd9b82292a8c3cf1dff16967ab920d8d4043e0",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c35041407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350525942525917526117908060005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "747943253"
+                "0x2c94b555"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest153.json b/GeneralStateTests/stRandom/randomStatetest153.json
index 709c56fba..ed0186558 100644
--- a/GeneralStateTests/stRandom/randomStatetest153.json
+++ b/GeneralStateTests/stRandom/randomStatetest153.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest153" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "45f392e82332370031c662d55b9ee70d85c62d31df64009cf84ad73708ad6cb3",
+                    "hash" : "0x45f392e82332370031c662d55b9ee70d85c62d31df64009cf84ad73708ad6cb3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "45f392e82332370031c662d55b9ee70d85c62d31df64009cf84ad73708ad6cb3",
+                    "hash" : "0x45f392e82332370031c662d55b9ee70d85c62d31df64009cf84ad73708ad6cb3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "45f392e82332370031c662d55b9ee70d85c62d31df64009cf84ad73708ad6cb3",
+                    "hash" : "0x45f392e82332370031c662d55b9ee70d85c62d31df64009cf84ad73708ad6cb3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "45f392e82332370031c662d55b9ee70d85c62d31df64009cf84ad73708ad6cb3",
+                    "hash" : "0x45f392e82332370031c662d55b9ee70d85c62d31df64009cf84ad73708ad6cb3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "45f392e82332370031c662d55b9ee70d85c62d31df64009cf84ad73708ad6cb3",
+                    "hash" : "0x45f392e82332370031c662d55b9ee70d85c62d31df64009cf84ad73708ad6cb3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "740e980fa1c72637521f848a07aeb5d66e7ec3c59b94b9e3b948d10267169c5b",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x44420b4442432055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest154.json b/GeneralStateTests/stRandom/randomStatetest154.json
index 2b843774d..9f6eb2cb5 100644
--- a/GeneralStateTests/stRandom/randomStatetest154.json
+++ b/GeneralStateTests/stRandom/randomStatetest154.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest154" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
             {
@@ -23,7 +23,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "67a71fe25a1677173043ee32485da59869927271f9f4110a6bb8533517b2550a",
+                    "hash" : "0x67a71fe25a1677173043ee32485da59869927271f9f4110a6bb8533517b2550a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -33,7 +33,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "67a71fe25a1677173043ee32485da59869927271f9f4110a6bb8533517b2550a",
+                    "hash" : "0x67a71fe25a1677173043ee32485da59869927271f9f4110a6bb8533517b2550a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -43,7 +43,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b0be04688838e7890b6244c7d2b72d886fd8e9472d8b8129468f63b18507f7ef",
+                    "hash" : "0xb0be04688838e7890b6244c7d2b72d886fd8e9472d8b8129468f63b18507f7ef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -53,7 +53,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b0be04688838e7890b6244c7d2b72d886fd8e9472d8b8129468f63b18507f7ef",
+                    "hash" : "0xb0be04688838e7890b6244c7d2b72d886fd8e9472d8b8129468f63b18507f7ef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -63,7 +63,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "67a71fe25a1677173043ee32485da59869927271f9f4110a6bb8533517b2550a",
+                    "hash" : "0x67a71fe25a1677173043ee32485da59869927271f9f4110a6bb8533517b2550a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -74,23 +74,23 @@
         },
         "postStateRoot" : "b0be04688838e7890b6244c7d2b72d886fd8e9472d8b8129468f63b18507f7ef",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7db1267c8bba268d1408f7b3e269afee3fea86c5bc8aec8108fd6aaa954f5173b7d0e2328333e94698e0d570db9b316cba0adbae609d611ba1a2326004600d6005600f632de40a2773095e7baea6a6c7c4c2dfeb977efac326af552d87635c2491eef1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -105,8 +105,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x651c295b"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest155.json b/GeneralStateTests/stRandom/randomStatetest155.json
index 0f5aa3b01..b24b1bd8d 100644
--- a/GeneralStateTests/stRandom/randomStatetest155.json
+++ b/GeneralStateTests/stRandom/randomStatetest155.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest155" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "86cc448a167296701af57783f34699eb2f48a8d2be9381b09cd6b088e206f75d",
+                    "hash" : "0x86cc448a167296701af57783f34699eb2f48a8d2be9381b09cd6b088e206f75d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "86cc448a167296701af57783f34699eb2f48a8d2be9381b09cd6b088e206f75d",
+                    "hash" : "0x86cc448a167296701af57783f34699eb2f48a8d2be9381b09cd6b088e206f75d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "86cc448a167296701af57783f34699eb2f48a8d2be9381b09cd6b088e206f75d",
+                    "hash" : "0x86cc448a167296701af57783f34699eb2f48a8d2be9381b09cd6b088e206f75d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "86cc448a167296701af57783f34699eb2f48a8d2be9381b09cd6b088e206f75d",
+                    "hash" : "0x86cc448a167296701af57783f34699eb2f48a8d2be9381b09cd6b088e206f75d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "86cc448a167296701af57783f34699eb2f48a8d2be9381b09cd6b088e206f75d",
+                    "hash" : "0x86cc448a167296701af57783f34699eb2f48a8d2be9381b09cd6b088e206f75d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "86cc448a167296701af57783f34699eb2f48a8d2be9381b09cd6b088e206f75d",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x457f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000006f3494f39b6ca29473a19958030891015560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "579536172"
+                "0x228b052c"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest156.json b/GeneralStateTests/stRandom/randomStatetest156.json
index ff1b64617..214ee5db2 100644
--- a/GeneralStateTests/stRandom/randomStatetest156.json
+++ b/GeneralStateTests/stRandom/randomStatetest156.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest156" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "dc52cf79f5dbf5639335a2c3827f1575bbe9d393b551c39e09c743e30d440b96",
+                    "hash" : "0xdc52cf79f5dbf5639335a2c3827f1575bbe9d393b551c39e09c743e30d440b96",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "dc52cf79f5dbf5639335a2c3827f1575bbe9d393b551c39e09c743e30d440b96",
+                    "hash" : "0xdc52cf79f5dbf5639335a2c3827f1575bbe9d393b551c39e09c743e30d440b96",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "dc52cf79f5dbf5639335a2c3827f1575bbe9d393b551c39e09c743e30d440b96",
+                    "hash" : "0xdc52cf79f5dbf5639335a2c3827f1575bbe9d393b551c39e09c743e30d440b96",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "dc52cf79f5dbf5639335a2c3827f1575bbe9d393b551c39e09c743e30d440b96",
+                    "hash" : "0xdc52cf79f5dbf5639335a2c3827f1575bbe9d393b551c39e09c743e30d440b96",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "dc52cf79f5dbf5639335a2c3827f1575bbe9d393b551c39e09c743e30d440b96",
+                    "hash" : "0xdc52cf79f5dbf5639335a2c3827f1575bbe9d393b551c39e09c743e30d440b96",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "dc52cf79f5dbf5639335a2c3827f1575bbe9d393b551c39e09c743e30d440b96",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3506f813982583141966b389c159aa48b3a8860005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "2147378193"
+                "0x7ffe6411"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest157.json b/GeneralStateTests/stRandom/randomStatetest157.json
index 9d0f9f2d4..7441c9456 100644
--- a/GeneralStateTests/stRandom/randomStatetest157.json
+++ b/GeneralStateTests/stRandom/randomStatetest157.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest157" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "098e4302ae5a61cfcca3600b95291da958757cdaf77cdd1a08e31946d9370007",
+                    "hash" : "0x098e4302ae5a61cfcca3600b95291da958757cdaf77cdd1a08e31946d9370007",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "098e4302ae5a61cfcca3600b95291da958757cdaf77cdd1a08e31946d9370007",
+                    "hash" : "0x098e4302ae5a61cfcca3600b95291da958757cdaf77cdd1a08e31946d9370007",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "098e4302ae5a61cfcca3600b95291da958757cdaf77cdd1a08e31946d9370007",
+                    "hash" : "0x098e4302ae5a61cfcca3600b95291da958757cdaf77cdd1a08e31946d9370007",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "098e4302ae5a61cfcca3600b95291da958757cdaf77cdd1a08e31946d9370007",
+                    "hash" : "0x098e4302ae5a61cfcca3600b95291da958757cdaf77cdd1a08e31946d9370007",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "098e4302ae5a61cfcca3600b95291da958757cdaf77cdd1a08e31946d9370007",
+                    "hash" : "0x098e4302ae5a61cfcca3600b95291da958757cdaf77cdd1a08e31946d9370007",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "098e4302ae5a61cfcca3600b95291da958757cdaf77cdd1a08e31946d9370007",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0966ff351691689162f371a38d9b789e4360005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "391059071"
+                "0x174f167f"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest158.json b/GeneralStateTests/stRandom/randomStatetest158.json
index 65d01844b..cd1095081 100644
--- a/GeneralStateTests/stRandom/randomStatetest158.json
+++ b/GeneralStateTests/stRandom/randomStatetest158.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest158" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e2b29a1bf24efbe0a7ccafaa9333ac2711ff15e5d0ce472adb6cc9393ee75a39",
+                    "hash" : "0xe2b29a1bf24efbe0a7ccafaa9333ac2711ff15e5d0ce472adb6cc9393ee75a39",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e2b29a1bf24efbe0a7ccafaa9333ac2711ff15e5d0ce472adb6cc9393ee75a39",
+                    "hash" : "0xe2b29a1bf24efbe0a7ccafaa9333ac2711ff15e5d0ce472adb6cc9393ee75a39",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e2b29a1bf24efbe0a7ccafaa9333ac2711ff15e5d0ce472adb6cc9393ee75a39",
+                    "hash" : "0xe2b29a1bf24efbe0a7ccafaa9333ac2711ff15e5d0ce472adb6cc9393ee75a39",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e2b29a1bf24efbe0a7ccafaa9333ac2711ff15e5d0ce472adb6cc9393ee75a39",
+                    "hash" : "0xe2b29a1bf24efbe0a7ccafaa9333ac2711ff15e5d0ce472adb6cc9393ee75a39",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e2b29a1bf24efbe0a7ccafaa9333ac2711ff15e5d0ce472adb6cc9393ee75a39",
+                    "hash" : "0xe2b29a1bf24efbe0a7ccafaa9333ac2711ff15e5d0ce472adb6cc9393ee75a39",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "e2b29a1bf24efbe0a7ccafaa9333ac2711ff15e5d0ce472adb6cc9393ee75a39",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe435060005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,8 +96,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x383bfc76"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest159.json b/GeneralStateTests/stRandom/randomStatetest159.json
index 23858ea0e..f18670a68 100644
--- a/GeneralStateTests/stRandom/randomStatetest159.json
+++ b/GeneralStateTests/stRandom/randomStatetest159.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest159" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
             {
@@ -22,7 +22,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "8247112219ff68633ac3ff90375b37ebba80b8b879cd5884f2e66b99790d5d00",
+                    "hash" : "0x8247112219ff68633ac3ff90375b37ebba80b8b879cd5884f2e66b99790d5d00",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -32,7 +32,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "8247112219ff68633ac3ff90375b37ebba80b8b879cd5884f2e66b99790d5d00",
+                    "hash" : "0x8247112219ff68633ac3ff90375b37ebba80b8b879cd5884f2e66b99790d5d00",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -42,7 +42,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3c123087c3fd11ad6272f2f49d21d2d82f00d862952e6209ecaa5f8824096133",
+                    "hash" : "0x3c123087c3fd11ad6272f2f49d21d2d82f00d862952e6209ecaa5f8824096133",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -52,7 +52,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3c123087c3fd11ad6272f2f49d21d2d82f00d862952e6209ecaa5f8824096133",
+                    "hash" : "0x3c123087c3fd11ad6272f2f49d21d2d82f00d862952e6209ecaa5f8824096133",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,7 +62,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "8247112219ff68633ac3ff90375b37ebba80b8b879cd5884f2e66b99790d5d00",
+                    "hash" : "0x8247112219ff68633ac3ff90375b37ebba80b8b879cd5884f2e66b99790d5d00",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -73,23 +73,23 @@
         },
         "postStateRoot" : "3c123087c3fd11ad6272f2f49d21d2d82f00d862952e6209ecaa5f8824096133",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x324260e172acf6051580ff4e3ba75da449e7ab2b705cf75873b252caf4b51def86cf4988747e4b77d541c09d316acfebf3871d3a1944a5b975670f11d63a7d9c9b49750a0734d7313f746ba5fba6f3ff04148f4f39e4a28cc271e1ae0b89f2ad1413af2317c6a9628006d4157cdf7a3f30103f20611fe88431b16a79be995278aec271b56bc32543196c650621b66f1bfc718c0d9360cfb17a079aeca76a0b08cb4f0e5789426a6a26c3bef3710be80e4d646135f26076a178e17952f1667fa85f3b72ffa4c95bda9db87e2b8409a9b1c9e27346e5b9a49fd3689f943925eb4618577675acf6bf7b1b665940c32ef9086a95914496bc8bb76245fa2dc9cd3e29618e568966b2893ecd2e84766a8cf184a772e70b3e042b9584601e600b600760136304b1e2f273095e7baea6a6c7c4c2dfeb977efac326af552d876339570738f16df327f570c11aa84a7a5480b98c5175cbd00120239df2d03db2fdd9c233df848ead9d3c84d4556f6030a17e0f41dfce8be36a92b0d5e0d67a71c146187edefc7923a8aad22ca228ecee824c2d7c237ace7e52fd62bd649662a4fe5f78a0b34d84a28c14c9fea0f18d1d55870173546b3b99e17cae467e2f1667b7c9445b11382bf9d7ff632d1ccdc973ba913d9ebbb219ac7aa0f3b579caa81065e433d2b8cf8cbfb998ec52fe1eaea6d87bc7728315cc653ccf904948918741",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -104,8 +104,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x24a7152f"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest16.json b/GeneralStateTests/stRandom/randomStatetest16.json
index c175927f3..f6f84577c 100644
--- a/GeneralStateTests/stRandom/randomStatetest16.json
+++ b/GeneralStateTests/stRandom/randomStatetest16.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest16" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b7ca2e84bd3b13715250040d78ad901a0192745e626f3a95fe0069405e85a8a3",
+                    "hash" : "0xb7ca2e84bd3b13715250040d78ad901a0192745e626f3a95fe0069405e85a8a3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b7ca2e84bd3b13715250040d78ad901a0192745e626f3a95fe0069405e85a8a3",
+                    "hash" : "0xb7ca2e84bd3b13715250040d78ad901a0192745e626f3a95fe0069405e85a8a3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b7ca2e84bd3b13715250040d78ad901a0192745e626f3a95fe0069405e85a8a3",
+                    "hash" : "0xb7ca2e84bd3b13715250040d78ad901a0192745e626f3a95fe0069405e85a8a3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b7ca2e84bd3b13715250040d78ad901a0192745e626f3a95fe0069405e85a8a3",
+                    "hash" : "0xb7ca2e84bd3b13715250040d78ad901a0192745e626f3a95fe0069405e85a8a3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b7ca2e84bd3b13715250040d78ad901a0192745e626f3a95fe0069405e85a8a3",
+                    "hash" : "0xb7ca2e84bd3b13715250040d78ad901a0192745e626f3a95fe0069405e85a8a3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "b7ca2e84bd3b13715250040d78ad901a0192745e626f3a95fe0069405e85a8a3",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f0000000000000000000000000000000000000000000000000000000000000000557f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000005531848f7aa4516d7d7578797e",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1047145130"
+                "0x3e6a2aaa"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest160.json b/GeneralStateTests/stRandom/randomStatetest160.json
index 690ffe0d3..abae05159 100644
--- a/GeneralStateTests/stRandom/randomStatetest160.json
+++ b/GeneralStateTests/stRandom/randomStatetest160.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest160" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "4af0bd285326d5da920237f05dce19b8e135dec25b84d40684b118eb08a16f60",
+                    "hash" : "0x4af0bd285326d5da920237f05dce19b8e135dec25b84d40684b118eb08a16f60",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "4af0bd285326d5da920237f05dce19b8e135dec25b84d40684b118eb08a16f60",
+                    "hash" : "0x4af0bd285326d5da920237f05dce19b8e135dec25b84d40684b118eb08a16f60",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4af0bd285326d5da920237f05dce19b8e135dec25b84d40684b118eb08a16f60",
+                    "hash" : "0x4af0bd285326d5da920237f05dce19b8e135dec25b84d40684b118eb08a16f60",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4af0bd285326d5da920237f05dce19b8e135dec25b84d40684b118eb08a16f60",
+                    "hash" : "0x4af0bd285326d5da920237f05dce19b8e135dec25b84d40684b118eb08a16f60",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "4af0bd285326d5da920237f05dce19b8e135dec25b84d40684b118eb08a16f60",
+                    "hash" : "0x4af0bd285326d5da920237f05dce19b8e135dec25b84d40684b118eb08a16f60",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "3a637ce7ca3e580b4456f8508a8c38a150b2ca2490e0c1307791698b011f0a40",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x4242434444454443525520307555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest161.json b/GeneralStateTests/stRandom/randomStatetest161.json
index 73949e747..7262f28de 100644
--- a/GeneralStateTests/stRandom/randomStatetest161.json
+++ b/GeneralStateTests/stRandom/randomStatetest161.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest161" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "8aa9d034992ee5a8d58cec7ace35e3fc4740ff02306731aae27652250e88e8d2",
+                    "hash" : "0x8aa9d034992ee5a8d58cec7ace35e3fc4740ff02306731aae27652250e88e8d2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "8aa9d034992ee5a8d58cec7ace35e3fc4740ff02306731aae27652250e88e8d2",
+                    "hash" : "0x8aa9d034992ee5a8d58cec7ace35e3fc4740ff02306731aae27652250e88e8d2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "8aa9d034992ee5a8d58cec7ace35e3fc4740ff02306731aae27652250e88e8d2",
+                    "hash" : "0x8aa9d034992ee5a8d58cec7ace35e3fc4740ff02306731aae27652250e88e8d2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "8aa9d034992ee5a8d58cec7ace35e3fc4740ff02306731aae27652250e88e8d2",
+                    "hash" : "0x8aa9d034992ee5a8d58cec7ace35e3fc4740ff02306731aae27652250e88e8d2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "8aa9d034992ee5a8d58cec7ace35e3fc4740ff02306731aae27652250e88e8d2",
+                    "hash" : "0x8aa9d034992ee5a8d58cec7ace35e3fc4740ff02306731aae27652250e88e8d2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "8aa9d034992ee5a8d58cec7ace35e3fc4740ff02306731aae27652250e88e8d2",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c350437f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001416f458a458076526052650a418c9b40863c60005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "757362865"
+                "0x2d2470b1"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest162.json b/GeneralStateTests/stRandom/randomStatetest162.json
index ee6014ff3..31f0b5989 100644
--- a/GeneralStateTests/stRandom/randomStatetest162.json
+++ b/GeneralStateTests/stRandom/randomStatetest162.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest162" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a36aae668193f97cb0f1525fdb606f3179d57dbb0bfed41d0ff9cc31ff97d2a9",
+                    "hash" : "0xa36aae668193f97cb0f1525fdb606f3179d57dbb0bfed41d0ff9cc31ff97d2a9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a36aae668193f97cb0f1525fdb606f3179d57dbb0bfed41d0ff9cc31ff97d2a9",
+                    "hash" : "0xa36aae668193f97cb0f1525fdb606f3179d57dbb0bfed41d0ff9cc31ff97d2a9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a36aae668193f97cb0f1525fdb606f3179d57dbb0bfed41d0ff9cc31ff97d2a9",
+                    "hash" : "0xa36aae668193f97cb0f1525fdb606f3179d57dbb0bfed41d0ff9cc31ff97d2a9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a36aae668193f97cb0f1525fdb606f3179d57dbb0bfed41d0ff9cc31ff97d2a9",
+                    "hash" : "0xa36aae668193f97cb0f1525fdb606f3179d57dbb0bfed41d0ff9cc31ff97d2a9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a36aae668193f97cb0f1525fdb606f3179d57dbb0bfed41d0ff9cc31ff97d2a9",
+                    "hash" : "0xa36aae668193f97cb0f1525fdb606f3179d57dbb0bfed41d0ff9cc31ff97d2a9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "a36aae668193f97cb0f1525fdb606f3179d57dbb0bfed41d0ff9cc31ff97d2a9",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f355a7f614497339e3b63878b3698045560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "725006509"
+                "0x2b36b8ad"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest163.json b/GeneralStateTests/stRandom/randomStatetest163.json
index 7f4d458d7..5f51e9ad7 100644
--- a/GeneralStateTests/stRandom/randomStatetest163.json
+++ b/GeneralStateTests/stRandom/randomStatetest163.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest163" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
             {
@@ -22,7 +22,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d1525021b99d833333eff698fe8865b01cf5d958b8aa38474797634098dd13e2",
+                    "hash" : "0xd1525021b99d833333eff698fe8865b01cf5d958b8aa38474797634098dd13e2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -32,7 +32,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d1525021b99d833333eff698fe8865b01cf5d958b8aa38474797634098dd13e2",
+                    "hash" : "0xd1525021b99d833333eff698fe8865b01cf5d958b8aa38474797634098dd13e2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -42,7 +42,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "d1525021b99d833333eff698fe8865b01cf5d958b8aa38474797634098dd13e2",
+                    "hash" : "0xd1525021b99d833333eff698fe8865b01cf5d958b8aa38474797634098dd13e2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -52,7 +52,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "d1525021b99d833333eff698fe8865b01cf5d958b8aa38474797634098dd13e2",
+                    "hash" : "0xd1525021b99d833333eff698fe8865b01cf5d958b8aa38474797634098dd13e2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,7 +62,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d1525021b99d833333eff698fe8865b01cf5d958b8aa38474797634098dd13e2",
+                    "hash" : "0xd1525021b99d833333eff698fe8865b01cf5d958b8aa38474797634098dd13e2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -73,23 +73,23 @@
         },
         "postStateRoot" : "634fc8a01590172b79cba0ea677dd15e0c634dc950a9e7a4199148cd6cd749a8",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000000034577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000426259cb6142a1196e3168c986758aa4",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -104,10 +104,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1579124913"
+                "0x5e1f88b1"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest164.json b/GeneralStateTests/stRandom/randomStatetest164.json
index 86a563dd1..58699d8d6 100644
--- a/GeneralStateTests/stRandom/randomStatetest164.json
+++ b/GeneralStateTests/stRandom/randomStatetest164.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest164" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a4f469654c9c9e7d18e88f5f6104c692c923ab91f74271c4108239d714509e76",
+                    "hash" : "0xa4f469654c9c9e7d18e88f5f6104c692c923ab91f74271c4108239d714509e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a4f469654c9c9e7d18e88f5f6104c692c923ab91f74271c4108239d714509e76",
+                    "hash" : "0xa4f469654c9c9e7d18e88f5f6104c692c923ab91f74271c4108239d714509e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a4f469654c9c9e7d18e88f5f6104c692c923ab91f74271c4108239d714509e76",
+                    "hash" : "0xa4f469654c9c9e7d18e88f5f6104c692c923ab91f74271c4108239d714509e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a4f469654c9c9e7d18e88f5f6104c692c923ab91f74271c4108239d714509e76",
+                    "hash" : "0xa4f469654c9c9e7d18e88f5f6104c692c923ab91f74271c4108239d714509e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a4f469654c9c9e7d18e88f5f6104c692c923ab91f74271c4108239d714509e76",
+                    "hash" : "0xa4f469654c9c9e7d18e88f5f6104c692c923ab91f74271c4108239d714509e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "a4f469654c9c9e7d18e88f5f6104c692c923ab91f74271c4108239d714509e76",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe417f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000831305395560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1836140782"
+                "0x6d7148ee"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest165.json b/GeneralStateTests/stRandom/randomStatetest165.json
index 2f0a2e6b0..4fbb868b2 100644
--- a/GeneralStateTests/stRandom/randomStatetest165.json
+++ b/GeneralStateTests/stRandom/randomStatetest165.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest165" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "4d15768fcd0f7869872361d8e396fea3cffceac764ab0f2697cd3662153133cd",
+                    "hash" : "0x4d15768fcd0f7869872361d8e396fea3cffceac764ab0f2697cd3662153133cd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "4d15768fcd0f7869872361d8e396fea3cffceac764ab0f2697cd3662153133cd",
+                    "hash" : "0x4d15768fcd0f7869872361d8e396fea3cffceac764ab0f2697cd3662153133cd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4d15768fcd0f7869872361d8e396fea3cffceac764ab0f2697cd3662153133cd",
+                    "hash" : "0x4d15768fcd0f7869872361d8e396fea3cffceac764ab0f2697cd3662153133cd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4d15768fcd0f7869872361d8e396fea3cffceac764ab0f2697cd3662153133cd",
+                    "hash" : "0x4d15768fcd0f7869872361d8e396fea3cffceac764ab0f2697cd3662153133cd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "4d15768fcd0f7869872361d8e396fea3cffceac764ab0f2697cd3662153133cd",
+                    "hash" : "0x4d15768fcd0f7869872361d8e396fea3cffceac764ab0f2697cd3662153133cd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "777cde5f3f0c6a570929f491761fcdfe29ddd0b462db861b71f11d360c9cdcd9",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x41404244444145085955",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest166.json b/GeneralStateTests/stRandom/randomStatetest166.json
index f9d4a2654..be1dd5c8b 100644
--- a/GeneralStateTests/stRandom/randomStatetest166.json
+++ b/GeneralStateTests/stRandom/randomStatetest166.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest166" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "2c0c1fddb7ccc81a8ac1635694689d2775bb05535736a3229dff753dc7926b23",
+                    "hash" : "0x2c0c1fddb7ccc81a8ac1635694689d2775bb05535736a3229dff753dc7926b23",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "2c0c1fddb7ccc81a8ac1635694689d2775bb05535736a3229dff753dc7926b23",
+                    "hash" : "0x2c0c1fddb7ccc81a8ac1635694689d2775bb05535736a3229dff753dc7926b23",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2c0c1fddb7ccc81a8ac1635694689d2775bb05535736a3229dff753dc7926b23",
+                    "hash" : "0x2c0c1fddb7ccc81a8ac1635694689d2775bb05535736a3229dff753dc7926b23",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "2c0c1fddb7ccc81a8ac1635694689d2775bb05535736a3229dff753dc7926b23",
+                    "hash" : "0x2c0c1fddb7ccc81a8ac1635694689d2775bb05535736a3229dff753dc7926b23",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "2c0c1fddb7ccc81a8ac1635694689d2775bb05535736a3229dff753dc7926b23",
+                    "hash" : "0x2c0c1fddb7ccc81a8ac1635694689d2775bb05535736a3229dff753dc7926b23",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "2c0c1fddb7ccc81a8ac1635694689d2775bb05535736a3229dff753dc7926b23",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff817f0000000000000000000000010000000000000000000000000000000000000000417f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c350456f8eb7099d9f160532785143c5937e185560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1614644579"
+                "0x603d8563"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest167.json b/GeneralStateTests/stRandom/randomStatetest167.json
index fa534c0df..b0c8ea2ce 100644
--- a/GeneralStateTests/stRandom/randomStatetest167.json
+++ b/GeneralStateTests/stRandom/randomStatetest167.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest167" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "cdac8134821914d3619b7478c17582f027ada7ef1f31069d57cf60aae0d35107",
+                    "hash" : "0xcdac8134821914d3619b7478c17582f027ada7ef1f31069d57cf60aae0d35107",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "cdac8134821914d3619b7478c17582f027ada7ef1f31069d57cf60aae0d35107",
+                    "hash" : "0xcdac8134821914d3619b7478c17582f027ada7ef1f31069d57cf60aae0d35107",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "cdac8134821914d3619b7478c17582f027ada7ef1f31069d57cf60aae0d35107",
+                    "hash" : "0xcdac8134821914d3619b7478c17582f027ada7ef1f31069d57cf60aae0d35107",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "cdac8134821914d3619b7478c17582f027ada7ef1f31069d57cf60aae0d35107",
+                    "hash" : "0xcdac8134821914d3619b7478c17582f027ada7ef1f31069d57cf60aae0d35107",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "cdac8134821914d3619b7478c17582f027ada7ef1f31069d57cf60aae0d35107",
+                    "hash" : "0xcdac8134821914d3619b7478c17582f027ada7ef1f31069d57cf60aae0d35107",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "cdac8134821914d3619b7478c17582f027ada7ef1f31069d57cf60aae0d35107",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001437f0000000000000000000000000000000000000000000000000000000000000001027f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6fa00b875630178a439384941395369e5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "428826795"
+                "0x198f60ab"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest168.json b/GeneralStateTests/stRandom/randomStatetest168.json
index 0f48a28cc..932c14a1e 100644
--- a/GeneralStateTests/stRandom/randomStatetest168.json
+++ b/GeneralStateTests/stRandom/randomStatetest168.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest168" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "296124cdfcc36c84811342d7654768801dd0dec117c59cbbd646ee48806ad9af",
+                    "hash" : "0x296124cdfcc36c84811342d7654768801dd0dec117c59cbbd646ee48806ad9af",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "296124cdfcc36c84811342d7654768801dd0dec117c59cbbd646ee48806ad9af",
+                    "hash" : "0x296124cdfcc36c84811342d7654768801dd0dec117c59cbbd646ee48806ad9af",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "296124cdfcc36c84811342d7654768801dd0dec117c59cbbd646ee48806ad9af",
+                    "hash" : "0x296124cdfcc36c84811342d7654768801dd0dec117c59cbbd646ee48806ad9af",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "296124cdfcc36c84811342d7654768801dd0dec117c59cbbd646ee48806ad9af",
+                    "hash" : "0x296124cdfcc36c84811342d7654768801dd0dec117c59cbbd646ee48806ad9af",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "296124cdfcc36c84811342d7654768801dd0dec117c59cbbd646ee48806ad9af",
+                    "hash" : "0x296124cdfcc36c84811342d7654768801dd0dec117c59cbbd646ee48806ad9af",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "296124cdfcc36c84811342d7654768801dd0dec117c59cbbd646ee48806ad9af",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5b407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe067f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f618a8186756319140295026c0996875560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "310398856"
+                "0x12804f88"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest169.json b/GeneralStateTests/stRandom/randomStatetest169.json
index 809554e29..0485c6ddc 100644
--- a/GeneralStateTests/stRandom/randomStatetest169.json
+++ b/GeneralStateTests/stRandom/randomStatetest169.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest169" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f1f5f06ca3269f5e4e7d172828216e2089156370c90bf41ec84bdc04de644a6f",
+                    "hash" : "0xf1f5f06ca3269f5e4e7d172828216e2089156370c90bf41ec84bdc04de644a6f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f1f5f06ca3269f5e4e7d172828216e2089156370c90bf41ec84bdc04de644a6f",
+                    "hash" : "0xf1f5f06ca3269f5e4e7d172828216e2089156370c90bf41ec84bdc04de644a6f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f1f5f06ca3269f5e4e7d172828216e2089156370c90bf41ec84bdc04de644a6f",
+                    "hash" : "0xf1f5f06ca3269f5e4e7d172828216e2089156370c90bf41ec84bdc04de644a6f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f1f5f06ca3269f5e4e7d172828216e2089156370c90bf41ec84bdc04de644a6f",
+                    "hash" : "0xf1f5f06ca3269f5e4e7d172828216e2089156370c90bf41ec84bdc04de644a6f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f1f5f06ca3269f5e4e7d172828216e2089156370c90bf41ec84bdc04de644a6f",
+                    "hash" : "0xf1f5f06ca3269f5e4e7d172828216e2089156370c90bf41ec84bdc04de644a6f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "f1f5f06ca3269f5e4e7d172828216e2089156370c90bf41ec84bdc04de644a6f",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe447f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe60005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,8 +96,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x33c6014b"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest17.json b/GeneralStateTests/stRandom/randomStatetest17.json
index cef70d1ba..345d34fd5 100644
--- a/GeneralStateTests/stRandom/randomStatetest17.json
+++ b/GeneralStateTests/stRandom/randomStatetest17.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest17" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "8a46586c5856c34b96a01fa070f539dd1d988f9e199227c3fc83b9ef12a5e9e0",
+                    "hash" : "0x8a46586c5856c34b96a01fa070f539dd1d988f9e199227c3fc83b9ef12a5e9e0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "8942c691cb6eefd395f15bd22dca25c203ac92e3f928771b56572ac93ef0154e",
+                    "hash" : "0x8942c691cb6eefd395f15bd22dca25c203ac92e3f928771b56572ac93ef0154e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5ab322367fa24477a8f529158e78b499368a42ae0f5cf5ae55e2efe53d20768c",
+                    "hash" : "0x5ab322367fa24477a8f529158e78b499368a42ae0f5cf5ae55e2efe53d20768c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5ab322367fa24477a8f529158e78b499368a42ae0f5cf5ae55e2efe53d20768c",
+                    "hash" : "0x5ab322367fa24477a8f529158e78b499368a42ae0f5cf5ae55e2efe53d20768c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "8942c691cb6eefd395f15bd22dca25c203ac92e3f928771b56572ac93ef0154e",
+                    "hash" : "0x8942c691cb6eefd395f15bd22dca25c203ac92e3f928771b56572ac93ef0154e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "7d8b170c77c90552f75573996daf7d7e6435be0f5ed785cbe1945247eec00d5a",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001427f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001430a7f000000000000000000000000000000000000000000000000000000000000000106813b375560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1639312514"
+                "0x61b5ec82"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest170.json b/GeneralStateTests/stRandom/randomStatetest170.json
index dd26604dd..84a6b55db 100644
--- a/GeneralStateTests/stRandom/randomStatetest170.json
+++ b/GeneralStateTests/stRandom/randomStatetest170.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest170" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "667c440334c129c625965bba816971a7ee40d83ce0005fab936f4ee6d12214d8",
+                    "hash" : "0x667c440334c129c625965bba816971a7ee40d83ce0005fab936f4ee6d12214d8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "667c440334c129c625965bba816971a7ee40d83ce0005fab936f4ee6d12214d8",
+                    "hash" : "0x667c440334c129c625965bba816971a7ee40d83ce0005fab936f4ee6d12214d8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "972180d2364e9221835b72a691de8d60022bbe9e803f787189b4bd01ec80ed04",
+                    "hash" : "0x972180d2364e9221835b72a691de8d60022bbe9e803f787189b4bd01ec80ed04",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "972180d2364e9221835b72a691de8d60022bbe9e803f787189b4bd01ec80ed04",
+                    "hash" : "0x972180d2364e9221835b72a691de8d60022bbe9e803f787189b4bd01ec80ed04",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "667c440334c129c625965bba816971a7ee40d83ce0005fab936f4ee6d12214d8",
+                    "hash" : "0x667c440334c129c625965bba816971a7ee40d83ce0005fab936f4ee6d12214d8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "04fdf576eb44698e2f838c29d9bc0d0de446d98dce824d5d23b62098e233a840",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x4445413155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest171.json b/GeneralStateTests/stRandom/randomStatetest171.json
index d954211f9..e5c76d513 100644
--- a/GeneralStateTests/stRandom/randomStatetest171.json
+++ b/GeneralStateTests/stRandom/randomStatetest171.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest171" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "fe459a91926fc4812fbfc2049af9eb19105b69912799a5af28d799aba9c0fd02",
+                    "hash" : "0xfe459a91926fc4812fbfc2049af9eb19105b69912799a5af28d799aba9c0fd02",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "fe459a91926fc4812fbfc2049af9eb19105b69912799a5af28d799aba9c0fd02",
+                    "hash" : "0xfe459a91926fc4812fbfc2049af9eb19105b69912799a5af28d799aba9c0fd02",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "fe459a91926fc4812fbfc2049af9eb19105b69912799a5af28d799aba9c0fd02",
+                    "hash" : "0xfe459a91926fc4812fbfc2049af9eb19105b69912799a5af28d799aba9c0fd02",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "fe459a91926fc4812fbfc2049af9eb19105b69912799a5af28d799aba9c0fd02",
+                    "hash" : "0xfe459a91926fc4812fbfc2049af9eb19105b69912799a5af28d799aba9c0fd02",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "fe459a91926fc4812fbfc2049af9eb19105b69912799a5af28d799aba9c0fd02",
+                    "hash" : "0xfe459a91926fc4812fbfc2049af9eb19105b69912799a5af28d799aba9c0fd02",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "fe459a91926fc4812fbfc2049af9eb19105b69912799a5af28d799aba9c0fd02",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c350437f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5197ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe095560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1726364132"
+                "0x66e639e4"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest172.json b/GeneralStateTests/stRandom/randomStatetest172.json
index 6c3e599d4..efaa04480 100644
--- a/GeneralStateTests/stRandom/randomStatetest172.json
+++ b/GeneralStateTests/stRandom/randomStatetest172.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest172" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a0150b6a8a102e4b4ce08e818dc0bcfd9c29085dd6b57e42a67dce61a0bc234b",
+                    "hash" : "0xa0150b6a8a102e4b4ce08e818dc0bcfd9c29085dd6b57e42a67dce61a0bc234b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a0150b6a8a102e4b4ce08e818dc0bcfd9c29085dd6b57e42a67dce61a0bc234b",
+                    "hash" : "0xa0150b6a8a102e4b4ce08e818dc0bcfd9c29085dd6b57e42a67dce61a0bc234b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a0150b6a8a102e4b4ce08e818dc0bcfd9c29085dd6b57e42a67dce61a0bc234b",
+                    "hash" : "0xa0150b6a8a102e4b4ce08e818dc0bcfd9c29085dd6b57e42a67dce61a0bc234b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a0150b6a8a102e4b4ce08e818dc0bcfd9c29085dd6b57e42a67dce61a0bc234b",
+                    "hash" : "0xa0150b6a8a102e4b4ce08e818dc0bcfd9c29085dd6b57e42a67dce61a0bc234b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a0150b6a8a102e4b4ce08e818dc0bcfd9c29085dd6b57e42a67dce61a0bc234b",
+                    "hash" : "0xa0150b6a8a102e4b4ce08e818dc0bcfd9c29085dd6b57e42a67dce61a0bc234b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "a0150b6a8a102e4b4ce08e818dc0bcfd9c29085dd6b57e42a67dce61a0bc234b",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0960005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "354059144"
+                "0x151a8388"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest173.json b/GeneralStateTests/stRandom/randomStatetest173.json
index 34686e9c2..dbcabd929 100644
--- a/GeneralStateTests/stRandom/randomStatetest173.json
+++ b/GeneralStateTests/stRandom/randomStatetest173.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest173" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "81c13a0589b8429b662c2f0b26b986497e229410db5c48dbbe735d5c0675cce3",
+                    "hash" : "0x81c13a0589b8429b662c2f0b26b986497e229410db5c48dbbe735d5c0675cce3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "81c13a0589b8429b662c2f0b26b986497e229410db5c48dbbe735d5c0675cce3",
+                    "hash" : "0x81c13a0589b8429b662c2f0b26b986497e229410db5c48dbbe735d5c0675cce3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a6a2fc29db027bfc0c7769731aa05f5b5646316a81375cbb1eb62d19ef56c1a6",
+                    "hash" : "0xa6a2fc29db027bfc0c7769731aa05f5b5646316a81375cbb1eb62d19ef56c1a6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a6a2fc29db027bfc0c7769731aa05f5b5646316a81375cbb1eb62d19ef56c1a6",
+                    "hash" : "0xa6a2fc29db027bfc0c7769731aa05f5b5646316a81375cbb1eb62d19ef56c1a6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "81c13a0589b8429b662c2f0b26b986497e229410db5c48dbbe735d5c0675cce3",
+                    "hash" : "0x81c13a0589b8429b662c2f0b26b986497e229410db5c48dbbe735d5c0675cce3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "a6a2fc29db027bfc0c7769731aa05f5b5646316a81375cbb1eb62d19ef56c1a6",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001447fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b509ff979443703ca35560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1285346393"
+                "0x4c9cd459"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest174.json b/GeneralStateTests/stRandom/randomStatetest174.json
index f98b890dc..9a92e6071 100644
--- a/GeneralStateTests/stRandom/randomStatetest174.json
+++ b/GeneralStateTests/stRandom/randomStatetest174.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest174" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a20fbc90c81796bde809669fc82c96bac3658e6e819ca866ce636f1609d803a7",
+                    "hash" : "0xa20fbc90c81796bde809669fc82c96bac3658e6e819ca866ce636f1609d803a7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a20fbc90c81796bde809669fc82c96bac3658e6e819ca866ce636f1609d803a7",
+                    "hash" : "0xa20fbc90c81796bde809669fc82c96bac3658e6e819ca866ce636f1609d803a7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a20fbc90c81796bde809669fc82c96bac3658e6e819ca866ce636f1609d803a7",
+                    "hash" : "0xa20fbc90c81796bde809669fc82c96bac3658e6e819ca866ce636f1609d803a7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a20fbc90c81796bde809669fc82c96bac3658e6e819ca866ce636f1609d803a7",
+                    "hash" : "0xa20fbc90c81796bde809669fc82c96bac3658e6e819ca866ce636f1609d803a7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a20fbc90c81796bde809669fc82c96bac3658e6e819ca866ce636f1609d803a7",
+                    "hash" : "0xa20fbc90c81796bde809669fc82c96bac3658e6e819ca866ce636f1609d803a7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "80031762584d8f082da0ae0e4fe2898198897f08d0a3499a7c6099d376ea389a",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x434155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest175.json b/GeneralStateTests/stRandom/randomStatetest175.json
index 65a65a699..8f2c73727 100644
--- a/GeneralStateTests/stRandom/randomStatetest175.json
+++ b/GeneralStateTests/stRandom/randomStatetest175.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest175" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "17936ba7e7d066c0303e4fed891734ea1c10eebd28515324a22f326d474aa9a6",
+                    "hash" : "0x17936ba7e7d066c0303e4fed891734ea1c10eebd28515324a22f326d474aa9a6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "17936ba7e7d066c0303e4fed891734ea1c10eebd28515324a22f326d474aa9a6",
+                    "hash" : "0x17936ba7e7d066c0303e4fed891734ea1c10eebd28515324a22f326d474aa9a6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "17936ba7e7d066c0303e4fed891734ea1c10eebd28515324a22f326d474aa9a6",
+                    "hash" : "0x17936ba7e7d066c0303e4fed891734ea1c10eebd28515324a22f326d474aa9a6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "17936ba7e7d066c0303e4fed891734ea1c10eebd28515324a22f326d474aa9a6",
+                    "hash" : "0x17936ba7e7d066c0303e4fed891734ea1c10eebd28515324a22f326d474aa9a6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "17936ba7e7d066c0303e4fed891734ea1c10eebd28515324a22f326d474aa9a6",
+                    "hash" : "0x17936ba7e7d066c0303e4fed891734ea1c10eebd28515324a22f326d474aa9a6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "17936ba7e7d066c0303e4fed891734ea1c10eebd28515324a22f326d474aa9a6",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3506f6985f2837e09689844171a0235833c5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "2139752886"
+                "0x7f8a09b6"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest176.json b/GeneralStateTests/stRandom/randomStatetest176.json
index eac331546..7e0c82948 100644
--- a/GeneralStateTests/stRandom/randomStatetest176.json
+++ b/GeneralStateTests/stRandom/randomStatetest176.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest176" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "66980db101b2e820fdc3418ff5b01df768fcc0a3f1f21c8b089f5c5b3e9f2a8b",
+                    "hash" : "0x66980db101b2e820fdc3418ff5b01df768fcc0a3f1f21c8b089f5c5b3e9f2a8b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "66980db101b2e820fdc3418ff5b01df768fcc0a3f1f21c8b089f5c5b3e9f2a8b",
+                    "hash" : "0x66980db101b2e820fdc3418ff5b01df768fcc0a3f1f21c8b089f5c5b3e9f2a8b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "66980db101b2e820fdc3418ff5b01df768fcc0a3f1f21c8b089f5c5b3e9f2a8b",
+                    "hash" : "0x66980db101b2e820fdc3418ff5b01df768fcc0a3f1f21c8b089f5c5b3e9f2a8b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "66980db101b2e820fdc3418ff5b01df768fcc0a3f1f21c8b089f5c5b3e9f2a8b",
+                    "hash" : "0x66980db101b2e820fdc3418ff5b01df768fcc0a3f1f21c8b089f5c5b3e9f2a8b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "66980db101b2e820fdc3418ff5b01df768fcc0a3f1f21c8b089f5c5b3e9f2a8b",
+                    "hash" : "0x66980db101b2e820fdc3418ff5b01df768fcc0a3f1f21c8b089f5c5b3e9f2a8b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "66980db101b2e820fdc3418ff5b01df768fcc0a3f1f21c8b089f5c5b3e9f2a8b",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x327fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350427f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff041469988517f6889d92799e74664160005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "242920391"
+                "0x0e7aabc7"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest177.json b/GeneralStateTests/stRandom/randomStatetest177.json
index d04ece03e..1eeb1089a 100644
--- a/GeneralStateTests/stRandom/randomStatetest177.json
+++ b/GeneralStateTests/stRandom/randomStatetest177.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest177" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "35be6da6c9ec9648acf14171b9d9a2798a7143ba751a2374c3c2678452e2c0de",
+                    "hash" : "0x35be6da6c9ec9648acf14171b9d9a2798a7143ba751a2374c3c2678452e2c0de",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "35be6da6c9ec9648acf14171b9d9a2798a7143ba751a2374c3c2678452e2c0de",
+                    "hash" : "0x35be6da6c9ec9648acf14171b9d9a2798a7143ba751a2374c3c2678452e2c0de",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "35be6da6c9ec9648acf14171b9d9a2798a7143ba751a2374c3c2678452e2c0de",
+                    "hash" : "0x35be6da6c9ec9648acf14171b9d9a2798a7143ba751a2374c3c2678452e2c0de",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "35be6da6c9ec9648acf14171b9d9a2798a7143ba751a2374c3c2678452e2c0de",
+                    "hash" : "0x35be6da6c9ec9648acf14171b9d9a2798a7143ba751a2374c3c2678452e2c0de",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "35be6da6c9ec9648acf14171b9d9a2798a7143ba751a2374c3c2678452e2c0de",
+                    "hash" : "0x35be6da6c9ec9648acf14171b9d9a2798a7143ba751a2374c3c2678452e2c0de",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "35be6da6c9ec9648acf14171b9d9a2798a7143ba751a2374c3c2678452e2c0de",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7e24654d920bee1c2af8b3225f6035ea04b87e1d3f2486057268ed05d8d6e5a67f3da4409848b450c9ab9713bf10ec5124e50fda175accc13d0db75bbc03a25a066d85332a97eae6e7219bc62ce53f23690f1df7f7b11c1659165b7c438533bc1f73a59ae2c28e633d8c971763576dd25386518678a15c64a2682c68bf3c1a7433af2e6dd0276f494254235fe7b28b1f997661eba4767c05f37a8b9b7980106e2bbe8744bed6d0f782ac6a99e07d9486451ab20e48c9e99f083973d5a10a57f4c3e7e3fa3bfd63a39006f35f7325ae8b67348d74c87e78d6dc699541fdf8d085697e58b02f9fef3f78554901cc888449b92fe07e74fb3069f7be725f408005886e73e720275f04f63284f6f10b6df25694b3a55936d06ed8c18d03d868d30b7766bd0d6a111f734650113a9f6b31ef3be38904ccd66a304bbf877e9d6ccc3e98fa65a685b0bf181c6dd67c9db728914ff2977b8c19193f67b9053f72c819b5bc5542945bd6a9079965d91f47a11f3862d346cb6b70d29eca71b0d12d01996b89763f13059617d671ddc626d93a3e3fda99999484470e34277f9ac904a6be6b8b9f0a91e98e2759a946222e419d34089491db069bbeeea7d19868e6fef55cd7440fbbdd7bf7cab153de2f407fc2c1f51952d5d5388159f73c98deb0a3f75d04eb70cee4f3dd886b6ba2ab3d1e110db841c50767a4e0ed4abca1bd1d6688861c4bb169fa8b63d253f1a4636a3979396965ae9c16c2197c57851d68f1ee6fff3c92e794d07cc6d2f5b964448fee1c3f52921cd138bfe26f57a3ce26ae8e622c80fcfb7f414b5750048e67dd2c715bdf907a881ef7a77dc8b166b413ebb4261bda628c26666d7ec3d2d20bdc7e117960da38d995574327fc1b63764875b839f395793a937b5f2793db93b23b7160bb44cf7bf515a85769d5f51851260f073969b185817c3e5b658753947f6ae534b0e68afa57a476ff52028737e7d342c1ddc7c5dc786fe6216838882c6f6e8519b16b2d9451ea2f048765576af461aab462031f6a64f0ae07fa9a64d4772252eb9e6aa14429a7e2a1d43482699065e44695fbea176d63d01d22231d221b6f8dfda47f5164a47454ab396f17257ddec269f67ed7c6d17ffac1c61372aaf587427eee43772c5f28fde9d395b65bf2d77e4eaa635bea61396414a53508797e2506ed2f921f29bf2fda1796f4396c4edb6f6ecc6d79fd82d9838a512df1454ce72268d8a32e0971c718b6836e4bcb788766f266a3edfdd24686274f684c4b0a7fd7082159766f4670a09a9e231bf61fe5f955a75b8870744ec89c81940d46be921c40917862e1c186679f354a704fd5537ceb310616acf9779c43c8f585c064fafa775d279d62aec380625fc16d601ef067eddffdf0f1359f386970fe2eb95c063421601a7a5f9256a6398651be88998deb83d16edd603992a27f758bda8c1bf974e49a52cf19c9bc32a79db4778535677e3caeae7f2f6ac54f147d2729c30d694bcb622c13106c3382d4c27bc4ee55eadb4921d97965e605bd3daa1c233230119dce876049813474dc4b3ec1d0ea8d73d182beb19cd3c8f198578d863907a60fd633a65872d93e47dc134fc815d9800bad3f2d58bb97b5776f42800f1f182951ba5aced03a7c3abd859969483189606297788fbf5565010d13f07077752867293dbfe29b7346020ef70d18cacd7508ccb3731b39",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,8 +96,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x72f740ab"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest178.json b/GeneralStateTests/stRandom/randomStatetest178.json
index 555ac67c7..57197e216 100644
--- a/GeneralStateTests/stRandom/randomStatetest178.json
+++ b/GeneralStateTests/stRandom/randomStatetest178.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest178" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
             {
@@ -24,7 +24,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "cdd6ba6ff4c86bb41a0f085d755fba7298503822e55a705debc543a91b4328a5",
+                    "hash" : "0xcdd6ba6ff4c86bb41a0f085d755fba7298503822e55a705debc543a91b4328a5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "cdd6ba6ff4c86bb41a0f085d755fba7298503822e55a705debc543a91b4328a5",
+                    "hash" : "0xcdd6ba6ff4c86bb41a0f085d755fba7298503822e55a705debc543a91b4328a5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6d68155b52ba65e9d30aa550a76d891125522e06055e44caf525b35f64ad7789",
+                    "hash" : "0x6d68155b52ba65e9d30aa550a76d891125522e06055e44caf525b35f64ad7789",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6d68155b52ba65e9d30aa550a76d891125522e06055e44caf525b35f64ad7789",
+                    "hash" : "0x6d68155b52ba65e9d30aa550a76d891125522e06055e44caf525b35f64ad7789",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -64,7 +64,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "cdd6ba6ff4c86bb41a0f085d755fba7298503822e55a705debc543a91b4328a5",
+                    "hash" : "0xcdd6ba6ff4c86bb41a0f085d755fba7298503822e55a705debc543a91b4328a5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -75,23 +75,23 @@
         },
         "postStateRoot" : "6d68155b52ba65e9d30aa550a76d891125522e06055e44caf525b35f64ad7789",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7d342beabe599e4bc177fd97d36df48d50650ba6129a9a83d4cf809ec21452357c620167f530c3265be9887f6e5b8186decdc00a6a801e5f56dd8d9d36a4806dbccc299e4bbf46ad577e25b5b1fc76b6999cb23a6a03c4035e36b8494135ee170647395da00b6e0a64c43f3358b8bdcf593c89fb70b865ef153b5195c77959256beb4f932095eb8ac80bc2c050f6f550a362aac77f5c4b197151df039d64b77dca22eb8fd4b8cf50fb85a36f1d909d1919a47fe97de5526726b4a47b866b7b13471056439457cd7cbc5060d978056ff5dd24a1f49e50b9f5924f473b2dc5306d67054ca575d0603e616291a3601460106009601f6338a57ddc73095e7baea6a6c7c4c2dfeb977efac326af552d87630e3319c8f133",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -106,8 +106,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x6f33bb2d"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest179.json b/GeneralStateTests/stRandom/randomStatetest179.json
index ac2998996..3f4bacaa6 100644
--- a/GeneralStateTests/stRandom/randomStatetest179.json
+++ b/GeneralStateTests/stRandom/randomStatetest179.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest179" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "979443162d328c546cb8d04f07c27cf4dba0b9bb680145a50ab7469fa89949f7",
+                    "hash" : "0x979443162d328c546cb8d04f07c27cf4dba0b9bb680145a50ab7469fa89949f7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "979443162d328c546cb8d04f07c27cf4dba0b9bb680145a50ab7469fa89949f7",
+                    "hash" : "0x979443162d328c546cb8d04f07c27cf4dba0b9bb680145a50ab7469fa89949f7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "979443162d328c546cb8d04f07c27cf4dba0b9bb680145a50ab7469fa89949f7",
+                    "hash" : "0x979443162d328c546cb8d04f07c27cf4dba0b9bb680145a50ab7469fa89949f7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "979443162d328c546cb8d04f07c27cf4dba0b9bb680145a50ab7469fa89949f7",
+                    "hash" : "0x979443162d328c546cb8d04f07c27cf4dba0b9bb680145a50ab7469fa89949f7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "979443162d328c546cb8d04f07c27cf4dba0b9bb680145a50ab7469fa89949f7",
+                    "hash" : "0x979443162d328c546cb8d04f07c27cf4dba0b9bb680145a50ab7469fa89949f7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "979443162d328c546cb8d04f07c27cf4dba0b9bb680145a50ab7469fa89949f7",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3506f515480126a50a173506e06676212925560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1584198892"
+                "0x5e6cf4ec"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest18.json b/GeneralStateTests/stRandom/randomStatetest18.json
index 1fac6952c..ba0fd7fea 100644
--- a/GeneralStateTests/stRandom/randomStatetest18.json
+++ b/GeneralStateTests/stRandom/randomStatetest18.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest18" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "83d3dca909b55515e4a851828b28e38cac53e65c0db3b53997a2c0dda1222de7",
+                    "hash" : "0x83d3dca909b55515e4a851828b28e38cac53e65c0db3b53997a2c0dda1222de7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "83d3dca909b55515e4a851828b28e38cac53e65c0db3b53997a2c0dda1222de7",
+                    "hash" : "0x83d3dca909b55515e4a851828b28e38cac53e65c0db3b53997a2c0dda1222de7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "83d3dca909b55515e4a851828b28e38cac53e65c0db3b53997a2c0dda1222de7",
+                    "hash" : "0x83d3dca909b55515e4a851828b28e38cac53e65c0db3b53997a2c0dda1222de7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "83d3dca909b55515e4a851828b28e38cac53e65c0db3b53997a2c0dda1222de7",
+                    "hash" : "0x83d3dca909b55515e4a851828b28e38cac53e65c0db3b53997a2c0dda1222de7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "83d3dca909b55515e4a851828b28e38cac53e65c0db3b53997a2c0dda1222de7",
+                    "hash" : "0x83d3dca909b55515e4a851828b28e38cac53e65c0db3b53997a2c0dda1222de7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "83d3dca909b55515e4a851828b28e38cac53e65c0db3b53997a2c0dda1222de7",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001077f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3504419860b9754998d503105a033436e67133a60005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,8 +96,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x6ec35ec4"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest180.json b/GeneralStateTests/stRandom/randomStatetest180.json
index e5dc05283..d29bee742 100644
--- a/GeneralStateTests/stRandom/randomStatetest180.json
+++ b/GeneralStateTests/stRandom/randomStatetest180.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest180" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "5b8ba0872e8d65efc0279023f0867fba0d70fdf5c4d81b122ac307c2c1ddcfd9",
+                    "hash" : "0x5b8ba0872e8d65efc0279023f0867fba0d70fdf5c4d81b122ac307c2c1ddcfd9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "5b8ba0872e8d65efc0279023f0867fba0d70fdf5c4d81b122ac307c2c1ddcfd9",
+                    "hash" : "0x5b8ba0872e8d65efc0279023f0867fba0d70fdf5c4d81b122ac307c2c1ddcfd9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5b8ba0872e8d65efc0279023f0867fba0d70fdf5c4d81b122ac307c2c1ddcfd9",
+                    "hash" : "0x5b8ba0872e8d65efc0279023f0867fba0d70fdf5c4d81b122ac307c2c1ddcfd9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5b8ba0872e8d65efc0279023f0867fba0d70fdf5c4d81b122ac307c2c1ddcfd9",
+                    "hash" : "0x5b8ba0872e8d65efc0279023f0867fba0d70fdf5c4d81b122ac307c2c1ddcfd9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "5b8ba0872e8d65efc0279023f0867fba0d70fdf5c4d81b122ac307c2c1ddcfd9",
+                    "hash" : "0x5b8ba0872e8d65efc0279023f0867fba0d70fdf5c4d81b122ac307c2c1ddcfd9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "5b8ba0872e8d65efc0279023f0867fba0d70fdf5c4d81b122ac307c2c1ddcfd9",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001447f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b56f11576b693c128a9e0820609c050a219d60005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "566466109"
+                "0x21c3963d"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest181.json b/GeneralStateTests/stRandom/randomStatetest181.json
index 913dcd543..09dad08ce 100644
--- a/GeneralStateTests/stRandom/randomStatetest181.json
+++ b/GeneralStateTests/stRandom/randomStatetest181.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest181" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "05ba3d178ed6a21cb7e24be962e74f0aa26135bd5d01e50909fcf24fa46952bf",
+                    "hash" : "0x05ba3d178ed6a21cb7e24be962e74f0aa26135bd5d01e50909fcf24fa46952bf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "05ba3d178ed6a21cb7e24be962e74f0aa26135bd5d01e50909fcf24fa46952bf",
+                    "hash" : "0x05ba3d178ed6a21cb7e24be962e74f0aa26135bd5d01e50909fcf24fa46952bf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "05ba3d178ed6a21cb7e24be962e74f0aa26135bd5d01e50909fcf24fa46952bf",
+                    "hash" : "0x05ba3d178ed6a21cb7e24be962e74f0aa26135bd5d01e50909fcf24fa46952bf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "05ba3d178ed6a21cb7e24be962e74f0aa26135bd5d01e50909fcf24fa46952bf",
+                    "hash" : "0x05ba3d178ed6a21cb7e24be962e74f0aa26135bd5d01e50909fcf24fa46952bf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "05ba3d178ed6a21cb7e24be962e74f0aa26135bd5d01e50909fcf24fa46952bf",
+                    "hash" : "0x05ba3d178ed6a21cb7e24be962e74f0aa26135bd5d01e50909fcf24fa46952bf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "57b381c94365a20bcfb0433db5fc1f39bc7d09ab0247cd6f9a2a419122c7871f",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000000427f0000000000000000000000010000000000000000000000000000000000000000407f00000000000000000000000000000000000000000000000000000000000000014253593560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1846640183"
+                "0x6e117e37"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest182.json b/GeneralStateTests/stRandom/randomStatetest182.json
index 519505ef7..62e25fd51 100644
--- a/GeneralStateTests/stRandom/randomStatetest182.json
+++ b/GeneralStateTests/stRandom/randomStatetest182.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest182" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a76cbacff9a0fb5a37bdcf2d4a8e5000ce7ba709612b64dc7ab0be2ed1a44319",
+                    "hash" : "0xa76cbacff9a0fb5a37bdcf2d4a8e5000ce7ba709612b64dc7ab0be2ed1a44319",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a76cbacff9a0fb5a37bdcf2d4a8e5000ce7ba709612b64dc7ab0be2ed1a44319",
+                    "hash" : "0xa76cbacff9a0fb5a37bdcf2d4a8e5000ce7ba709612b64dc7ab0be2ed1a44319",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a76cbacff9a0fb5a37bdcf2d4a8e5000ce7ba709612b64dc7ab0be2ed1a44319",
+                    "hash" : "0xa76cbacff9a0fb5a37bdcf2d4a8e5000ce7ba709612b64dc7ab0be2ed1a44319",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a76cbacff9a0fb5a37bdcf2d4a8e5000ce7ba709612b64dc7ab0be2ed1a44319",
+                    "hash" : "0xa76cbacff9a0fb5a37bdcf2d4a8e5000ce7ba709612b64dc7ab0be2ed1a44319",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a76cbacff9a0fb5a37bdcf2d4a8e5000ce7ba709612b64dc7ab0be2ed1a44319",
+                    "hash" : "0xa76cbacff9a0fb5a37bdcf2d4a8e5000ce7ba709612b64dc7ab0be2ed1a44319",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "6894ac6795fe51e89b21e25e17f4f566e7a4105a39d5958d852679001251c9ee",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe60600943608f5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "14637807"
+                "0xdf5aef"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest183.json b/GeneralStateTests/stRandom/randomStatetest183.json
index 3ba5b7728..8b9679dbc 100644
--- a/GeneralStateTests/stRandom/randomStatetest183.json
+++ b/GeneralStateTests/stRandom/randomStatetest183.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest183" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "aca7cdeac06aeb692d6a82ee2d4c46b5e0817b2c65351183b0f56f0706d7685d",
+                    "hash" : "0xaca7cdeac06aeb692d6a82ee2d4c46b5e0817b2c65351183b0f56f0706d7685d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "aca7cdeac06aeb692d6a82ee2d4c46b5e0817b2c65351183b0f56f0706d7685d",
+                    "hash" : "0xaca7cdeac06aeb692d6a82ee2d4c46b5e0817b2c65351183b0f56f0706d7685d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "aca7cdeac06aeb692d6a82ee2d4c46b5e0817b2c65351183b0f56f0706d7685d",
+                    "hash" : "0xaca7cdeac06aeb692d6a82ee2d4c46b5e0817b2c65351183b0f56f0706d7685d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "aca7cdeac06aeb692d6a82ee2d4c46b5e0817b2c65351183b0f56f0706d7685d",
+                    "hash" : "0xaca7cdeac06aeb692d6a82ee2d4c46b5e0817b2c65351183b0f56f0706d7685d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "aca7cdeac06aeb692d6a82ee2d4c46b5e0817b2c65351183b0f56f0706d7685d",
+                    "hash" : "0xaca7cdeac06aeb692d6a82ee2d4c46b5e0817b2c65351183b0f56f0706d7685d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "aca7cdeac06aeb692d6a82ee2d4c46b5e0817b2c65351183b0f56f0706d7685d",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5436f4134547075687854849d7b646586305560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1159080385"
+                "0x451629c1"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest184.json b/GeneralStateTests/stRandom/randomStatetest184.json
index e5dcbceda..01aca6e1a 100644
--- a/GeneralStateTests/stRandom/randomStatetest184.json
+++ b/GeneralStateTests/stRandom/randomStatetest184.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest184" : {
         "env" : {
-            "currentCoinbase" : "6d6e40885310545835a5b582dbc23ef026404bda",
+            "currentCoinbase" : "0x6d6e40885310545835a5b582dbc23ef026404bda",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x2b7fe66d",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x2710",
-            "previousHash" : "a8228e05d900b890136bcc55628b479e172795042a90e18b673189b5f3a672fc"
+            "previousHash" : "0xa8228e05d900b890136bcc55628b479e172795042a90e18b673189b5f3a672fc"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f95be1e4c7788641348454fd9ff7b21956f61a979e8d7f8e55cec444c5931e8c",
+                    "hash" : "0xf95be1e4c7788641348454fd9ff7b21956f61a979e8d7f8e55cec444c5931e8c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f95be1e4c7788641348454fd9ff7b21956f61a979e8d7f8e55cec444c5931e8c",
+                    "hash" : "0xf95be1e4c7788641348454fd9ff7b21956f61a979e8d7f8e55cec444c5931e8c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f95be1e4c7788641348454fd9ff7b21956f61a979e8d7f8e55cec444c5931e8c",
+                    "hash" : "0xf95be1e4c7788641348454fd9ff7b21956f61a979e8d7f8e55cec444c5931e8c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f95be1e4c7788641348454fd9ff7b21956f61a979e8d7f8e55cec444c5931e8c",
+                    "hash" : "0xf95be1e4c7788641348454fd9ff7b21956f61a979e8d7f8e55cec444c5931e8c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f95be1e4c7788641348454fd9ff7b21956f61a979e8d7f8e55cec444c5931e8c",
+                    "hash" : "0xf95be1e4c7788641348454fd9ff7b21956f61a979e8d7f8e55cec444c5931e8c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "f95be1e4c7788641348454fd9ff7b21956f61a979e8d7f8e55cec444c5931e8c",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x070a217c02c8f2d4",
                 "code" : "0x6f823a02877cef7c1afb60663009def564608c557bad2ae05769b991313726edbfa0881d9cc955b0f5154751da315696ea7ce130184b64f2507582c502d450349ff24fb8aeb2a46146687b666bd7bd0364946cb720c76d483f5afea0049251fd9793c4b0376afbb4ebcdc42fdd42edcd4b619cec787638009cea26a1abe570e3186ab790b7dc7db36e4cda2570b0847adf6e39579c7c43a4ac976cd507d493cdfaebe09936078e31c71c4665d34a4b816b8004",
                 "nonce" : "0x75",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x9740421ff0ff3ae3",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x1d",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xc1142f2b8e8eb058",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,8 +96,8 @@
             ],
             "gasPrice" : "0x1c",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x6d1dd024"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest185.json b/GeneralStateTests/stRandom/randomStatetest185.json
index f66713b6d..af69ba457 100644
--- a/GeneralStateTests/stRandom/randomStatetest185.json
+++ b/GeneralStateTests/stRandom/randomStatetest185.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest185" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
             {
@@ -24,7 +24,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b6c678eb2e9a6f91c61482bc0bc4ceb8a34def5f8e9e77d1074c117013575d1b",
+                    "hash" : "0xb6c678eb2e9a6f91c61482bc0bc4ceb8a34def5f8e9e77d1074c117013575d1b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b6c678eb2e9a6f91c61482bc0bc4ceb8a34def5f8e9e77d1074c117013575d1b",
+                    "hash" : "0xb6c678eb2e9a6f91c61482bc0bc4ceb8a34def5f8e9e77d1074c117013575d1b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b6c678eb2e9a6f91c61482bc0bc4ceb8a34def5f8e9e77d1074c117013575d1b",
+                    "hash" : "0xb6c678eb2e9a6f91c61482bc0bc4ceb8a34def5f8e9e77d1074c117013575d1b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b6c678eb2e9a6f91c61482bc0bc4ceb8a34def5f8e9e77d1074c117013575d1b",
+                    "hash" : "0xb6c678eb2e9a6f91c61482bc0bc4ceb8a34def5f8e9e77d1074c117013575d1b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -64,7 +64,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b6c678eb2e9a6f91c61482bc0bc4ceb8a34def5f8e9e77d1074c117013575d1b",
+                    "hash" : "0xb6c678eb2e9a6f91c61482bc0bc4ceb8a34def5f8e9e77d1074c117013575d1b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -75,23 +75,23 @@
         },
         "postStateRoot" : "b6c678eb2e9a6f91c61482bc0bc4ceb8a34def5f8e9e77d1074c117013575d1b",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff411a7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000000162805a8d3aa3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -106,10 +106,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1159525186"
+                "0x451cf342"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest186.json b/GeneralStateTests/stRandom/randomStatetest186.json
index ff7adc2a4..e90a4fab2 100644
--- a/GeneralStateTests/stRandom/randomStatetest186.json
+++ b/GeneralStateTests/stRandom/randomStatetest186.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest186" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6e959672703a8133cac3eeb581c3444c2b9e410fcab1892e4ba3b9793e592f1f",
+                    "hash" : "0x6e959672703a8133cac3eeb581c3444c2b9e410fcab1892e4ba3b9793e592f1f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6e959672703a8133cac3eeb581c3444c2b9e410fcab1892e4ba3b9793e592f1f",
+                    "hash" : "0x6e959672703a8133cac3eeb581c3444c2b9e410fcab1892e4ba3b9793e592f1f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "38a90d22b568f46debea6a43b2797d30deebe1275c54994b0d98aecd54abad74",
+                    "hash" : "0x38a90d22b568f46debea6a43b2797d30deebe1275c54994b0d98aecd54abad74",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "38a90d22b568f46debea6a43b2797d30deebe1275c54994b0d98aecd54abad74",
+                    "hash" : "0x38a90d22b568f46debea6a43b2797d30deebe1275c54994b0d98aecd54abad74",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6e959672703a8133cac3eeb581c3444c2b9e410fcab1892e4ba3b9793e592f1f",
+                    "hash" : "0x6e959672703a8133cac3eeb581c3444c2b9e410fcab1892e4ba3b9793e592f1f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "3ad979f420fe31052177c7d9b16c5b5e0e70cd4680e1a9603aeb5b5d7dc97a08",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x45454340424244444131599455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest187.json b/GeneralStateTests/stRandom/randomStatetest187.json
index 20a179dc5..a53264dcf 100644
--- a/GeneralStateTests/stRandom/randomStatetest187.json
+++ b/GeneralStateTests/stRandom/randomStatetest187.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest187" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9493b52cb370a32b423bd65a009758edba290000d5d10c05ffcbfadad6541391",
+                    "hash" : "0x9493b52cb370a32b423bd65a009758edba290000d5d10c05ffcbfadad6541391",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9493b52cb370a32b423bd65a009758edba290000d5d10c05ffcbfadad6541391",
+                    "hash" : "0x9493b52cb370a32b423bd65a009758edba290000d5d10c05ffcbfadad6541391",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9493b52cb370a32b423bd65a009758edba290000d5d10c05ffcbfadad6541391",
+                    "hash" : "0x9493b52cb370a32b423bd65a009758edba290000d5d10c05ffcbfadad6541391",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9493b52cb370a32b423bd65a009758edba290000d5d10c05ffcbfadad6541391",
+                    "hash" : "0x9493b52cb370a32b423bd65a009758edba290000d5d10c05ffcbfadad6541391",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9493b52cb370a32b423bd65a009758edba290000d5d10c05ffcbfadad6541391",
+                    "hash" : "0x9493b52cb370a32b423bd65a009758edba290000d5d10c05ffcbfadad6541391",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "9493b52cb370a32b423bd65a009758edba290000d5d10c05ffcbfadad6541391",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff457f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000006f75988036a0562096036b04518877199d60005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "925780098"
+                "0x372e4882"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest188.json b/GeneralStateTests/stRandom/randomStatetest188.json
index bda63c66d..a00ba8c80 100644
--- a/GeneralStateTests/stRandom/randomStatetest188.json
+++ b/GeneralStateTests/stRandom/randomStatetest188.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest188" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c1218271a72dee1fa981d6d570f9e767b3079e85343cf6fd36bda073066bedd9",
+                    "hash" : "0xc1218271a72dee1fa981d6d570f9e767b3079e85343cf6fd36bda073066bedd9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c1218271a72dee1fa981d6d570f9e767b3079e85343cf6fd36bda073066bedd9",
+                    "hash" : "0xc1218271a72dee1fa981d6d570f9e767b3079e85343cf6fd36bda073066bedd9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "c1218271a72dee1fa981d6d570f9e767b3079e85343cf6fd36bda073066bedd9",
+                    "hash" : "0xc1218271a72dee1fa981d6d570f9e767b3079e85343cf6fd36bda073066bedd9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c1218271a72dee1fa981d6d570f9e767b3079e85343cf6fd36bda073066bedd9",
+                    "hash" : "0xc1218271a72dee1fa981d6d570f9e767b3079e85343cf6fd36bda073066bedd9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c1218271a72dee1fa981d6d570f9e767b3079e85343cf6fd36bda073066bedd9",
+                    "hash" : "0xc1218271a72dee1fa981d6d570f9e767b3079e85343cf6fd36bda073066bedd9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "c1218271a72dee1fa981d6d570f9e767b3079e85343cf6fd36bda073066bedd9",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff817f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff4286687859f383797187945560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,8 +96,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x49195164"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest189.json b/GeneralStateTests/stRandom/randomStatetest189.json
index fd83aab52..516156298 100644
--- a/GeneralStateTests/stRandom/randomStatetest189.json
+++ b/GeneralStateTests/stRandom/randomStatetest189.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest189" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "dc7517940d60bb7c00dc93b4ae33818ee8bc2410454fa42d97d52e10d4578405",
+                    "hash" : "0xdc7517940d60bb7c00dc93b4ae33818ee8bc2410454fa42d97d52e10d4578405",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "dc7517940d60bb7c00dc93b4ae33818ee8bc2410454fa42d97d52e10d4578405",
+                    "hash" : "0xdc7517940d60bb7c00dc93b4ae33818ee8bc2410454fa42d97d52e10d4578405",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "dc7517940d60bb7c00dc93b4ae33818ee8bc2410454fa42d97d52e10d4578405",
+                    "hash" : "0xdc7517940d60bb7c00dc93b4ae33818ee8bc2410454fa42d97d52e10d4578405",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "dc7517940d60bb7c00dc93b4ae33818ee8bc2410454fa42d97d52e10d4578405",
+                    "hash" : "0xdc7517940d60bb7c00dc93b4ae33818ee8bc2410454fa42d97d52e10d4578405",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "dc7517940d60bb7c00dc93b4ae33818ee8bc2410454fa42d97d52e10d4578405",
+                    "hash" : "0xdc7517940d60bb7c00dc93b4ae33818ee8bc2410454fa42d97d52e10d4578405",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "dc7517940d60bb7c00dc93b4ae33818ee8bc2410454fa42d97d52e10d4578405",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000035900bf3740474765060005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1090808233"
+                "0x410469a9"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest19.json b/GeneralStateTests/stRandom/randomStatetest19.json
index 7dd1f0801..e52db026c 100644
--- a/GeneralStateTests/stRandom/randomStatetest19.json
+++ b/GeneralStateTests/stRandom/randomStatetest19.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest19" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "49ee22c0527664c88382f55997285699a62b944a5e9ffcb9193446a67d471564",
+                    "hash" : "0x49ee22c0527664c88382f55997285699a62b944a5e9ffcb9193446a67d471564",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "49ee22c0527664c88382f55997285699a62b944a5e9ffcb9193446a67d471564",
+                    "hash" : "0x49ee22c0527664c88382f55997285699a62b944a5e9ffcb9193446a67d471564",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "49ee22c0527664c88382f55997285699a62b944a5e9ffcb9193446a67d471564",
+                    "hash" : "0x49ee22c0527664c88382f55997285699a62b944a5e9ffcb9193446a67d471564",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "49ee22c0527664c88382f55997285699a62b944a5e9ffcb9193446a67d471564",
+                    "hash" : "0x49ee22c0527664c88382f55997285699a62b944a5e9ffcb9193446a67d471564",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "49ee22c0527664c88382f55997285699a62b944a5e9ffcb9193446a67d471564",
+                    "hash" : "0x49ee22c0527664c88382f55997285699a62b944a5e9ffcb9193446a67d471564",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "49ee22c0527664c88382f55997285699a62b944a5e9ffcb9193446a67d471564",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe3a7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe417f0000000000000000000000000000000000000000000000000000000000000001587f000000000000000000000000000000000000000000000000000000000000c3506fff59876660063b7c8df1ff088a84145560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "500004062"
+                "0x1dcd74de"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest190.json b/GeneralStateTests/stRandom/randomStatetest190.json
index 7c6ae0698..41ecbfc2a 100644
--- a/GeneralStateTests/stRandom/randomStatetest190.json
+++ b/GeneralStateTests/stRandom/randomStatetest190.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest190" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "121bcf97270c98447d15d1e604674842742526be841ff83dc9cbe051a7aec00e",
+                    "hash" : "0x121bcf97270c98447d15d1e604674842742526be841ff83dc9cbe051a7aec00e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "121bcf97270c98447d15d1e604674842742526be841ff83dc9cbe051a7aec00e",
+                    "hash" : "0x121bcf97270c98447d15d1e604674842742526be841ff83dc9cbe051a7aec00e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "121bcf97270c98447d15d1e604674842742526be841ff83dc9cbe051a7aec00e",
+                    "hash" : "0x121bcf97270c98447d15d1e604674842742526be841ff83dc9cbe051a7aec00e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "121bcf97270c98447d15d1e604674842742526be841ff83dc9cbe051a7aec00e",
+                    "hash" : "0x121bcf97270c98447d15d1e604674842742526be841ff83dc9cbe051a7aec00e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "121bcf97270c98447d15d1e604674842742526be841ff83dc9cbe051a7aec00e",
+                    "hash" : "0x121bcf97270c98447d15d1e604674842742526be841ff83dc9cbe051a7aec00e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "121bcf97270c98447d15d1e604674842742526be841ff83dc9cbe051a7aec00e",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0960005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "94912880"
+                "0x05a84170"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest191.json b/GeneralStateTests/stRandom/randomStatetest191.json
index 82f5ae40f..89f01bf71 100644
--- a/GeneralStateTests/stRandom/randomStatetest191.json
+++ b/GeneralStateTests/stRandom/randomStatetest191.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest191" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c24a8492943408a1c04903e75bd3154b4c8adecd88f1127735b2352893ed41e4",
+                    "hash" : "0xc24a8492943408a1c04903e75bd3154b4c8adecd88f1127735b2352893ed41e4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c24a8492943408a1c04903e75bd3154b4c8adecd88f1127735b2352893ed41e4",
+                    "hash" : "0xc24a8492943408a1c04903e75bd3154b4c8adecd88f1127735b2352893ed41e4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "c24a8492943408a1c04903e75bd3154b4c8adecd88f1127735b2352893ed41e4",
+                    "hash" : "0xc24a8492943408a1c04903e75bd3154b4c8adecd88f1127735b2352893ed41e4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c24a8492943408a1c04903e75bd3154b4c8adecd88f1127735b2352893ed41e4",
+                    "hash" : "0xc24a8492943408a1c04903e75bd3154b4c8adecd88f1127735b2352893ed41e4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c24a8492943408a1c04903e75bd3154b4c8adecd88f1127735b2352893ed41e4",
+                    "hash" : "0xc24a8492943408a1c04903e75bd3154b4c8adecd88f1127735b2352893ed41e4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "c24a8492943408a1c04903e75bd3154b4c8adecd88f1127735b2352893ed41e4",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000000000000000000000000000000000000000447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f678f0443457084700b645760018a105560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "385910599"
+                "0x17008747"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest192.json b/GeneralStateTests/stRandom/randomStatetest192.json
index 19226aba2..8265da0a6 100644
--- a/GeneralStateTests/stRandom/randomStatetest192.json
+++ b/GeneralStateTests/stRandom/randomStatetest192.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest192" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "65a42e14fdb1a6dfd9f85106374988042436f18c271fce9935d737cc0e6cd2bd",
+                    "hash" : "0x65a42e14fdb1a6dfd9f85106374988042436f18c271fce9935d737cc0e6cd2bd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "65a42e14fdb1a6dfd9f85106374988042436f18c271fce9935d737cc0e6cd2bd",
+                    "hash" : "0x65a42e14fdb1a6dfd9f85106374988042436f18c271fce9935d737cc0e6cd2bd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "65a42e14fdb1a6dfd9f85106374988042436f18c271fce9935d737cc0e6cd2bd",
+                    "hash" : "0x65a42e14fdb1a6dfd9f85106374988042436f18c271fce9935d737cc0e6cd2bd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "65a42e14fdb1a6dfd9f85106374988042436f18c271fce9935d737cc0e6cd2bd",
+                    "hash" : "0x65a42e14fdb1a6dfd9f85106374988042436f18c271fce9935d737cc0e6cd2bd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "65a42e14fdb1a6dfd9f85106374988042436f18c271fce9935d737cc0e6cd2bd",
+                    "hash" : "0x65a42e14fdb1a6dfd9f85106374988042436f18c271fce9935d737cc0e6cd2bd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "65a42e14fdb1a6dfd9f85106374988042436f18c271fce9935d737cc0e6cd2bd",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff347f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0460005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1168450397"
+                "0x45a5235d"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest193.json b/GeneralStateTests/stRandom/randomStatetest193.json
index cb6c76b31..8f80974c0 100644
--- a/GeneralStateTests/stRandom/randomStatetest193.json
+++ b/GeneralStateTests/stRandom/randomStatetest193.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest193" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e1d09e95a46bdcbfade26e25a3726f53eaf509a08c10b74fbfa4e215d884cec3",
+                    "hash" : "0xe1d09e95a46bdcbfade26e25a3726f53eaf509a08c10b74fbfa4e215d884cec3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e1d09e95a46bdcbfade26e25a3726f53eaf509a08c10b74fbfa4e215d884cec3",
+                    "hash" : "0xe1d09e95a46bdcbfade26e25a3726f53eaf509a08c10b74fbfa4e215d884cec3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5a205f4f5042d41ac78d9a66f9b17b57bceb29c8ad1b009ffcf9f39999aaf3a5",
+                    "hash" : "0x5a205f4f5042d41ac78d9a66f9b17b57bceb29c8ad1b009ffcf9f39999aaf3a5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5a205f4f5042d41ac78d9a66f9b17b57bceb29c8ad1b009ffcf9f39999aaf3a5",
+                    "hash" : "0x5a205f4f5042d41ac78d9a66f9b17b57bceb29c8ad1b009ffcf9f39999aaf3a5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e1d09e95a46bdcbfade26e25a3726f53eaf509a08c10b74fbfa4e215d884cec3",
+                    "hash" : "0xe1d09e95a46bdcbfade26e25a3726f53eaf509a08c10b74fbfa4e215d884cec3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "5a205f4f5042d41ac78d9a66f9b17b57bceb29c8ad1b009ffcf9f39999aaf3a5",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c350417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5ff6b4290991352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "2015499641"
+                "0x78221579"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest194.json b/GeneralStateTests/stRandom/randomStatetest194.json
index af24c9d12..f1cf0d19f 100644
--- a/GeneralStateTests/stRandom/randomStatetest194.json
+++ b/GeneralStateTests/stRandom/randomStatetest194.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest194" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "23a241ac2f0eb56bcf53100974ac24b8e6eeb569cc205d94be181471a70ba98d",
+                    "hash" : "0x23a241ac2f0eb56bcf53100974ac24b8e6eeb569cc205d94be181471a70ba98d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "23a241ac2f0eb56bcf53100974ac24b8e6eeb569cc205d94be181471a70ba98d",
+                    "hash" : "0x23a241ac2f0eb56bcf53100974ac24b8e6eeb569cc205d94be181471a70ba98d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "23a241ac2f0eb56bcf53100974ac24b8e6eeb569cc205d94be181471a70ba98d",
+                    "hash" : "0x23a241ac2f0eb56bcf53100974ac24b8e6eeb569cc205d94be181471a70ba98d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "23a241ac2f0eb56bcf53100974ac24b8e6eeb569cc205d94be181471a70ba98d",
+                    "hash" : "0x23a241ac2f0eb56bcf53100974ac24b8e6eeb569cc205d94be181471a70ba98d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "23a241ac2f0eb56bcf53100974ac24b8e6eeb569cc205d94be181471a70ba98d",
+                    "hash" : "0x23a241ac2f0eb56bcf53100974ac24b8e6eeb569cc205d94be181471a70ba98d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "23a241ac2f0eb56bcf53100974ac24b8e6eeb569cc205d94be181471a70ba98d",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff097f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b55560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "827862267"
+                "0x31582cfb"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest195.json b/GeneralStateTests/stRandom/randomStatetest195.json
index 4a88d9683..cc292b93d 100644
--- a/GeneralStateTests/stRandom/randomStatetest195.json
+++ b/GeneralStateTests/stRandom/randomStatetest195.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest195" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "2641f6f1de59bea560a7e4fe62bc91e9195c1647c16b1bd5d47a81d0f932c07c",
+                    "hash" : "0x2641f6f1de59bea560a7e4fe62bc91e9195c1647c16b1bd5d47a81d0f932c07c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "2641f6f1de59bea560a7e4fe62bc91e9195c1647c16b1bd5d47a81d0f932c07c",
+                    "hash" : "0x2641f6f1de59bea560a7e4fe62bc91e9195c1647c16b1bd5d47a81d0f932c07c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2641f6f1de59bea560a7e4fe62bc91e9195c1647c16b1bd5d47a81d0f932c07c",
+                    "hash" : "0x2641f6f1de59bea560a7e4fe62bc91e9195c1647c16b1bd5d47a81d0f932c07c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "2641f6f1de59bea560a7e4fe62bc91e9195c1647c16b1bd5d47a81d0f932c07c",
+                    "hash" : "0x2641f6f1de59bea560a7e4fe62bc91e9195c1647c16b1bd5d47a81d0f932c07c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "2641f6f1de59bea560a7e4fe62bc91e9195c1647c16b1bd5d47a81d0f932c07c",
+                    "hash" : "0x2641f6f1de59bea560a7e4fe62bc91e9195c1647c16b1bd5d47a81d0f932c07c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "2641f6f1de59bea560a7e4fe62bc91e9195c1647c16b1bd5d47a81d0f932c07c",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff097f000000000000000000000001000000000000000000000000000000000000000055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "307405855"
+                "0x1252a41f"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest196.json b/GeneralStateTests/stRandom/randomStatetest196.json
index 261e14a4c..41b1c1b56 100644
--- a/GeneralStateTests/stRandom/randomStatetest196.json
+++ b/GeneralStateTests/stRandom/randomStatetest196.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest196" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "516589e02f1f22ddf5d78e4397bf1635235e40c62ab66ce03347265b838a20fa",
+                    "hash" : "0x516589e02f1f22ddf5d78e4397bf1635235e40c62ab66ce03347265b838a20fa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "516589e02f1f22ddf5d78e4397bf1635235e40c62ab66ce03347265b838a20fa",
+                    "hash" : "0x516589e02f1f22ddf5d78e4397bf1635235e40c62ab66ce03347265b838a20fa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "d19233a2f08df5a09dc2d94ee9045507be3974f88ac4e83cf51217688465d3a2",
+                    "hash" : "0xd19233a2f08df5a09dc2d94ee9045507be3974f88ac4e83cf51217688465d3a2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "d19233a2f08df5a09dc2d94ee9045507be3974f88ac4e83cf51217688465d3a2",
+                    "hash" : "0xd19233a2f08df5a09dc2d94ee9045507be3974f88ac4e83cf51217688465d3a2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "516589e02f1f22ddf5d78e4397bf1635235e40c62ab66ce03347265b838a20fa",
+                    "hash" : "0x516589e02f1f22ddf5d78e4397bf1635235e40c62ab66ce03347265b838a20fa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "d19233a2f08df5a09dc2d94ee9045507be3974f88ac4e83cf51217688465d3a2",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe447f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000003703659c5b3a6d7b9a93543660005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "672785598"
+                "0x2819e4be"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest197.json b/GeneralStateTests/stRandom/randomStatetest197.json
index 8787bd2f3..cd9302ba3 100644
--- a/GeneralStateTests/stRandom/randomStatetest197.json
+++ b/GeneralStateTests/stRandom/randomStatetest197.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest197" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "03be16281312d1cd04b333e3102b99dbcd72c92b3e9aecb4ec1b05777f14fd14",
+                    "hash" : "0x03be16281312d1cd04b333e3102b99dbcd72c92b3e9aecb4ec1b05777f14fd14",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "03be16281312d1cd04b333e3102b99dbcd72c92b3e9aecb4ec1b05777f14fd14",
+                    "hash" : "0x03be16281312d1cd04b333e3102b99dbcd72c92b3e9aecb4ec1b05777f14fd14",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "03be16281312d1cd04b333e3102b99dbcd72c92b3e9aecb4ec1b05777f14fd14",
+                    "hash" : "0x03be16281312d1cd04b333e3102b99dbcd72c92b3e9aecb4ec1b05777f14fd14",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "03be16281312d1cd04b333e3102b99dbcd72c92b3e9aecb4ec1b05777f14fd14",
+                    "hash" : "0x03be16281312d1cd04b333e3102b99dbcd72c92b3e9aecb4ec1b05777f14fd14",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "03be16281312d1cd04b333e3102b99dbcd72c92b3e9aecb4ec1b05777f14fd14",
+                    "hash" : "0x03be16281312d1cd04b333e3102b99dbcd72c92b3e9aecb4ec1b05777f14fd14",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "03be16281312d1cd04b333e3102b99dbcd72c92b3e9aecb4ec1b05777f14fd14",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c350437f00000000000000000000000000000000000000000000000000000000000000016e6a078e5652549f57423955",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1542389267"
+                "0x5beefe13"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest198.json b/GeneralStateTests/stRandom/randomStatetest198.json
index c71f717a9..8715ebc43 100644
--- a/GeneralStateTests/stRandom/randomStatetest198.json
+++ b/GeneralStateTests/stRandom/randomStatetest198.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest198" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1855d6cbea0be125a786cc89babd5bbf27e006d49c7dd568155dd86422d60de9",
+                    "hash" : "0x1855d6cbea0be125a786cc89babd5bbf27e006d49c7dd568155dd86422d60de9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "1855d6cbea0be125a786cc89babd5bbf27e006d49c7dd568155dd86422d60de9",
+                    "hash" : "0x1855d6cbea0be125a786cc89babd5bbf27e006d49c7dd568155dd86422d60de9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "95de823e82fd518551406d5a4b6bd5f5dbb758c96eb5f94cebc4c4ce001fbcde",
+                    "hash" : "0x95de823e82fd518551406d5a4b6bd5f5dbb758c96eb5f94cebc4c4ce001fbcde",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "95de823e82fd518551406d5a4b6bd5f5dbb758c96eb5f94cebc4c4ce001fbcde",
+                    "hash" : "0x95de823e82fd518551406d5a4b6bd5f5dbb758c96eb5f94cebc4c4ce001fbcde",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "1855d6cbea0be125a786cc89babd5bbf27e006d49c7dd568155dd86422d60de9",
+                    "hash" : "0x1855d6cbea0be125a786cc89babd5bbf27e006d49c7dd568155dd86422d60de9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "95de823e82fd518551406d5a4b6bd5f5dbb758c96eb5f94cebc4c4ce001fbcde",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x42417ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09ff614044129a0169a2689415",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "968197125"
+                "0x39b58405"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest199.json b/GeneralStateTests/stRandom/randomStatetest199.json
index e5d67c663..7b96d7f3d 100644
--- a/GeneralStateTests/stRandom/randomStatetest199.json
+++ b/GeneralStateTests/stRandom/randomStatetest199.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest199" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d73e20f1c303010e95ac9d12955aec0834ac33e32c5f75cbcdc98ba212e95780",
+                    "hash" : "0xd73e20f1c303010e95ac9d12955aec0834ac33e32c5f75cbcdc98ba212e95780",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d73e20f1c303010e95ac9d12955aec0834ac33e32c5f75cbcdc98ba212e95780",
+                    "hash" : "0xd73e20f1c303010e95ac9d12955aec0834ac33e32c5f75cbcdc98ba212e95780",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e628eb2b662c23233d1a758f5d45b889e9718294f7f6021abd3a85cc8b21fdcc",
+                    "hash" : "0xe628eb2b662c23233d1a758f5d45b889e9718294f7f6021abd3a85cc8b21fdcc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e628eb2b662c23233d1a758f5d45b889e9718294f7f6021abd3a85cc8b21fdcc",
+                    "hash" : "0xe628eb2b662c23233d1a758f5d45b889e9718294f7f6021abd3a85cc8b21fdcc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d73e20f1c303010e95ac9d12955aec0834ac33e32c5f75cbcdc98ba212e95780",
+                    "hash" : "0xd73e20f1c303010e95ac9d12955aec0834ac33e32c5f75cbcdc98ba212e95780",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "985613a688952db98721dc3f6c83daa9805abf1a834edd3554ccba008c88178f",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x30424543074242413155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest2.json b/GeneralStateTests/stRandom/randomStatetest2.json
index 9c28e2311..6b1939acb 100644
--- a/GeneralStateTests/stRandom/randomStatetest2.json
+++ b/GeneralStateTests/stRandom/randomStatetest2.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest2" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "5e3d919936800a697b30985da2a52c46473599816555ed8f3a82179b6c62cf55",
+                    "hash" : "0x5e3d919936800a697b30985da2a52c46473599816555ed8f3a82179b6c62cf55",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "5e3d919936800a697b30985da2a52c46473599816555ed8f3a82179b6c62cf55",
+                    "hash" : "0x5e3d919936800a697b30985da2a52c46473599816555ed8f3a82179b6c62cf55",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5e3d919936800a697b30985da2a52c46473599816555ed8f3a82179b6c62cf55",
+                    "hash" : "0x5e3d919936800a697b30985da2a52c46473599816555ed8f3a82179b6c62cf55",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5e3d919936800a697b30985da2a52c46473599816555ed8f3a82179b6c62cf55",
+                    "hash" : "0x5e3d919936800a697b30985da2a52c46473599816555ed8f3a82179b6c62cf55",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "5e3d919936800a697b30985da2a52c46473599816555ed8f3a82179b6c62cf55",
+                    "hash" : "0x5e3d919936800a697b30985da2a52c46473599816555ed8f3a82179b6c62cf55",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "5e3d919936800a697b30985da2a52c46473599816555ed8f3a82179b6c62cf55",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b558437f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000016f3412a47c889e8da06a04049f0498885560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "2083830597"
+                "0x7c34bb45"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest20.json b/GeneralStateTests/stRandom/randomStatetest20.json
index e17aeb846..1992573f0 100644
--- a/GeneralStateTests/stRandom/randomStatetest20.json
+++ b/GeneralStateTests/stRandom/randomStatetest20.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest20" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "ddb8f27abb51685caa793be133df9db3912648c02498b74a0ae874294acce6f0",
+                    "hash" : "0xddb8f27abb51685caa793be133df9db3912648c02498b74a0ae874294acce6f0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "ddb8f27abb51685caa793be133df9db3912648c02498b74a0ae874294acce6f0",
+                    "hash" : "0xddb8f27abb51685caa793be133df9db3912648c02498b74a0ae874294acce6f0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "ddb8f27abb51685caa793be133df9db3912648c02498b74a0ae874294acce6f0",
+                    "hash" : "0xddb8f27abb51685caa793be133df9db3912648c02498b74a0ae874294acce6f0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ddb8f27abb51685caa793be133df9db3912648c02498b74a0ae874294acce6f0",
+                    "hash" : "0xddb8f27abb51685caa793be133df9db3912648c02498b74a0ae874294acce6f0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "ddb8f27abb51685caa793be133df9db3912648c02498b74a0ae874294acce6f0",
+                    "hash" : "0xddb8f27abb51685caa793be133df9db3912648c02498b74a0ae874294acce6f0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "ddb8f27abb51685caa793be133df9db3912648c02498b74a0ae874294acce6f0",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x31417f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0315208a675944747f7430661519049a55",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1758540724"
+                "0x68d133b4"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest200.json b/GeneralStateTests/stRandom/randomStatetest200.json
index dbc516415..98228a044 100644
--- a/GeneralStateTests/stRandom/randomStatetest200.json
+++ b/GeneralStateTests/stRandom/randomStatetest200.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest200" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "66fbb4daae0cecad6c862629c9d971a0cbd1b524d6211e27299066b7868121f0",
+                    "hash" : "0x66fbb4daae0cecad6c862629c9d971a0cbd1b524d6211e27299066b7868121f0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "66fbb4daae0cecad6c862629c9d971a0cbd1b524d6211e27299066b7868121f0",
+                    "hash" : "0x66fbb4daae0cecad6c862629c9d971a0cbd1b524d6211e27299066b7868121f0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "66fbb4daae0cecad6c862629c9d971a0cbd1b524d6211e27299066b7868121f0",
+                    "hash" : "0x66fbb4daae0cecad6c862629c9d971a0cbd1b524d6211e27299066b7868121f0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "66fbb4daae0cecad6c862629c9d971a0cbd1b524d6211e27299066b7868121f0",
+                    "hash" : "0x66fbb4daae0cecad6c862629c9d971a0cbd1b524d6211e27299066b7868121f0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "66fbb4daae0cecad6c862629c9d971a0cbd1b524d6211e27299066b7868121f0",
+                    "hash" : "0x66fbb4daae0cecad6c862629c9d971a0cbd1b524d6211e27299066b7868121f0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "66fbb4daae0cecad6c862629c9d971a0cbd1b524d6211e27299066b7868121f0",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x437f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5346f42051af2a24050039e9d3a678b028a0a8055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1062273821"
+                "0x3f51031d"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest201.json b/GeneralStateTests/stRandom/randomStatetest201.json
index 2eec0adc7..565ec2d21 100644
--- a/GeneralStateTests/stRandom/randomStatetest201.json
+++ b/GeneralStateTests/stRandom/randomStatetest201.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest201" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1db08acc59707893ff39f8cf8a00b0e92b956621a22b86c59a8330b5685065fc",
+                    "hash" : "0x1db08acc59707893ff39f8cf8a00b0e92b956621a22b86c59a8330b5685065fc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "1db08acc59707893ff39f8cf8a00b0e92b956621a22b86c59a8330b5685065fc",
+                    "hash" : "0x1db08acc59707893ff39f8cf8a00b0e92b956621a22b86c59a8330b5685065fc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6a2eb09095715512587eb5384b208fbaaaae45aca31ea6ccd82178bb45763dca",
+                    "hash" : "0x6a2eb09095715512587eb5384b208fbaaaae45aca31ea6ccd82178bb45763dca",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6a2eb09095715512587eb5384b208fbaaaae45aca31ea6ccd82178bb45763dca",
+                    "hash" : "0x6a2eb09095715512587eb5384b208fbaaaae45aca31ea6ccd82178bb45763dca",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "1db08acc59707893ff39f8cf8a00b0e92b956621a22b86c59a8330b5685065fc",
+                    "hash" : "0x1db08acc59707893ff39f8cf8a00b0e92b956621a22b86c59a8330b5685065fc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "6a2eb09095715512587eb5384b208fbaaaae45aca31ea6ccd82178bb45763dca",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09ff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff8b8263974074da449e6861039960005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "953592918"
+                "0x38d6ac56"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest202.json b/GeneralStateTests/stRandom/randomStatetest202.json
index cf49e4f68..c0b42ed22 100644
--- a/GeneralStateTests/stRandom/randomStatetest202.json
+++ b/GeneralStateTests/stRandom/randomStatetest202.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest202" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f90c0fced4f364c533d8fd2639665219dc2e076e94d3dc3a04a25691a21bad31",
+                    "hash" : "0xf90c0fced4f364c533d8fd2639665219dc2e076e94d3dc3a04a25691a21bad31",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f90c0fced4f364c533d8fd2639665219dc2e076e94d3dc3a04a25691a21bad31",
+                    "hash" : "0xf90c0fced4f364c533d8fd2639665219dc2e076e94d3dc3a04a25691a21bad31",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f90c0fced4f364c533d8fd2639665219dc2e076e94d3dc3a04a25691a21bad31",
+                    "hash" : "0xf90c0fced4f364c533d8fd2639665219dc2e076e94d3dc3a04a25691a21bad31",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f90c0fced4f364c533d8fd2639665219dc2e076e94d3dc3a04a25691a21bad31",
+                    "hash" : "0xf90c0fced4f364c533d8fd2639665219dc2e076e94d3dc3a04a25691a21bad31",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f90c0fced4f364c533d8fd2639665219dc2e076e94d3dc3a04a25691a21bad31",
+                    "hash" : "0xf90c0fced4f364c533d8fd2639665219dc2e076e94d3dc3a04a25691a21bad31",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "f90c0fced4f364c533d8fd2639665219dc2e076e94d3dc3a04a25691a21bad31",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000000557f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6750a3190486f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,8 +96,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x3158e7cd"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest203.json b/GeneralStateTests/stRandom/randomStatetest203.json
index b7b159d0a..9440162d4 100644
--- a/GeneralStateTests/stRandom/randomStatetest203.json
+++ b/GeneralStateTests/stRandom/randomStatetest203.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest203" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9326e2439b20c2688035c13946d8147c378ed3996dd7a90b811bc38104f5a3b3",
+                    "hash" : "0x9326e2439b20c2688035c13946d8147c378ed3996dd7a90b811bc38104f5a3b3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9326e2439b20c2688035c13946d8147c378ed3996dd7a90b811bc38104f5a3b3",
+                    "hash" : "0x9326e2439b20c2688035c13946d8147c378ed3996dd7a90b811bc38104f5a3b3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9326e2439b20c2688035c13946d8147c378ed3996dd7a90b811bc38104f5a3b3",
+                    "hash" : "0x9326e2439b20c2688035c13946d8147c378ed3996dd7a90b811bc38104f5a3b3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9326e2439b20c2688035c13946d8147c378ed3996dd7a90b811bc38104f5a3b3",
+                    "hash" : "0x9326e2439b20c2688035c13946d8147c378ed3996dd7a90b811bc38104f5a3b3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9326e2439b20c2688035c13946d8147c378ed3996dd7a90b811bc38104f5a3b3",
+                    "hash" : "0x9326e2439b20c2688035c13946d8147c378ed3996dd7a90b811bc38104f5a3b3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "9326e2439b20c2688035c13946d8147c378ed3996dd7a90b811bc38104f5a3b3",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000000000000000000000000000000000000000000001407f0000000000000000000000000000000000000000000000000000000000000001417f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000016f72086c539905609b44a1018c78826b5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1464764973"
+                "0x574e8a2d"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest204.json b/GeneralStateTests/stRandom/randomStatetest204.json
index 420c20f5d..c00d726b3 100644
--- a/GeneralStateTests/stRandom/randomStatetest204.json
+++ b/GeneralStateTests/stRandom/randomStatetest204.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest204" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "965e311cc7b4deea0189d01a04b478531f94245d5f8f76e29797f26f589e03f2",
+                    "hash" : "0x965e311cc7b4deea0189d01a04b478531f94245d5f8f76e29797f26f589e03f2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "965e311cc7b4deea0189d01a04b478531f94245d5f8f76e29797f26f589e03f2",
+                    "hash" : "0x965e311cc7b4deea0189d01a04b478531f94245d5f8f76e29797f26f589e03f2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "965e311cc7b4deea0189d01a04b478531f94245d5f8f76e29797f26f589e03f2",
+                    "hash" : "0x965e311cc7b4deea0189d01a04b478531f94245d5f8f76e29797f26f589e03f2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "965e311cc7b4deea0189d01a04b478531f94245d5f8f76e29797f26f589e03f2",
+                    "hash" : "0x965e311cc7b4deea0189d01a04b478531f94245d5f8f76e29797f26f589e03f2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "965e311cc7b4deea0189d01a04b478531f94245d5f8f76e29797f26f589e03f2",
+                    "hash" : "0x965e311cc7b4deea0189d01a04b478531f94245d5f8f76e29797f26f589e03f2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "965e311cc7b4deea0189d01a04b478531f94245d5f8f76e29797f26f589e03f2",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff098255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1983843477"
+                "0x763f0c95"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest205.json b/GeneralStateTests/stRandom/randomStatetest205.json
index b55044d60..60f1f937b 100644
--- a/GeneralStateTests/stRandom/randomStatetest205.json
+++ b/GeneralStateTests/stRandom/randomStatetest205.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest205" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
             {
@@ -21,7 +21,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b5fac9b1e98bf61ea3e2941b164af8616942180daee8e54dbbbd4717107b2c2e",
+                    "hash" : "0xb5fac9b1e98bf61ea3e2941b164af8616942180daee8e54dbbbd4717107b2c2e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b5fac9b1e98bf61ea3e2941b164af8616942180daee8e54dbbbd4717107b2c2e",
+                    "hash" : "0xb5fac9b1e98bf61ea3e2941b164af8616942180daee8e54dbbbd4717107b2c2e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "000743567a98a4c6c0d76bf44d693c0ad22d944ad46c578bd97e450e71da755b",
+                    "hash" : "0x000743567a98a4c6c0d76bf44d693c0ad22d944ad46c578bd97e450e71da755b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "000743567a98a4c6c0d76bf44d693c0ad22d944ad46c578bd97e450e71da755b",
+                    "hash" : "0x000743567a98a4c6c0d76bf44d693c0ad22d944ad46c578bd97e450e71da755b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,7 +61,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b5fac9b1e98bf61ea3e2941b164af8616942180daee8e54dbbbd4717107b2c2e",
+                    "hash" : "0xb5fac9b1e98bf61ea3e2941b164af8616942180daee8e54dbbbd4717107b2c2e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -72,23 +72,23 @@
         },
         "postStateRoot" : "000743567a98a4c6c0d76bf44d693c0ad22d944ad46c578bd97e450e71da755b",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x3360b261edefa0326fdc74d570982966277b49cdb30a453fa06c34a7423da44ba2d04341af08c478b17a57318ab10ab43b3744333b0aa8864ac27b3fd022e380056735a5fcda3e9fdc25695972a076884de6d6b6b06dd45416c8110bae3c70576b433a4672777847e81823024ddd1292b929ad28e64a732b74c0ae1941d5936ecd35738e2f279273788f4aaf19907a532a6b0f117c32b6cb967aae8bdfcf86e2d4d64599986abcf65a20754f5a816c58ed669138f6a0448670b906bbf1eb145ced896c578de5aa27769006b1a784e84b6316d4e60c7053b0b6550c70a177cb7a3e88d4e83fb1897a09c2161ff6cc2679c178292687137854da672e316c66ef03dc9ac37e8e430b7c64d1939bf67383c4bafeb2f0471fe896b7c0e114bf6f152b266cc769ae4d38f3df618f5eeb9085601f601060086016632c019e2e73095e7baea6a6c7c4c2dfeb977efac326af552d87626b8a0ef179e6b62e86237845e9605d61219d97c1d0145516f5355fe73384e87a6a87cc6d2378c81797ac3746bc562e2fd1145e14781307bc4ada39732e9d0e8725fde75c5abc313c11e3238c7cd9b7186a6a14f8d5c3cad9da5339446ad1311ccc67a0691559157a674825358b301ac42d7bcae31beb8b0849903402175ca3740f3fd690ad66287d6bf67a98c09e6de5717596052d30f4b9bb8046a6b67ef51b1b13c496e97bf9a2e67aeca97fa10a266f8cf22c10cc0375b514b25de466a146576b2cb565754efc80d4b8aa5497aa0fb4cbab90ee57298d322474d276366e04eab856c9f6070c80701fa30596dd0b6ea5bc38ba64e1d16aff1b8c61caa379064465a9308dbb1465294ddcb5fa32833e4ffb049c71761ed93472c7e58f171c6c8b51e2ec704d34897b80466e826b0c1ce2488511cbb1aaad26b075ed5ebf070be6e14eaa6b973423bcb2e0541307d88ff66d1b7e29fffb10218ca75bf3f9957d6ee27a0945278d5f9303b3e3f28a325a7f17905f7467c4afcbb3a43dbbd37e9591e3f5a82841ee9cb8b23f68b4572e8cd96d0f7daacbd3ab3bd5a8f427baf6ea7ae70d98d3948eafb74e2e4a158ac116c5219403c9073a457409c6e464bae32b2c856b15bda1b2176295fd1cecfe7d794ab2692061aa79387004112272204198437fc78d1dbe0e8932ce6f47828a2bf4df47446291b99d92a90de3623954589d36",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -103,8 +103,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x4dd39b8a"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest206.json b/GeneralStateTests/stRandom/randomStatetest206.json
index fa814bdc3..d15dfa159 100644
--- a/GeneralStateTests/stRandom/randomStatetest206.json
+++ b/GeneralStateTests/stRandom/randomStatetest206.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest206" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b072519f8633ab8a74923551afd7b437f76c1ab0b9d5f7150becf467ac4b3117",
+                    "hash" : "0xb072519f8633ab8a74923551afd7b437f76c1ab0b9d5f7150becf467ac4b3117",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b072519f8633ab8a74923551afd7b437f76c1ab0b9d5f7150becf467ac4b3117",
+                    "hash" : "0xb072519f8633ab8a74923551afd7b437f76c1ab0b9d5f7150becf467ac4b3117",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b072519f8633ab8a74923551afd7b437f76c1ab0b9d5f7150becf467ac4b3117",
+                    "hash" : "0xb072519f8633ab8a74923551afd7b437f76c1ab0b9d5f7150becf467ac4b3117",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b072519f8633ab8a74923551afd7b437f76c1ab0b9d5f7150becf467ac4b3117",
+                    "hash" : "0xb072519f8633ab8a74923551afd7b437f76c1ab0b9d5f7150becf467ac4b3117",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b072519f8633ab8a74923551afd7b437f76c1ab0b9d5f7150becf467ac4b3117",
+                    "hash" : "0xb072519f8633ab8a74923551afd7b437f76c1ab0b9d5f7150becf467ac4b3117",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "b072519f8633ab8a74923551afd7b437f76c1ab0b9d5f7150becf467ac4b3117",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5427f0000000000000000000000000000000000000000000000000000000000000001427f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b56f45736d8e806138378d62087320313c5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "2091011439"
+                "0x7ca24d6f"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest207.json b/GeneralStateTests/stRandom/randomStatetest207.json
index 1cfa0cb39..c5e2656c6 100644
--- a/GeneralStateTests/stRandom/randomStatetest207.json
+++ b/GeneralStateTests/stRandom/randomStatetest207.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest207" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c901dc3eb7466bd88f0512d41576281e7d5bb38057efa363384f526721198f3a",
+                    "hash" : "0xc901dc3eb7466bd88f0512d41576281e7d5bb38057efa363384f526721198f3a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c901dc3eb7466bd88f0512d41576281e7d5bb38057efa363384f526721198f3a",
+                    "hash" : "0xc901dc3eb7466bd88f0512d41576281e7d5bb38057efa363384f526721198f3a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9780a444ca6f188ebee8520aec9c32f75dc312fae48de0c57eb5912fc88bfc70",
+                    "hash" : "0x9780a444ca6f188ebee8520aec9c32f75dc312fae48de0c57eb5912fc88bfc70",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9780a444ca6f188ebee8520aec9c32f75dc312fae48de0c57eb5912fc88bfc70",
+                    "hash" : "0x9780a444ca6f188ebee8520aec9c32f75dc312fae48de0c57eb5912fc88bfc70",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c901dc3eb7466bd88f0512d41576281e7d5bb38057efa363384f526721198f3a",
+                    "hash" : "0xc901dc3eb7466bd88f0512d41576281e7d5bb38057efa363384f526721198f3a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "173e6538b20664191b0c50b6f109291642fd91245f2bb0f4e9c2ae4ada26c90d",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x43413160439155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest208.json b/GeneralStateTests/stRandom/randomStatetest208.json
index 0fce34593..6628b645f 100644
--- a/GeneralStateTests/stRandom/randomStatetest208.json
+++ b/GeneralStateTests/stRandom/randomStatetest208.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest208" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e25612e31c35071e64dd11713edba222945c00f21d6c5f8523d98fceaf99a2ef",
+                    "hash" : "0xe25612e31c35071e64dd11713edba222945c00f21d6c5f8523d98fceaf99a2ef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e25612e31c35071e64dd11713edba222945c00f21d6c5f8523d98fceaf99a2ef",
+                    "hash" : "0xe25612e31c35071e64dd11713edba222945c00f21d6c5f8523d98fceaf99a2ef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e25612e31c35071e64dd11713edba222945c00f21d6c5f8523d98fceaf99a2ef",
+                    "hash" : "0xe25612e31c35071e64dd11713edba222945c00f21d6c5f8523d98fceaf99a2ef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e25612e31c35071e64dd11713edba222945c00f21d6c5f8523d98fceaf99a2ef",
+                    "hash" : "0xe25612e31c35071e64dd11713edba222945c00f21d6c5f8523d98fceaf99a2ef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e25612e31c35071e64dd11713edba222945c00f21d6c5f8523d98fceaf99a2ef",
+                    "hash" : "0xe25612e31c35071e64dd11713edba222945c00f21d6c5f8523d98fceaf99a2ef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "e25612e31c35071e64dd11713edba222945c00f21d6c5f8523d98fceaf99a2ef",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0960005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "2144690611"
+                "0x7fd561b3"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest209.json b/GeneralStateTests/stRandom/randomStatetest209.json
index b476c2281..863489f5b 100644
--- a/GeneralStateTests/stRandom/randomStatetest209.json
+++ b/GeneralStateTests/stRandom/randomStatetest209.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest209" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "5f0c6af0d310152770dd13cff103cfa1ac49b780162e8c51f7f1e2df77e29cc3",
+                    "hash" : "0x5f0c6af0d310152770dd13cff103cfa1ac49b780162e8c51f7f1e2df77e29cc3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "5f0c6af0d310152770dd13cff103cfa1ac49b780162e8c51f7f1e2df77e29cc3",
+                    "hash" : "0x5f0c6af0d310152770dd13cff103cfa1ac49b780162e8c51f7f1e2df77e29cc3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5f0c6af0d310152770dd13cff103cfa1ac49b780162e8c51f7f1e2df77e29cc3",
+                    "hash" : "0x5f0c6af0d310152770dd13cff103cfa1ac49b780162e8c51f7f1e2df77e29cc3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5f0c6af0d310152770dd13cff103cfa1ac49b780162e8c51f7f1e2df77e29cc3",
+                    "hash" : "0x5f0c6af0d310152770dd13cff103cfa1ac49b780162e8c51f7f1e2df77e29cc3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "5f0c6af0d310152770dd13cff103cfa1ac49b780162e8c51f7f1e2df77e29cc3",
+                    "hash" : "0x5f0c6af0d310152770dd13cff103cfa1ac49b780162e8c51f7f1e2df77e29cc3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "5f0c6af0d310152770dd13cff103cfa1ac49b780162e8c51f7f1e2df77e29cc3",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0951537d3c6474623b781181a355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "833511346"
+                "0x31ae5fb2"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest21.json b/GeneralStateTests/stRandom/randomStatetest21.json
index 56ebe8f67..db057db6a 100644
--- a/GeneralStateTests/stRandom/randomStatetest21.json
+++ b/GeneralStateTests/stRandom/randomStatetest21.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest21" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "857494b3059577decb95f1cefd182f22906a3a4709c87b3b8471fc22e7fabcb1",
+                    "hash" : "0x857494b3059577decb95f1cefd182f22906a3a4709c87b3b8471fc22e7fabcb1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "857494b3059577decb95f1cefd182f22906a3a4709c87b3b8471fc22e7fabcb1",
+                    "hash" : "0x857494b3059577decb95f1cefd182f22906a3a4709c87b3b8471fc22e7fabcb1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "260ebe8cff6f45e31a39cd1aaf667b4ea05b18b0d3399d468a11857547002ace",
+                    "hash" : "0x260ebe8cff6f45e31a39cd1aaf667b4ea05b18b0d3399d468a11857547002ace",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "260ebe8cff6f45e31a39cd1aaf667b4ea05b18b0d3399d468a11857547002ace",
+                    "hash" : "0x260ebe8cff6f45e31a39cd1aaf667b4ea05b18b0d3399d468a11857547002ace",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "857494b3059577decb95f1cefd182f22906a3a4709c87b3b8471fc22e7fabcb1",
+                    "hash" : "0x857494b3059577decb95f1cefd182f22906a3a4709c87b3b8471fc22e7fabcb1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "feb2e64b425b9cffdd2d3860d61c1d11955dd06ebb76bd532a211c659dd8fcea",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x4440444245414045913c63087c55",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest210.json b/GeneralStateTests/stRandom/randomStatetest210.json
index 0cbe1b0d4..6c9b56e74 100644
--- a/GeneralStateTests/stRandom/randomStatetest210.json
+++ b/GeneralStateTests/stRandom/randomStatetest210.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest210" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "348f5b98bc3aa5be1f7161e6a11dea7bd3c0ae53e4a06e0d96aebc74c389eb58",
+                    "hash" : "0x348f5b98bc3aa5be1f7161e6a11dea7bd3c0ae53e4a06e0d96aebc74c389eb58",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "348f5b98bc3aa5be1f7161e6a11dea7bd3c0ae53e4a06e0d96aebc74c389eb58",
+                    "hash" : "0x348f5b98bc3aa5be1f7161e6a11dea7bd3c0ae53e4a06e0d96aebc74c389eb58",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "348f5b98bc3aa5be1f7161e6a11dea7bd3c0ae53e4a06e0d96aebc74c389eb58",
+                    "hash" : "0x348f5b98bc3aa5be1f7161e6a11dea7bd3c0ae53e4a06e0d96aebc74c389eb58",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "348f5b98bc3aa5be1f7161e6a11dea7bd3c0ae53e4a06e0d96aebc74c389eb58",
+                    "hash" : "0x348f5b98bc3aa5be1f7161e6a11dea7bd3c0ae53e4a06e0d96aebc74c389eb58",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "348f5b98bc3aa5be1f7161e6a11dea7bd3c0ae53e4a06e0d96aebc74c389eb58",
+                    "hash" : "0x348f5b98bc3aa5be1f7161e6a11dea7bd3c0ae53e4a06e0d96aebc74c389eb58",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "348f5b98bc3aa5be1f7161e6a11dea7bd3c0ae53e4a06e0d96aebc74c389eb58",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x457f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff427ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0960005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1780157802"
+                "0x6a1b0d6a"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest211.json b/GeneralStateTests/stRandom/randomStatetest211.json
index 513cdf969..455fb2972 100644
--- a/GeneralStateTests/stRandom/randomStatetest211.json
+++ b/GeneralStateTests/stRandom/randomStatetest211.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest211" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
             {
@@ -24,7 +24,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a7ec1630296c75179b3fbbcef7d7da9e8107138477598c1091d434d02bd749ca",
+                    "hash" : "0xa7ec1630296c75179b3fbbcef7d7da9e8107138477598c1091d434d02bd749ca",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a7ec1630296c75179b3fbbcef7d7da9e8107138477598c1091d434d02bd749ca",
+                    "hash" : "0xa7ec1630296c75179b3fbbcef7d7da9e8107138477598c1091d434d02bd749ca",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a7ec1630296c75179b3fbbcef7d7da9e8107138477598c1091d434d02bd749ca",
+                    "hash" : "0xa7ec1630296c75179b3fbbcef7d7da9e8107138477598c1091d434d02bd749ca",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a7ec1630296c75179b3fbbcef7d7da9e8107138477598c1091d434d02bd749ca",
+                    "hash" : "0xa7ec1630296c75179b3fbbcef7d7da9e8107138477598c1091d434d02bd749ca",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -64,7 +64,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a7ec1630296c75179b3fbbcef7d7da9e8107138477598c1091d434d02bd749ca",
+                    "hash" : "0xa7ec1630296c75179b3fbbcef7d7da9e8107138477598c1091d434d02bd749ca",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -75,23 +75,23 @@
         },
         "postStateRoot" : "a7ec1630296c75179b3fbbcef7d7da9e8107138477598c1091d434d02bd749ca",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7e7a980b5b1c50ebb63d8e2211d3a79e841ee5e5946b7969dfb6ca1309c99e8f68d4ee9a50996902ee4e6937e1d07ad872cf04eb2a61fc336025a3648d5818a6457dc24f19f38d3deebb09968c812740339c6df46af95b7b0283acb1944a8ca37fbaaafeac115b9ec5adc16fea5a3a828d3483e495506a790ca75d8238ebbed6477c213d0177c10b33b6cf9362273973809ac39f11dffee928f3fb18e975186fb4a74e56142d4431bfa392dd5f71d32b6c40a2bd0beb6a8b24fc592b25f0680306f11e049124ec396ea3858d3339145af8c1c16747bea056639a7faf446cd9c7bf446ed2de67f1665adc479874053c2c53f0fc53a12af3c1951fdc7a5d20aee8f96874f392a4aa2a84a99c9390ab4bd4c39f521a2b91c2ea90",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -106,8 +106,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x5c537837"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest212.json b/GeneralStateTests/stRandom/randomStatetest212.json
index 0f972fd3c..d5ff8f911 100644
--- a/GeneralStateTests/stRandom/randomStatetest212.json
+++ b/GeneralStateTests/stRandom/randomStatetest212.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest212" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e851fd489413672973d4ecb012164a90d0bdbb72cefd56e57c8c1c969ee061cd",
+                    "hash" : "0xe851fd489413672973d4ecb012164a90d0bdbb72cefd56e57c8c1c969ee061cd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e851fd489413672973d4ecb012164a90d0bdbb72cefd56e57c8c1c969ee061cd",
+                    "hash" : "0xe851fd489413672973d4ecb012164a90d0bdbb72cefd56e57c8c1c969ee061cd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "aa851aa84f2699ce3f4444082f98afbc7b80adf81f985a303b6e6f7b89923ed0",
+                    "hash" : "0xaa851aa84f2699ce3f4444082f98afbc7b80adf81f985a303b6e6f7b89923ed0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "aa851aa84f2699ce3f4444082f98afbc7b80adf81f985a303b6e6f7b89923ed0",
+                    "hash" : "0xaa851aa84f2699ce3f4444082f98afbc7b80adf81f985a303b6e6f7b89923ed0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e851fd489413672973d4ecb012164a90d0bdbb72cefd56e57c8c1c969ee061cd",
+                    "hash" : "0xe851fd489413672973d4ecb012164a90d0bdbb72cefd56e57c8c1c969ee061cd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "aa851aa84f2699ce3f4444082f98afbc7b80adf81f985a303b6e6f7b89923ed0",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe06180908ff3a68f28e61990a525560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "49732651"
+                "0x02f6dc2b"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest213.json b/GeneralStateTests/stRandom/randomStatetest213.json
index 9cfbb0aca..2378418ad 100644
--- a/GeneralStateTests/stRandom/randomStatetest213.json
+++ b/GeneralStateTests/stRandom/randomStatetest213.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest213" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f8da34c51fd70b504728116c83a333827ee9580d542193bb8813bf271756e6a5",
+                    "hash" : "0xf8da34c51fd70b504728116c83a333827ee9580d542193bb8813bf271756e6a5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f8da34c51fd70b504728116c83a333827ee9580d542193bb8813bf271756e6a5",
+                    "hash" : "0xf8da34c51fd70b504728116c83a333827ee9580d542193bb8813bf271756e6a5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f8da34c51fd70b504728116c83a333827ee9580d542193bb8813bf271756e6a5",
+                    "hash" : "0xf8da34c51fd70b504728116c83a333827ee9580d542193bb8813bf271756e6a5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f8da34c51fd70b504728116c83a333827ee9580d542193bb8813bf271756e6a5",
+                    "hash" : "0xf8da34c51fd70b504728116c83a333827ee9580d542193bb8813bf271756e6a5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f8da34c51fd70b504728116c83a333827ee9580d542193bb8813bf271756e6a5",
+                    "hash" : "0xf8da34c51fd70b504728116c83a333827ee9580d542193bb8813bf271756e6a5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "f8da34c51fd70b504728116c83a333827ee9580d542193bb8813bf271756e6a5",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x4338407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff425a7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f3b1860586d8587cc788e106fa3937f5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1640847204"
+                "0x61cd5764"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest214.json b/GeneralStateTests/stRandom/randomStatetest214.json
index b485c5141..19830d74d 100644
--- a/GeneralStateTests/stRandom/randomStatetest214.json
+++ b/GeneralStateTests/stRandom/randomStatetest214.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest214" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "82022bb552f8a9ca289770c5ec05ee620c785cc3c95ddbca5641d863550048d6",
+                    "hash" : "0x82022bb552f8a9ca289770c5ec05ee620c785cc3c95ddbca5641d863550048d6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "4137060ef2900ba0acb0cbe26e668f768a97cce53194c02bd33d0ccc2312c482",
+                    "hash" : "0x4137060ef2900ba0acb0cbe26e668f768a97cce53194c02bd33d0ccc2312c482",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "82022bb552f8a9ca289770c5ec05ee620c785cc3c95ddbca5641d863550048d6",
+                    "hash" : "0x82022bb552f8a9ca289770c5ec05ee620c785cc3c95ddbca5641d863550048d6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "82022bb552f8a9ca289770c5ec05ee620c785cc3c95ddbca5641d863550048d6",
+                    "hash" : "0x82022bb552f8a9ca289770c5ec05ee620c785cc3c95ddbca5641d863550048d6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "4137060ef2900ba0acb0cbe26e668f768a97cce53194c02bd33d0ccc2312c482",
+                    "hash" : "0x4137060ef2900ba0acb0cbe26e668f768a97cce53194c02bd33d0ccc2312c482",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "82022bb552f8a9ca289770c5ec05ee620c785cc3c95ddbca5641d863550048d6",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff150a6f7b056b335a15a48d7b8841163a50396360005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "2101620901"
+                "0x7d4430a5"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest215.json b/GeneralStateTests/stRandom/randomStatetest215.json
index 58f1ff67d..2ba694abd 100644
--- a/GeneralStateTests/stRandom/randomStatetest215.json
+++ b/GeneralStateTests/stRandom/randomStatetest215.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest215" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "da21f6b52e36209db16266df5600bf8f45fa462b46ec248f735e4fd734792349",
+                    "hash" : "0xda21f6b52e36209db16266df5600bf8f45fa462b46ec248f735e4fd734792349",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "da21f6b52e36209db16266df5600bf8f45fa462b46ec248f735e4fd734792349",
+                    "hash" : "0xda21f6b52e36209db16266df5600bf8f45fa462b46ec248f735e4fd734792349",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "da21f6b52e36209db16266df5600bf8f45fa462b46ec248f735e4fd734792349",
+                    "hash" : "0xda21f6b52e36209db16266df5600bf8f45fa462b46ec248f735e4fd734792349",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "da21f6b52e36209db16266df5600bf8f45fa462b46ec248f735e4fd734792349",
+                    "hash" : "0xda21f6b52e36209db16266df5600bf8f45fa462b46ec248f735e4fd734792349",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "da21f6b52e36209db16266df5600bf8f45fa462b46ec248f735e4fd734792349",
+                    "hash" : "0xda21f6b52e36209db16266df5600bf8f45fa462b46ec248f735e4fd734792349",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "da21f6b52e36209db16266df5600bf8f45fa462b46ec248f735e4fd734792349",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff446f728f4f1065583139780a981510173b9c60005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "812357921"
+                "0x306b9921"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest216.json b/GeneralStateTests/stRandom/randomStatetest216.json
index 544a0981c..10e1a88a1 100644
--- a/GeneralStateTests/stRandom/randomStatetest216.json
+++ b/GeneralStateTests/stRandom/randomStatetest216.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest216" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1fd62a58329ce462edac2a08724b7f2defd5c55ef226f52574c6d5802abf626f",
+                    "hash" : "0x1fd62a58329ce462edac2a08724b7f2defd5c55ef226f52574c6d5802abf626f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "1fd62a58329ce462edac2a08724b7f2defd5c55ef226f52574c6d5802abf626f",
+                    "hash" : "0x1fd62a58329ce462edac2a08724b7f2defd5c55ef226f52574c6d5802abf626f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "1fd62a58329ce462edac2a08724b7f2defd5c55ef226f52574c6d5802abf626f",
+                    "hash" : "0x1fd62a58329ce462edac2a08724b7f2defd5c55ef226f52574c6d5802abf626f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "1fd62a58329ce462edac2a08724b7f2defd5c55ef226f52574c6d5802abf626f",
+                    "hash" : "0x1fd62a58329ce462edac2a08724b7f2defd5c55ef226f52574c6d5802abf626f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "1fd62a58329ce462edac2a08724b7f2defd5c55ef226f52574c6d5802abf626f",
+                    "hash" : "0x1fd62a58329ce462edac2a08724b7f2defd5c55ef226f52574c6d5802abf626f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "1fd62a58329ce462edac2a08724b7f2defd5c55ef226f52574c6d5802abf626f",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350447f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3506d766d67fe0785320899130644945560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "679576029"
+                "0x288181dd"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest217.json b/GeneralStateTests/stRandom/randomStatetest217.json
index 2cf196bb4..397f62ab1 100644
--- a/GeneralStateTests/stRandom/randomStatetest217.json
+++ b/GeneralStateTests/stRandom/randomStatetest217.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest217" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "26489279c86c67abc74e4226919d533de9ad89534331e2beb284ba94916183e2",
+                    "hash" : "0x26489279c86c67abc74e4226919d533de9ad89534331e2beb284ba94916183e2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "26489279c86c67abc74e4226919d533de9ad89534331e2beb284ba94916183e2",
+                    "hash" : "0x26489279c86c67abc74e4226919d533de9ad89534331e2beb284ba94916183e2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "26489279c86c67abc74e4226919d533de9ad89534331e2beb284ba94916183e2",
+                    "hash" : "0x26489279c86c67abc74e4226919d533de9ad89534331e2beb284ba94916183e2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "26489279c86c67abc74e4226919d533de9ad89534331e2beb284ba94916183e2",
+                    "hash" : "0x26489279c86c67abc74e4226919d533de9ad89534331e2beb284ba94916183e2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "26489279c86c67abc74e4226919d533de9ad89534331e2beb284ba94916183e2",
+                    "hash" : "0x26489279c86c67abc74e4226919d533de9ad89534331e2beb284ba94916183e2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "26489279c86c67abc74e4226919d533de9ad89534331e2beb284ba94916183e2",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001377f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c35060005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "473066872"
+                "0x1c326d78"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest218.json b/GeneralStateTests/stRandom/randomStatetest218.json
index df1ac56be..a0de9cb34 100644
--- a/GeneralStateTests/stRandom/randomStatetest218.json
+++ b/GeneralStateTests/stRandom/randomStatetest218.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest218" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "0baa10f6c58d08c4e10eb81259047bc8bf453ce07d9df2a62a0dd661e8917769",
+                    "hash" : "0x0baa10f6c58d08c4e10eb81259047bc8bf453ce07d9df2a62a0dd661e8917769",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "0baa10f6c58d08c4e10eb81259047bc8bf453ce07d9df2a62a0dd661e8917769",
+                    "hash" : "0x0baa10f6c58d08c4e10eb81259047bc8bf453ce07d9df2a62a0dd661e8917769",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "0baa10f6c58d08c4e10eb81259047bc8bf453ce07d9df2a62a0dd661e8917769",
+                    "hash" : "0x0baa10f6c58d08c4e10eb81259047bc8bf453ce07d9df2a62a0dd661e8917769",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "0baa10f6c58d08c4e10eb81259047bc8bf453ce07d9df2a62a0dd661e8917769",
+                    "hash" : "0x0baa10f6c58d08c4e10eb81259047bc8bf453ce07d9df2a62a0dd661e8917769",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0baa10f6c58d08c4e10eb81259047bc8bf453ce07d9df2a62a0dd661e8917769",
+                    "hash" : "0x0baa10f6c58d08c4e10eb81259047bc8bf453ce07d9df2a62a0dd661e8917769",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "0baa10f6c58d08c4e10eb81259047bc8bf453ce07d9df2a62a0dd661e8917769",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff40407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0960005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "903073600"
+                "0x35d3cf40"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest219.json b/GeneralStateTests/stRandom/randomStatetest219.json
index 7043ec85b..1b4021445 100644
--- a/GeneralStateTests/stRandom/randomStatetest219.json
+++ b/GeneralStateTests/stRandom/randomStatetest219.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest219" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1cb4f2a66f53dfed332c100f9d3d70716f3c30408c4ef19776cea3770357a17c",
+                    "hash" : "0x1cb4f2a66f53dfed332c100f9d3d70716f3c30408c4ef19776cea3770357a17c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "1cb4f2a66f53dfed332c100f9d3d70716f3c30408c4ef19776cea3770357a17c",
+                    "hash" : "0x1cb4f2a66f53dfed332c100f9d3d70716f3c30408c4ef19776cea3770357a17c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "1cb4f2a66f53dfed332c100f9d3d70716f3c30408c4ef19776cea3770357a17c",
+                    "hash" : "0x1cb4f2a66f53dfed332c100f9d3d70716f3c30408c4ef19776cea3770357a17c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "1cb4f2a66f53dfed332c100f9d3d70716f3c30408c4ef19776cea3770357a17c",
+                    "hash" : "0x1cb4f2a66f53dfed332c100f9d3d70716f3c30408c4ef19776cea3770357a17c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "1cb4f2a66f53dfed332c100f9d3d70716f3c30408c4ef19776cea3770357a17c",
+                    "hash" : "0x1cb4f2a66f53dfed332c100f9d3d70716f3c30408c4ef19776cea3770357a17c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "1cb4f2a66f53dfed332c100f9d3d70716f3c30408c4ef19776cea3770357a17c",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff437f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3506f6253443a4104027144577f339983205560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "73663722"
+                "0x046404ea"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest22.json b/GeneralStateTests/stRandom/randomStatetest22.json
index 16ab97659..3247823d8 100644
--- a/GeneralStateTests/stRandom/randomStatetest22.json
+++ b/GeneralStateTests/stRandom/randomStatetest22.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest22" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "5887798a31f38be5d859a9ea6398c8d77bf9ecbaebbcc2d38bc0e3ca8bc43957",
+                    "hash" : "0x5887798a31f38be5d859a9ea6398c8d77bf9ecbaebbcc2d38bc0e3ca8bc43957",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "5887798a31f38be5d859a9ea6398c8d77bf9ecbaebbcc2d38bc0e3ca8bc43957",
+                    "hash" : "0x5887798a31f38be5d859a9ea6398c8d77bf9ecbaebbcc2d38bc0e3ca8bc43957",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "53b61b0ec6357529a26cd0a546e75b1340a1f29fabfdb407d641c7ddcfb708a7",
+                    "hash" : "0x53b61b0ec6357529a26cd0a546e75b1340a1f29fabfdb407d641c7ddcfb708a7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "53b61b0ec6357529a26cd0a546e75b1340a1f29fabfdb407d641c7ddcfb708a7",
+                    "hash" : "0x53b61b0ec6357529a26cd0a546e75b1340a1f29fabfdb407d641c7ddcfb708a7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "5887798a31f38be5d859a9ea6398c8d77bf9ecbaebbcc2d38bc0e3ca8bc43957",
+                    "hash" : "0x5887798a31f38be5d859a9ea6398c8d77bf9ecbaebbcc2d38bc0e3ca8bc43957",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "53b61b0ec6357529a26cd0a546e75b1340a1f29fabfdb407d641c7ddcfb708a7",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x6d417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7e969f926084143c7960005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1814313700"
+                "0x6c243ae4"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest220.json b/GeneralStateTests/stRandom/randomStatetest220.json
index 8344d1c58..9b2352e47 100644
--- a/GeneralStateTests/stRandom/randomStatetest220.json
+++ b/GeneralStateTests/stRandom/randomStatetest220.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest220" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1e9ada2361bd2e5fc1575142ea9d6414a81fdb42b55feb63854173dab54c319a",
+                    "hash" : "0x1e9ada2361bd2e5fc1575142ea9d6414a81fdb42b55feb63854173dab54c319a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "1e9ada2361bd2e5fc1575142ea9d6414a81fdb42b55feb63854173dab54c319a",
+                    "hash" : "0x1e9ada2361bd2e5fc1575142ea9d6414a81fdb42b55feb63854173dab54c319a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "1e9ada2361bd2e5fc1575142ea9d6414a81fdb42b55feb63854173dab54c319a",
+                    "hash" : "0x1e9ada2361bd2e5fc1575142ea9d6414a81fdb42b55feb63854173dab54c319a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "1e9ada2361bd2e5fc1575142ea9d6414a81fdb42b55feb63854173dab54c319a",
+                    "hash" : "0x1e9ada2361bd2e5fc1575142ea9d6414a81fdb42b55feb63854173dab54c319a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "1e9ada2361bd2e5fc1575142ea9d6414a81fdb42b55feb63854173dab54c319a",
+                    "hash" : "0x1e9ada2361bd2e5fc1575142ea9d6414a81fdb42b55feb63854173dab54c319a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "1e9ada2361bd2e5fc1575142ea9d6414a81fdb42b55feb63854173dab54c319a",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000016f420380a03c4282a3540a1a333a843a5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "207355039"
+                "0x0c5bfc9f"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest221.json b/GeneralStateTests/stRandom/randomStatetest221.json
index 5e47f2697..852300d49 100644
--- a/GeneralStateTests/stRandom/randomStatetest221.json
+++ b/GeneralStateTests/stRandom/randomStatetest221.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest221" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "51d61f0deee2340041d04d482b3990d4920044d70afd59352a8e97a36abb9520",
+                    "hash" : "0x51d61f0deee2340041d04d482b3990d4920044d70afd59352a8e97a36abb9520",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "51d61f0deee2340041d04d482b3990d4920044d70afd59352a8e97a36abb9520",
+                    "hash" : "0x51d61f0deee2340041d04d482b3990d4920044d70afd59352a8e97a36abb9520",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "51d61f0deee2340041d04d482b3990d4920044d70afd59352a8e97a36abb9520",
+                    "hash" : "0x51d61f0deee2340041d04d482b3990d4920044d70afd59352a8e97a36abb9520",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "51d61f0deee2340041d04d482b3990d4920044d70afd59352a8e97a36abb9520",
+                    "hash" : "0x51d61f0deee2340041d04d482b3990d4920044d70afd59352a8e97a36abb9520",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "51d61f0deee2340041d04d482b3990d4920044d70afd59352a8e97a36abb9520",
+                    "hash" : "0x51d61f0deee2340041d04d482b3990d4920044d70afd59352a8e97a36abb9520",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "51d61f0deee2340041d04d482b3990d4920044d70afd59352a8e97a36abb9520",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x457f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b56f977789947e197f828151867a73771a5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1862685167"
+                "0x6f0651ef"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest222.json b/GeneralStateTests/stRandom/randomStatetest222.json
index 936bd22e2..1f936c119 100644
--- a/GeneralStateTests/stRandom/randomStatetest222.json
+++ b/GeneralStateTests/stRandom/randomStatetest222.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest222" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "938eec74e2fc81c2cceb4427493bac7ac36228dc358fc191691d6367642a7423",
+                    "hash" : "0x938eec74e2fc81c2cceb4427493bac7ac36228dc358fc191691d6367642a7423",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "938eec74e2fc81c2cceb4427493bac7ac36228dc358fc191691d6367642a7423",
+                    "hash" : "0x938eec74e2fc81c2cceb4427493bac7ac36228dc358fc191691d6367642a7423",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "938eec74e2fc81c2cceb4427493bac7ac36228dc358fc191691d6367642a7423",
+                    "hash" : "0x938eec74e2fc81c2cceb4427493bac7ac36228dc358fc191691d6367642a7423",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "938eec74e2fc81c2cceb4427493bac7ac36228dc358fc191691d6367642a7423",
+                    "hash" : "0x938eec74e2fc81c2cceb4427493bac7ac36228dc358fc191691d6367642a7423",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "938eec74e2fc81c2cceb4427493bac7ac36228dc358fc191691d6367642a7423",
+                    "hash" : "0x938eec74e2fc81c2cceb4427493bac7ac36228dc358fc191691d6367642a7423",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "938eec74e2fc81c2cceb4427493bac7ac36228dc358fc191691d6367642a7423",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000001000000000000000000000000000000000000000043397f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3508160005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1727622047"
+                "0x66f96b9f"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest223.json b/GeneralStateTests/stRandom/randomStatetest223.json
index 9cef0043b..ff97cf445 100644
--- a/GeneralStateTests/stRandom/randomStatetest223.json
+++ b/GeneralStateTests/stRandom/randomStatetest223.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest223" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "56be8574c8111e7a378bd4bb6056c8f7ce2dd530bc8bb7c42e635d12484dd9f0",
+                    "hash" : "0x56be8574c8111e7a378bd4bb6056c8f7ce2dd530bc8bb7c42e635d12484dd9f0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "56be8574c8111e7a378bd4bb6056c8f7ce2dd530bc8bb7c42e635d12484dd9f0",
+                    "hash" : "0x56be8574c8111e7a378bd4bb6056c8f7ce2dd530bc8bb7c42e635d12484dd9f0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "56be8574c8111e7a378bd4bb6056c8f7ce2dd530bc8bb7c42e635d12484dd9f0",
+                    "hash" : "0x56be8574c8111e7a378bd4bb6056c8f7ce2dd530bc8bb7c42e635d12484dd9f0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "56be8574c8111e7a378bd4bb6056c8f7ce2dd530bc8bb7c42e635d12484dd9f0",
+                    "hash" : "0x56be8574c8111e7a378bd4bb6056c8f7ce2dd530bc8bb7c42e635d12484dd9f0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "56be8574c8111e7a378bd4bb6056c8f7ce2dd530bc8bb7c42e635d12484dd9f0",
+                    "hash" : "0x56be8574c8111e7a378bd4bb6056c8f7ce2dd530bc8bb7c42e635d12484dd9f0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "83db91420b09afa49ca7cbe4a31449b0c8167ac17f4e615fa306f66fc8ead236",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001631075803033455560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,8 +96,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x245d7b33"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest224.json b/GeneralStateTests/stRandom/randomStatetest224.json
index 0a7b90fd7..b881c47c1 100644
--- a/GeneralStateTests/stRandom/randomStatetest224.json
+++ b/GeneralStateTests/stRandom/randomStatetest224.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest224" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
             {
@@ -31,7 +31,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7102dfea8f2d491d1d588023bc7a5329580e5dc9e32513c1ef9567b950488ed9",
+                    "hash" : "0x7102dfea8f2d491d1d588023bc7a5329580e5dc9e32513c1ef9567b950488ed9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7102dfea8f2d491d1d588023bc7a5329580e5dc9e32513c1ef9567b950488ed9",
+                    "hash" : "0x7102dfea8f2d491d1d588023bc7a5329580e5dc9e32513c1ef9567b950488ed9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "7102dfea8f2d491d1d588023bc7a5329580e5dc9e32513c1ef9567b950488ed9",
+                    "hash" : "0x7102dfea8f2d491d1d588023bc7a5329580e5dc9e32513c1ef9567b950488ed9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,7 +61,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "7102dfea8f2d491d1d588023bc7a5329580e5dc9e32513c1ef9567b950488ed9",
+                    "hash" : "0x7102dfea8f2d491d1d588023bc7a5329580e5dc9e32513c1ef9567b950488ed9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -71,7 +71,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7102dfea8f2d491d1d588023bc7a5329580e5dc9e32513c1ef9567b950488ed9",
+                    "hash" : "0x7102dfea8f2d491d1d588023bc7a5329580e5dc9e32513c1ef9567b950488ed9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -82,23 +82,23 @@
         },
         "postStateRoot" : "7102dfea8f2d491d1d588023bc7a5329580e5dc9e32513c1ef9567b950488ed9",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000001a6202a31690a3a06f6e9307039b",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -113,10 +113,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1769274637"
+                "0x6974fd0d"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest225.json b/GeneralStateTests/stRandom/randomStatetest225.json
index 1f6de7d0f..6754a4c3c 100644
--- a/GeneralStateTests/stRandom/randomStatetest225.json
+++ b/GeneralStateTests/stRandom/randomStatetest225.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest225" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "902d24fae31a8038e3a7a43f6f5c3a309e5e53cd578f6e22af62bdc64914d96a",
+                    "hash" : "0x902d24fae31a8038e3a7a43f6f5c3a309e5e53cd578f6e22af62bdc64914d96a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "902d24fae31a8038e3a7a43f6f5c3a309e5e53cd578f6e22af62bdc64914d96a",
+                    "hash" : "0x902d24fae31a8038e3a7a43f6f5c3a309e5e53cd578f6e22af62bdc64914d96a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "902d24fae31a8038e3a7a43f6f5c3a309e5e53cd578f6e22af62bdc64914d96a",
+                    "hash" : "0x902d24fae31a8038e3a7a43f6f5c3a309e5e53cd578f6e22af62bdc64914d96a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "902d24fae31a8038e3a7a43f6f5c3a309e5e53cd578f6e22af62bdc64914d96a",
+                    "hash" : "0x902d24fae31a8038e3a7a43f6f5c3a309e5e53cd578f6e22af62bdc64914d96a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "902d24fae31a8038e3a7a43f6f5c3a309e5e53cd578f6e22af62bdc64914d96a",
+                    "hash" : "0x902d24fae31a8038e3a7a43f6f5c3a309e5e53cd578f6e22af62bdc64914d96a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "902d24fae31a8038e3a7a43f6f5c3a309e5e53cd578f6e22af62bdc64914d96a",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff506f69786c858e0703566f95f8993111901960005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "159749189"
+                "0x09859445"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest226.json b/GeneralStateTests/stRandom/randomStatetest226.json
index 3c88f48e2..0bf42bab8 100644
--- a/GeneralStateTests/stRandom/randomStatetest226.json
+++ b/GeneralStateTests/stRandom/randomStatetest226.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest226" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "caf56509c0e62bd8cbe90daa3c0d0ce026a4482f60fa4d88846d94b6b9001b5f",
+                    "hash" : "0xcaf56509c0e62bd8cbe90daa3c0d0ce026a4482f60fa4d88846d94b6b9001b5f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "caf56509c0e62bd8cbe90daa3c0d0ce026a4482f60fa4d88846d94b6b9001b5f",
+                    "hash" : "0xcaf56509c0e62bd8cbe90daa3c0d0ce026a4482f60fa4d88846d94b6b9001b5f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "caf56509c0e62bd8cbe90daa3c0d0ce026a4482f60fa4d88846d94b6b9001b5f",
+                    "hash" : "0xcaf56509c0e62bd8cbe90daa3c0d0ce026a4482f60fa4d88846d94b6b9001b5f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "caf56509c0e62bd8cbe90daa3c0d0ce026a4482f60fa4d88846d94b6b9001b5f",
+                    "hash" : "0xcaf56509c0e62bd8cbe90daa3c0d0ce026a4482f60fa4d88846d94b6b9001b5f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "caf56509c0e62bd8cbe90daa3c0d0ce026a4482f60fa4d88846d94b6b9001b5f",
+                    "hash" : "0xcaf56509c0e62bd8cbe90daa3c0d0ce026a4482f60fa4d88846d94b6b9001b5f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "caf56509c0e62bd8cbe90daa3c0d0ce026a4482f60fa4d88846d94b6b9001b5f",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c350357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe5a605560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,8 +96,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x1c91b9d0"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest227.json b/GeneralStateTests/stRandom/randomStatetest227.json
index 7d1e529f7..2c153d856 100644
--- a/GeneralStateTests/stRandom/randomStatetest227.json
+++ b/GeneralStateTests/stRandom/randomStatetest227.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest227" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "8fe48b64e997e6f8b1c8c85c33a610d5496af7b64e0dee5b709bed7d5486a8ae",
+                    "hash" : "0x8fe48b64e997e6f8b1c8c85c33a610d5496af7b64e0dee5b709bed7d5486a8ae",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "8fe48b64e997e6f8b1c8c85c33a610d5496af7b64e0dee5b709bed7d5486a8ae",
+                    "hash" : "0x8fe48b64e997e6f8b1c8c85c33a610d5496af7b64e0dee5b709bed7d5486a8ae",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "8fe48b64e997e6f8b1c8c85c33a610d5496af7b64e0dee5b709bed7d5486a8ae",
+                    "hash" : "0x8fe48b64e997e6f8b1c8c85c33a610d5496af7b64e0dee5b709bed7d5486a8ae",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "8fe48b64e997e6f8b1c8c85c33a610d5496af7b64e0dee5b709bed7d5486a8ae",
+                    "hash" : "0x8fe48b64e997e6f8b1c8c85c33a610d5496af7b64e0dee5b709bed7d5486a8ae",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "8fe48b64e997e6f8b1c8c85c33a610d5496af7b64e0dee5b709bed7d5486a8ae",
+                    "hash" : "0x8fe48b64e997e6f8b1c8c85c33a610d5496af7b64e0dee5b709bed7d5486a8ae",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "8fe48b64e997e6f8b1c8c85c33a610d5496af7b64e0dee5b709bed7d5486a8ae",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b56f108fa27475689e44993a528752a152335955",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1176634565"
+                "0x462204c5"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest228.json b/GeneralStateTests/stRandom/randomStatetest228.json
index 76d04957b..951afbd5c 100644
--- a/GeneralStateTests/stRandom/randomStatetest228.json
+++ b/GeneralStateTests/stRandom/randomStatetest228.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest228" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "113610ea39e84355710fe2dbd83ce9148fe511a2af21aa679f075d25c769ebaa",
+                    "hash" : "0x113610ea39e84355710fe2dbd83ce9148fe511a2af21aa679f075d25c769ebaa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "113610ea39e84355710fe2dbd83ce9148fe511a2af21aa679f075d25c769ebaa",
+                    "hash" : "0x113610ea39e84355710fe2dbd83ce9148fe511a2af21aa679f075d25c769ebaa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "567a8e4b4ae0c146b8e8b1fa7281df52329f0dd0a4917cc9e6ee53291b266204",
+                    "hash" : "0x567a8e4b4ae0c146b8e8b1fa7281df52329f0dd0a4917cc9e6ee53291b266204",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "567a8e4b4ae0c146b8e8b1fa7281df52329f0dd0a4917cc9e6ee53291b266204",
+                    "hash" : "0x567a8e4b4ae0c146b8e8b1fa7281df52329f0dd0a4917cc9e6ee53291b266204",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "113610ea39e84355710fe2dbd83ce9148fe511a2af21aa679f075d25c769ebaa",
+                    "hash" : "0x113610ea39e84355710fe2dbd83ce9148fe511a2af21aa679f075d25c769ebaa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "567a8e4b4ae0c146b8e8b1fa7281df52329f0dd0a4917cc9e6ee53291b266204",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x41434543454541443b5455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest229.json b/GeneralStateTests/stRandom/randomStatetest229.json
index 7e3dac291..1173b2f44 100644
--- a/GeneralStateTests/stRandom/randomStatetest229.json
+++ b/GeneralStateTests/stRandom/randomStatetest229.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest229" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "3ec331ff538940e6657801ada99688b9ab097a06cf26a923f8eca37477667f49",
+                    "hash" : "0x3ec331ff538940e6657801ada99688b9ab097a06cf26a923f8eca37477667f49",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "3ec331ff538940e6657801ada99688b9ab097a06cf26a923f8eca37477667f49",
+                    "hash" : "0x3ec331ff538940e6657801ada99688b9ab097a06cf26a923f8eca37477667f49",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3ec331ff538940e6657801ada99688b9ab097a06cf26a923f8eca37477667f49",
+                    "hash" : "0x3ec331ff538940e6657801ada99688b9ab097a06cf26a923f8eca37477667f49",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3ec331ff538940e6657801ada99688b9ab097a06cf26a923f8eca37477667f49",
+                    "hash" : "0x3ec331ff538940e6657801ada99688b9ab097a06cf26a923f8eca37477667f49",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "3ec331ff538940e6657801ada99688b9ab097a06cf26a923f8eca37477667f49",
+                    "hash" : "0x3ec331ff538940e6657801ada99688b9ab097a06cf26a923f8eca37477667f49",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "5c4dd6f4b5275c7a901bbf0109b8320691e642e4d199a3b66a45a720a6211eac",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x42434145410844455055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest23.json b/GeneralStateTests/stRandom/randomStatetest23.json
index 908e1bfbf..3e1e06a20 100644
--- a/GeneralStateTests/stRandom/randomStatetest23.json
+++ b/GeneralStateTests/stRandom/randomStatetest23.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest23" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d83aa6a74f4d3a8f93b4d6ac6a2b8f7bd6566fd43d52947addf153bd8dde5054",
+                    "hash" : "0xd83aa6a74f4d3a8f93b4d6ac6a2b8f7bd6566fd43d52947addf153bd8dde5054",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d83aa6a74f4d3a8f93b4d6ac6a2b8f7bd6566fd43d52947addf153bd8dde5054",
+                    "hash" : "0xd83aa6a74f4d3a8f93b4d6ac6a2b8f7bd6566fd43d52947addf153bd8dde5054",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "d83aa6a74f4d3a8f93b4d6ac6a2b8f7bd6566fd43d52947addf153bd8dde5054",
+                    "hash" : "0xd83aa6a74f4d3a8f93b4d6ac6a2b8f7bd6566fd43d52947addf153bd8dde5054",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "d83aa6a74f4d3a8f93b4d6ac6a2b8f7bd6566fd43d52947addf153bd8dde5054",
+                    "hash" : "0xd83aa6a74f4d3a8f93b4d6ac6a2b8f7bd6566fd43d52947addf153bd8dde5054",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d83aa6a74f4d3a8f93b4d6ac6a2b8f7bd6566fd43d52947addf153bd8dde5054",
+                    "hash" : "0xd83aa6a74f4d3a8f93b4d6ac6a2b8f7bd6566fd43d52947addf153bd8dde5054",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "d83aa6a74f4d3a8f93b4d6ac6a2b8f7bd6566fd43d52947addf153bd8dde5054",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f0000000000000000000000000000000000000000000000000000000000000001427f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f89418c1076f1544315601489386c915560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "667758155"
+                "0x27cd2e4b"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest230.json b/GeneralStateTests/stRandom/randomStatetest230.json
index 3e2762447..f93a425cd 100644
--- a/GeneralStateTests/stRandom/randomStatetest230.json
+++ b/GeneralStateTests/stRandom/randomStatetest230.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest230" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c359b6e3bcf98d71b3bb4c8bfaa31cb7c2c6939fd8eed215cb008fad55ce45e4",
+                    "hash" : "0xc359b6e3bcf98d71b3bb4c8bfaa31cb7c2c6939fd8eed215cb008fad55ce45e4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c359b6e3bcf98d71b3bb4c8bfaa31cb7c2c6939fd8eed215cb008fad55ce45e4",
+                    "hash" : "0xc359b6e3bcf98d71b3bb4c8bfaa31cb7c2c6939fd8eed215cb008fad55ce45e4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "c359b6e3bcf98d71b3bb4c8bfaa31cb7c2c6939fd8eed215cb008fad55ce45e4",
+                    "hash" : "0xc359b6e3bcf98d71b3bb4c8bfaa31cb7c2c6939fd8eed215cb008fad55ce45e4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c359b6e3bcf98d71b3bb4c8bfaa31cb7c2c6939fd8eed215cb008fad55ce45e4",
+                    "hash" : "0xc359b6e3bcf98d71b3bb4c8bfaa31cb7c2c6939fd8eed215cb008fad55ce45e4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c359b6e3bcf98d71b3bb4c8bfaa31cb7c2c6939fd8eed215cb008fad55ce45e4",
+                    "hash" : "0xc359b6e3bcf98d71b3bb4c8bfaa31cb7c2c6939fd8eed215cb008fad55ce45e4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "c359b6e3bcf98d71b3bb4c8bfaa31cb7c2c6939fd8eed215cb008fad55ce45e4",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c350427f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0960005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "856911811"
+                "0x33136fc3"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest231.json b/GeneralStateTests/stRandom/randomStatetest231.json
index c2e319835..b028b1dce 100644
--- a/GeneralStateTests/stRandom/randomStatetest231.json
+++ b/GeneralStateTests/stRandom/randomStatetest231.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest231" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "8db26c4474e668e3b4e48ff049891de3ca8a69a392345ea00d03f68ece3516fb",
+                    "hash" : "0x8db26c4474e668e3b4e48ff049891de3ca8a69a392345ea00d03f68ece3516fb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "8db26c4474e668e3b4e48ff049891de3ca8a69a392345ea00d03f68ece3516fb",
+                    "hash" : "0x8db26c4474e668e3b4e48ff049891de3ca8a69a392345ea00d03f68ece3516fb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "8db26c4474e668e3b4e48ff049891de3ca8a69a392345ea00d03f68ece3516fb",
+                    "hash" : "0x8db26c4474e668e3b4e48ff049891de3ca8a69a392345ea00d03f68ece3516fb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "8db26c4474e668e3b4e48ff049891de3ca8a69a392345ea00d03f68ece3516fb",
+                    "hash" : "0x8db26c4474e668e3b4e48ff049891de3ca8a69a392345ea00d03f68ece3516fb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "8db26c4474e668e3b4e48ff049891de3ca8a69a392345ea00d03f68ece3516fb",
+                    "hash" : "0x8db26c4474e668e3b4e48ff049891de3ca8a69a392345ea00d03f68ece3516fb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "8db26c4474e668e3b4e48ff049891de3ca8a69a392345ea00d03f68ece3516fb",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b56f7b98a491727a089df3365353329e805560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1271549054"
+                "0x4bca4c7e"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest232.json b/GeneralStateTests/stRandom/randomStatetest232.json
index 82362a138..b8f2ee29e 100644
--- a/GeneralStateTests/stRandom/randomStatetest232.json
+++ b/GeneralStateTests/stRandom/randomStatetest232.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest232" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a1e2f7a9535450d801c57495f093fc9ed5af0161aa3becc21de454f15552d5de",
+                    "hash" : "0xa1e2f7a9535450d801c57495f093fc9ed5af0161aa3becc21de454f15552d5de",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a1e2f7a9535450d801c57495f093fc9ed5af0161aa3becc21de454f15552d5de",
+                    "hash" : "0xa1e2f7a9535450d801c57495f093fc9ed5af0161aa3becc21de454f15552d5de",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "27d1145fe6adad506e5dd26c63a3e94813c89c5db7a011aab5daa85bdc7c01cf",
+                    "hash" : "0x27d1145fe6adad506e5dd26c63a3e94813c89c5db7a011aab5daa85bdc7c01cf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "27d1145fe6adad506e5dd26c63a3e94813c89c5db7a011aab5daa85bdc7c01cf",
+                    "hash" : "0x27d1145fe6adad506e5dd26c63a3e94813c89c5db7a011aab5daa85bdc7c01cf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a1e2f7a9535450d801c57495f093fc9ed5af0161aa3becc21de454f15552d5de",
+                    "hash" : "0xa1e2f7a9535450d801c57495f093fc9ed5af0161aa3becc21de454f15552d5de",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "27d1145fe6adad506e5dd26c63a3e94813c89c5db7a011aab5daa85bdc7c01cf",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0945415883ff9d7760005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "2122038787"
+                "0x7e7bbe03"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest233.json b/GeneralStateTests/stRandom/randomStatetest233.json
index 95149d5c7..e6ce7270c 100644
--- a/GeneralStateTests/stRandom/randomStatetest233.json
+++ b/GeneralStateTests/stRandom/randomStatetest233.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest233" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "89a81299ddb2523582de6db7dad040f4b94a648c7a9183c3f0c016daffff3efb",
+                    "hash" : "0x89a81299ddb2523582de6db7dad040f4b94a648c7a9183c3f0c016daffff3efb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "89a81299ddb2523582de6db7dad040f4b94a648c7a9183c3f0c016daffff3efb",
+                    "hash" : "0x89a81299ddb2523582de6db7dad040f4b94a648c7a9183c3f0c016daffff3efb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "89a81299ddb2523582de6db7dad040f4b94a648c7a9183c3f0c016daffff3efb",
+                    "hash" : "0x89a81299ddb2523582de6db7dad040f4b94a648c7a9183c3f0c016daffff3efb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "89a81299ddb2523582de6db7dad040f4b94a648c7a9183c3f0c016daffff3efb",
+                    "hash" : "0x89a81299ddb2523582de6db7dad040f4b94a648c7a9183c3f0c016daffff3efb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "89a81299ddb2523582de6db7dad040f4b94a648c7a9183c3f0c016daffff3efb",
+                    "hash" : "0x89a81299ddb2523582de6db7dad040f4b94a648c7a9183c3f0c016daffff3efb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "89a81299ddb2523582de6db7dad040f4b94a648c7a9183c3f0c016daffff3efb",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe817fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff42057f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff517f000000000000000000000001000000000000000000000000000000000000000065715460005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "2008364606"
+                "0x77b5363e"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest234.json b/GeneralStateTests/stRandom/randomStatetest234.json
index 9db41895f..620164035 100644
--- a/GeneralStateTests/stRandom/randomStatetest234.json
+++ b/GeneralStateTests/stRandom/randomStatetest234.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest234" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
             {
@@ -24,7 +24,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "29d435e0ba39d69b9a7f4c5c79051c64e9720cea736d2ce5ba9c53549105a530",
+                    "hash" : "0x29d435e0ba39d69b9a7f4c5c79051c64e9720cea736d2ce5ba9c53549105a530",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "29d435e0ba39d69b9a7f4c5c79051c64e9720cea736d2ce5ba9c53549105a530",
+                    "hash" : "0x29d435e0ba39d69b9a7f4c5c79051c64e9720cea736d2ce5ba9c53549105a530",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "29d435e0ba39d69b9a7f4c5c79051c64e9720cea736d2ce5ba9c53549105a530",
+                    "hash" : "0x29d435e0ba39d69b9a7f4c5c79051c64e9720cea736d2ce5ba9c53549105a530",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "29d435e0ba39d69b9a7f4c5c79051c64e9720cea736d2ce5ba9c53549105a530",
+                    "hash" : "0x29d435e0ba39d69b9a7f4c5c79051c64e9720cea736d2ce5ba9c53549105a530",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -64,7 +64,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "29d435e0ba39d69b9a7f4c5c79051c64e9720cea736d2ce5ba9c53549105a530",
+                    "hash" : "0x29d435e0ba39d69b9a7f4c5c79051c64e9720cea736d2ce5ba9c53549105a530",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -75,23 +75,23 @@
         },
         "postStateRoot" : "29d435e0ba39d69b9a7f4c5c79051c64e9720cea736d2ce5ba9c53549105a530",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09a3447d617a066c9437f337",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -106,10 +106,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "2026380732"
+                "0x78c81dbc"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest235.json b/GeneralStateTests/stRandom/randomStatetest235.json
index 58083b748..7936c995c 100644
--- a/GeneralStateTests/stRandom/randomStatetest235.json
+++ b/GeneralStateTests/stRandom/randomStatetest235.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest235" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "3467388ea7f70e98b3134b663c74cf004f498bbeeb8b2cb2d1ae119238bf81d8",
+                    "hash" : "0x3467388ea7f70e98b3134b663c74cf004f498bbeeb8b2cb2d1ae119238bf81d8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "3467388ea7f70e98b3134b663c74cf004f498bbeeb8b2cb2d1ae119238bf81d8",
+                    "hash" : "0x3467388ea7f70e98b3134b663c74cf004f498bbeeb8b2cb2d1ae119238bf81d8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3467388ea7f70e98b3134b663c74cf004f498bbeeb8b2cb2d1ae119238bf81d8",
+                    "hash" : "0x3467388ea7f70e98b3134b663c74cf004f498bbeeb8b2cb2d1ae119238bf81d8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3467388ea7f70e98b3134b663c74cf004f498bbeeb8b2cb2d1ae119238bf81d8",
+                    "hash" : "0x3467388ea7f70e98b3134b663c74cf004f498bbeeb8b2cb2d1ae119238bf81d8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "3467388ea7f70e98b3134b663c74cf004f498bbeeb8b2cb2d1ae119238bf81d8",
+                    "hash" : "0x3467388ea7f70e98b3134b663c74cf004f498bbeeb8b2cb2d1ae119238bf81d8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "3467388ea7f70e98b3134b663c74cf004f498bbeeb8b2cb2d1ae119238bf81d8",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x41407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe810967567786f29260005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "494785084"
+                "0x1d7dd23c"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest236.json b/GeneralStateTests/stRandom/randomStatetest236.json
index 9cf3aaaa1..3cbacae30 100644
--- a/GeneralStateTests/stRandom/randomStatetest236.json
+++ b/GeneralStateTests/stRandom/randomStatetest236.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest236" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7305a504ba858583fd34aa6e9d17e06a60a83b36d5189d2d63be84cda8694875",
+                    "hash" : "0x7305a504ba858583fd34aa6e9d17e06a60a83b36d5189d2d63be84cda8694875",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7305a504ba858583fd34aa6e9d17e06a60a83b36d5189d2d63be84cda8694875",
+                    "hash" : "0x7305a504ba858583fd34aa6e9d17e06a60a83b36d5189d2d63be84cda8694875",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "7305a504ba858583fd34aa6e9d17e06a60a83b36d5189d2d63be84cda8694875",
+                    "hash" : "0x7305a504ba858583fd34aa6e9d17e06a60a83b36d5189d2d63be84cda8694875",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "7305a504ba858583fd34aa6e9d17e06a60a83b36d5189d2d63be84cda8694875",
+                    "hash" : "0x7305a504ba858583fd34aa6e9d17e06a60a83b36d5189d2d63be84cda8694875",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7305a504ba858583fd34aa6e9d17e06a60a83b36d5189d2d63be84cda8694875",
+                    "hash" : "0x7305a504ba858583fd34aa6e9d17e06a60a83b36d5189d2d63be84cda8694875",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "7305a504ba858583fd34aa6e9d17e06a60a83b36d5189d2d63be84cda8694875",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe417f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000004339185560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1566255112"
+                "0x5d5b2808"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest237.json b/GeneralStateTests/stRandom/randomStatetest237.json
index c666b66f6..bedce6268 100644
--- a/GeneralStateTests/stRandom/randomStatetest237.json
+++ b/GeneralStateTests/stRandom/randomStatetest237.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest237" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "797091462e4a20ef75f83fb80a13c0a7254ec703e2d0ae425f1ebfaaafd84695",
+                    "hash" : "0x797091462e4a20ef75f83fb80a13c0a7254ec703e2d0ae425f1ebfaaafd84695",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "797091462e4a20ef75f83fb80a13c0a7254ec703e2d0ae425f1ebfaaafd84695",
+                    "hash" : "0x797091462e4a20ef75f83fb80a13c0a7254ec703e2d0ae425f1ebfaaafd84695",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "797091462e4a20ef75f83fb80a13c0a7254ec703e2d0ae425f1ebfaaafd84695",
+                    "hash" : "0x797091462e4a20ef75f83fb80a13c0a7254ec703e2d0ae425f1ebfaaafd84695",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "797091462e4a20ef75f83fb80a13c0a7254ec703e2d0ae425f1ebfaaafd84695",
+                    "hash" : "0x797091462e4a20ef75f83fb80a13c0a7254ec703e2d0ae425f1ebfaaafd84695",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "797091462e4a20ef75f83fb80a13c0a7254ec703e2d0ae425f1ebfaaafd84695",
+                    "hash" : "0x797091462e4a20ef75f83fb80a13c0a7254ec703e2d0ae425f1ebfaaafd84695",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "797091462e4a20ef75f83fb80a13c0a7254ec703e2d0ae425f1ebfaaafd84695",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000000000000000000000000001537f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000000039385560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "978542004"
+                "0x3a535db4"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest238.json b/GeneralStateTests/stRandom/randomStatetest238.json
index b9fb1e881..b9cf11230 100644
--- a/GeneralStateTests/stRandom/randomStatetest238.json
+++ b/GeneralStateTests/stRandom/randomStatetest238.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest238" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "551e646555c4197f3218ec3ad0b8d5ed55003cb5ee9720ca0acea5945f1f60cd",
+                    "hash" : "0x551e646555c4197f3218ec3ad0b8d5ed55003cb5ee9720ca0acea5945f1f60cd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "551e646555c4197f3218ec3ad0b8d5ed55003cb5ee9720ca0acea5945f1f60cd",
+                    "hash" : "0x551e646555c4197f3218ec3ad0b8d5ed55003cb5ee9720ca0acea5945f1f60cd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "551e646555c4197f3218ec3ad0b8d5ed55003cb5ee9720ca0acea5945f1f60cd",
+                    "hash" : "0x551e646555c4197f3218ec3ad0b8d5ed55003cb5ee9720ca0acea5945f1f60cd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "551e646555c4197f3218ec3ad0b8d5ed55003cb5ee9720ca0acea5945f1f60cd",
+                    "hash" : "0x551e646555c4197f3218ec3ad0b8d5ed55003cb5ee9720ca0acea5945f1f60cd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "551e646555c4197f3218ec3ad0b8d5ed55003cb5ee9720ca0acea5945f1f60cd",
+                    "hash" : "0x551e646555c4197f3218ec3ad0b8d5ed55003cb5ee9720ca0acea5945f1f60cd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "551e646555c4197f3218ec3ad0b8d5ed55003cb5ee9720ca0acea5945f1f60cd",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff307fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f7c748813587e990566719934f342316c60005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "267928924"
+                "0x0ff8455c"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest239.json b/GeneralStateTests/stRandom/randomStatetest239.json
index 35ce007b3..93b096d79 100644
--- a/GeneralStateTests/stRandom/randomStatetest239.json
+++ b/GeneralStateTests/stRandom/randomStatetest239.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest239" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "14ea297f8c22fcc16c6770c53511aa9e71ee4c73e6d64d85036c78d70ef62ccd",
+                    "hash" : "0x14ea297f8c22fcc16c6770c53511aa9e71ee4c73e6d64d85036c78d70ef62ccd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "14ea297f8c22fcc16c6770c53511aa9e71ee4c73e6d64d85036c78d70ef62ccd",
+                    "hash" : "0x14ea297f8c22fcc16c6770c53511aa9e71ee4c73e6d64d85036c78d70ef62ccd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "14ea297f8c22fcc16c6770c53511aa9e71ee4c73e6d64d85036c78d70ef62ccd",
+                    "hash" : "0x14ea297f8c22fcc16c6770c53511aa9e71ee4c73e6d64d85036c78d70ef62ccd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "14ea297f8c22fcc16c6770c53511aa9e71ee4c73e6d64d85036c78d70ef62ccd",
+                    "hash" : "0x14ea297f8c22fcc16c6770c53511aa9e71ee4c73e6d64d85036c78d70ef62ccd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "14ea297f8c22fcc16c6770c53511aa9e71ee4c73e6d64d85036c78d70ef62ccd",
+                    "hash" : "0x14ea297f8c22fcc16c6770c53511aa9e71ee4c73e6d64d85036c78d70ef62ccd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "14ea297f8c22fcc16c6770c53511aa9e71ee4c73e6d64d85036c78d70ef62ccd",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x427f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000000000000000000000000000000000000000c3504535625b1a39921909f311178655",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1251612581"
+                "0x4a9a17a5"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest24.json b/GeneralStateTests/stRandom/randomStatetest24.json
index 0d2c807bf..cb2fdce80 100644
--- a/GeneralStateTests/stRandom/randomStatetest24.json
+++ b/GeneralStateTests/stRandom/randomStatetest24.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest24" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b319385cfc5c92f37a91028cf8d74e58564275ccb12105334c98468f56d7259a",
+                    "hash" : "0xb319385cfc5c92f37a91028cf8d74e58564275ccb12105334c98468f56d7259a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b319385cfc5c92f37a91028cf8d74e58564275ccb12105334c98468f56d7259a",
+                    "hash" : "0xb319385cfc5c92f37a91028cf8d74e58564275ccb12105334c98468f56d7259a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b319385cfc5c92f37a91028cf8d74e58564275ccb12105334c98468f56d7259a",
+                    "hash" : "0xb319385cfc5c92f37a91028cf8d74e58564275ccb12105334c98468f56d7259a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b319385cfc5c92f37a91028cf8d74e58564275ccb12105334c98468f56d7259a",
+                    "hash" : "0xb319385cfc5c92f37a91028cf8d74e58564275ccb12105334c98468f56d7259a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b319385cfc5c92f37a91028cf8d74e58564275ccb12105334c98468f56d7259a",
+                    "hash" : "0xb319385cfc5c92f37a91028cf8d74e58564275ccb12105334c98468f56d7259a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "b319385cfc5c92f37a91028cf8d74e58564275ccb12105334c98468f56d7259a",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x41417f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff459d7f0000000000000000000000000000000000000000000000000000000000000001817f000000000000000000000000000000000000000000000000000000000000c35095418211337b0530435560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1715561909"
+                "0x664165b5"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest240.json b/GeneralStateTests/stRandom/randomStatetest240.json
index bc4da48b1..e7225bfa8 100644
--- a/GeneralStateTests/stRandom/randomStatetest240.json
+++ b/GeneralStateTests/stRandom/randomStatetest240.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest240" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c04ec91e3137f2cad7f3210eb3d7d44448d75efad3829c08f153a7a139cdf585",
+                    "hash" : "0xc04ec91e3137f2cad7f3210eb3d7d44448d75efad3829c08f153a7a139cdf585",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c04ec91e3137f2cad7f3210eb3d7d44448d75efad3829c08f153a7a139cdf585",
+                    "hash" : "0xc04ec91e3137f2cad7f3210eb3d7d44448d75efad3829c08f153a7a139cdf585",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "c04ec91e3137f2cad7f3210eb3d7d44448d75efad3829c08f153a7a139cdf585",
+                    "hash" : "0xc04ec91e3137f2cad7f3210eb3d7d44448d75efad3829c08f153a7a139cdf585",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c04ec91e3137f2cad7f3210eb3d7d44448d75efad3829c08f153a7a139cdf585",
+                    "hash" : "0xc04ec91e3137f2cad7f3210eb3d7d44448d75efad3829c08f153a7a139cdf585",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c04ec91e3137f2cad7f3210eb3d7d44448d75efad3829c08f153a7a139cdf585",
+                    "hash" : "0xc04ec91e3137f2cad7f3210eb3d7d44448d75efad3829c08f153a7a139cdf585",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "c04ec91e3137f2cad7f3210eb3d7d44448d75efad3829c08f153a7a139cdf585",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x45404042455a43f36109",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest241.json b/GeneralStateTests/stRandom/randomStatetest241.json
index f8a74f9df..2617d088f 100644
--- a/GeneralStateTests/stRandom/randomStatetest241.json
+++ b/GeneralStateTests/stRandom/randomStatetest241.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest241" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "2f72e484017ca8242e1662e1739956ff9f8f6ca7e0c91465650dd5c879372040",
+                    "hash" : "0x2f72e484017ca8242e1662e1739956ff9f8f6ca7e0c91465650dd5c879372040",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "2f72e484017ca8242e1662e1739956ff9f8f6ca7e0c91465650dd5c879372040",
+                    "hash" : "0x2f72e484017ca8242e1662e1739956ff9f8f6ca7e0c91465650dd5c879372040",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2f72e484017ca8242e1662e1739956ff9f8f6ca7e0c91465650dd5c879372040",
+                    "hash" : "0x2f72e484017ca8242e1662e1739956ff9f8f6ca7e0c91465650dd5c879372040",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "2f72e484017ca8242e1662e1739956ff9f8f6ca7e0c91465650dd5c879372040",
+                    "hash" : "0x2f72e484017ca8242e1662e1739956ff9f8f6ca7e0c91465650dd5c879372040",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "2f72e484017ca8242e1662e1739956ff9f8f6ca7e0c91465650dd5c879372040",
+                    "hash" : "0x2f72e484017ca8242e1662e1739956ff9f8f6ca7e0c91465650dd5c879372040",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "9324d0729794da968cacf9da923ee21d1122dd28449c2964ce6f3de9f3df4eb9",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x41421942450855678a044455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest242.json b/GeneralStateTests/stRandom/randomStatetest242.json
index 83226124f..d6cecbb42 100644
--- a/GeneralStateTests/stRandom/randomStatetest242.json
+++ b/GeneralStateTests/stRandom/randomStatetest242.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest242" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6ef9be2c66e97b5db4ce78d5ecf32ac169cb713671a381f46351de237427f712",
+                    "hash" : "0x6ef9be2c66e97b5db4ce78d5ecf32ac169cb713671a381f46351de237427f712",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6ef9be2c66e97b5db4ce78d5ecf32ac169cb713671a381f46351de237427f712",
+                    "hash" : "0x6ef9be2c66e97b5db4ce78d5ecf32ac169cb713671a381f46351de237427f712",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6ef9be2c66e97b5db4ce78d5ecf32ac169cb713671a381f46351de237427f712",
+                    "hash" : "0x6ef9be2c66e97b5db4ce78d5ecf32ac169cb713671a381f46351de237427f712",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6ef9be2c66e97b5db4ce78d5ecf32ac169cb713671a381f46351de237427f712",
+                    "hash" : "0x6ef9be2c66e97b5db4ce78d5ecf32ac169cb713671a381f46351de237427f712",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6ef9be2c66e97b5db4ce78d5ecf32ac169cb713671a381f46351de237427f712",
+                    "hash" : "0x6ef9be2c66e97b5db4ce78d5ecf32ac169cb713671a381f46351de237427f712",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "6ef9be2c66e97b5db4ce78d5ecf32ac169cb713671a381f46351de237427f712",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0860005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "2110467172"
+                "0x7dcb2c64"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest243.json b/GeneralStateTests/stRandom/randomStatetest243.json
index 9a270da36..d80d6a99e 100644
--- a/GeneralStateTests/stRandom/randomStatetest243.json
+++ b/GeneralStateTests/stRandom/randomStatetest243.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest243" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "befe0b5734c3aeb88c8325fed50ed53b2fa521643bf32edb8a2ee696e2038490",
+                    "hash" : "0xbefe0b5734c3aeb88c8325fed50ed53b2fa521643bf32edb8a2ee696e2038490",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "befe0b5734c3aeb88c8325fed50ed53b2fa521643bf32edb8a2ee696e2038490",
+                    "hash" : "0xbefe0b5734c3aeb88c8325fed50ed53b2fa521643bf32edb8a2ee696e2038490",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "befe0b5734c3aeb88c8325fed50ed53b2fa521643bf32edb8a2ee696e2038490",
+                    "hash" : "0xbefe0b5734c3aeb88c8325fed50ed53b2fa521643bf32edb8a2ee696e2038490",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "befe0b5734c3aeb88c8325fed50ed53b2fa521643bf32edb8a2ee696e2038490",
+                    "hash" : "0xbefe0b5734c3aeb88c8325fed50ed53b2fa521643bf32edb8a2ee696e2038490",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "befe0b5734c3aeb88c8325fed50ed53b2fa521643bf32edb8a2ee696e2038490",
+                    "hash" : "0xbefe0b5734c3aeb88c8325fed50ed53b2fa521643bf32edb8a2ee696e2038490",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "befe0b5734c3aeb88c8325fed50ed53b2fa521643bf32edb8a2ee696e2038490",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3506f4245446640764068625545586684905560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "77136812"
+                "0x049903ac"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest244.json b/GeneralStateTests/stRandom/randomStatetest244.json
index ff3035755..b215a6a92 100644
--- a/GeneralStateTests/stRandom/randomStatetest244.json
+++ b/GeneralStateTests/stRandom/randomStatetest244.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest244" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "48ef2e2677e17cf4c43d096c5851bc734f5806a095b96df6f2ead520a5ca5d72",
+                    "hash" : "0x48ef2e2677e17cf4c43d096c5851bc734f5806a095b96df6f2ead520a5ca5d72",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "48ef2e2677e17cf4c43d096c5851bc734f5806a095b96df6f2ead520a5ca5d72",
+                    "hash" : "0x48ef2e2677e17cf4c43d096c5851bc734f5806a095b96df6f2ead520a5ca5d72",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "876d77beb54ba85ddf56589c9947d67ceaa9efc383795013bfb3720ad99a9bbe",
+                    "hash" : "0x876d77beb54ba85ddf56589c9947d67ceaa9efc383795013bfb3720ad99a9bbe",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "876d77beb54ba85ddf56589c9947d67ceaa9efc383795013bfb3720ad99a9bbe",
+                    "hash" : "0x876d77beb54ba85ddf56589c9947d67ceaa9efc383795013bfb3720ad99a9bbe",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "48ef2e2677e17cf4c43d096c5851bc734f5806a095b96df6f2ead520a5ca5d72",
+                    "hash" : "0x48ef2e2677e17cf4c43d096c5851bc734f5806a095b96df6f2ead520a5ca5d72",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "876d77beb54ba85ddf56589c9947d67ceaa9efc383795013bfb3720ad99a9bbe",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x4542074343424141315155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest245.json b/GeneralStateTests/stRandom/randomStatetest245.json
index 71d4f9d1a..85fac0d67 100644
--- a/GeneralStateTests/stRandom/randomStatetest245.json
+++ b/GeneralStateTests/stRandom/randomStatetest245.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest245" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "ff97d6cc5dec86a6a49d0a49a81d5958f29b0e0b82c79a1fdee4e6d5ee0b385e",
+                    "hash" : "0xff97d6cc5dec86a6a49d0a49a81d5958f29b0e0b82c79a1fdee4e6d5ee0b385e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "ff97d6cc5dec86a6a49d0a49a81d5958f29b0e0b82c79a1fdee4e6d5ee0b385e",
+                    "hash" : "0xff97d6cc5dec86a6a49d0a49a81d5958f29b0e0b82c79a1fdee4e6d5ee0b385e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "ff97d6cc5dec86a6a49d0a49a81d5958f29b0e0b82c79a1fdee4e6d5ee0b385e",
+                    "hash" : "0xff97d6cc5dec86a6a49d0a49a81d5958f29b0e0b82c79a1fdee4e6d5ee0b385e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ff97d6cc5dec86a6a49d0a49a81d5958f29b0e0b82c79a1fdee4e6d5ee0b385e",
+                    "hash" : "0xff97d6cc5dec86a6a49d0a49a81d5958f29b0e0b82c79a1fdee4e6d5ee0b385e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "ff97d6cc5dec86a6a49d0a49a81d5958f29b0e0b82c79a1fdee4e6d5ee0b385e",
+                    "hash" : "0xff97d6cc5dec86a6a49d0a49a81d5958f29b0e0b82c79a1fdee4e6d5ee0b385e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "ff97d6cc5dec86a6a49d0a49a81d5958f29b0e0b82c79a1fdee4e6d5ee0b385e",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff157f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0469877c39141650434587895560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "278621847"
+                "0x109b6e97"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest246.json b/GeneralStateTests/stRandom/randomStatetest246.json
index 9a29912a2..3c0bf76cc 100644
--- a/GeneralStateTests/stRandom/randomStatetest246.json
+++ b/GeneralStateTests/stRandom/randomStatetest246.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest246" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e6356e31f92da5bd4220e189f3fcb5378dbc9e2c7a6fa11f053e3e613a22eaa0",
+                    "hash" : "0xe6356e31f92da5bd4220e189f3fcb5378dbc9e2c7a6fa11f053e3e613a22eaa0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e6356e31f92da5bd4220e189f3fcb5378dbc9e2c7a6fa11f053e3e613a22eaa0",
+                    "hash" : "0xe6356e31f92da5bd4220e189f3fcb5378dbc9e2c7a6fa11f053e3e613a22eaa0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "90feb2075015e6ab898eb64698b5e7b3b41bc6a847e0ae5b3f0b19f11203e015",
+                    "hash" : "0x90feb2075015e6ab898eb64698b5e7b3b41bc6a847e0ae5b3f0b19f11203e015",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "90feb2075015e6ab898eb64698b5e7b3b41bc6a847e0ae5b3f0b19f11203e015",
+                    "hash" : "0x90feb2075015e6ab898eb64698b5e7b3b41bc6a847e0ae5b3f0b19f11203e015",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e6356e31f92da5bd4220e189f3fcb5378dbc9e2c7a6fa11f053e3e613a22eaa0",
+                    "hash" : "0xe6356e31f92da5bd4220e189f3fcb5378dbc9e2c7a6fa11f053e3e613a22eaa0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "f70420ecb168239279a2ff60e0c85aa7b7bdd5dea046627c123f8965159fda04",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x434241314441434293170955",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest247.json b/GeneralStateTests/stRandom/randomStatetest247.json
index ea1c770a8..429cb5997 100644
--- a/GeneralStateTests/stRandom/randomStatetest247.json
+++ b/GeneralStateTests/stRandom/randomStatetest247.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest247" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "4c4262926ad2e0b2a709de1752c3384d85986af2586e88d0e9d3a2174095a05f",
+                    "hash" : "0x4c4262926ad2e0b2a709de1752c3384d85986af2586e88d0e9d3a2174095a05f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "4c4262926ad2e0b2a709de1752c3384d85986af2586e88d0e9d3a2174095a05f",
+                    "hash" : "0x4c4262926ad2e0b2a709de1752c3384d85986af2586e88d0e9d3a2174095a05f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4c4262926ad2e0b2a709de1752c3384d85986af2586e88d0e9d3a2174095a05f",
+                    "hash" : "0x4c4262926ad2e0b2a709de1752c3384d85986af2586e88d0e9d3a2174095a05f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4c4262926ad2e0b2a709de1752c3384d85986af2586e88d0e9d3a2174095a05f",
+                    "hash" : "0x4c4262926ad2e0b2a709de1752c3384d85986af2586e88d0e9d3a2174095a05f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "4c4262926ad2e0b2a709de1752c3384d85986af2586e88d0e9d3a2174095a05f",
+                    "hash" : "0x4c4262926ad2e0b2a709de1752c3384d85986af2586e88d0e9d3a2174095a05f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "4c4262926ad2e0b2a709de1752c3384d85986af2586e88d0e9d3a2174095a05f",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0460005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1135930745"
+                "0x43b4ed79"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest248.json b/GeneralStateTests/stRandom/randomStatetest248.json
index 11cbf9f06..6d641c707 100644
--- a/GeneralStateTests/stRandom/randomStatetest248.json
+++ b/GeneralStateTests/stRandom/randomStatetest248.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest248" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "603b1abdbe0de42d125e99573bddc780216eb63aef1a560c7775bde349e4f440",
+                    "hash" : "0x603b1abdbe0de42d125e99573bddc780216eb63aef1a560c7775bde349e4f440",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "603b1abdbe0de42d125e99573bddc780216eb63aef1a560c7775bde349e4f440",
+                    "hash" : "0x603b1abdbe0de42d125e99573bddc780216eb63aef1a560c7775bde349e4f440",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "bae76e2729692bbeb8c29d5577071c6ae382645fcbb40e340cff51c35673b597",
+                    "hash" : "0xbae76e2729692bbeb8c29d5577071c6ae382645fcbb40e340cff51c35673b597",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "bae76e2729692bbeb8c29d5577071c6ae382645fcbb40e340cff51c35673b597",
+                    "hash" : "0xbae76e2729692bbeb8c29d5577071c6ae382645fcbb40e340cff51c35673b597",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "603b1abdbe0de42d125e99573bddc780216eb63aef1a560c7775bde349e4f440",
+                    "hash" : "0x603b1abdbe0de42d125e99573bddc780216eb63aef1a560c7775bde349e4f440",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "bae76e2729692bbeb8c29d5577071c6ae382645fcbb40e340cff51c35673b597",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000000000000000000000000001427f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8636f2599055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "549769638"
+                "0x20c4d1a6"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest249.json b/GeneralStateTests/stRandom/randomStatetest249.json
index 7c27ea942..5cfd9ffce 100644
--- a/GeneralStateTests/stRandom/randomStatetest249.json
+++ b/GeneralStateTests/stRandom/randomStatetest249.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest249" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b994437ee114888e116a679a0fe06b3c42bce012c12ddc12657a3f54129bd663",
+                    "hash" : "0xb994437ee114888e116a679a0fe06b3c42bce012c12ddc12657a3f54129bd663",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b994437ee114888e116a679a0fe06b3c42bce012c12ddc12657a3f54129bd663",
+                    "hash" : "0xb994437ee114888e116a679a0fe06b3c42bce012c12ddc12657a3f54129bd663",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b994437ee114888e116a679a0fe06b3c42bce012c12ddc12657a3f54129bd663",
+                    "hash" : "0xb994437ee114888e116a679a0fe06b3c42bce012c12ddc12657a3f54129bd663",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b994437ee114888e116a679a0fe06b3c42bce012c12ddc12657a3f54129bd663",
+                    "hash" : "0xb994437ee114888e116a679a0fe06b3c42bce012c12ddc12657a3f54129bd663",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b994437ee114888e116a679a0fe06b3c42bce012c12ddc12657a3f54129bd663",
+                    "hash" : "0xb994437ee114888e116a679a0fe06b3c42bce012c12ddc12657a3f54129bd663",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "b994437ee114888e116a679a0fe06b3c42bce012c12ddc12657a3f54129bd663",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000000012807f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000003960005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1871659531"
+                "0x6f8f420b"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest25.json b/GeneralStateTests/stRandom/randomStatetest25.json
index 37af01514..e84341f01 100644
--- a/GeneralStateTests/stRandom/randomStatetest25.json
+++ b/GeneralStateTests/stRandom/randomStatetest25.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest25" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7b8dc9863790422e0b6796b54b923b0a1b7ab71d682312209423b17979319dcf",
+                    "hash" : "0x7b8dc9863790422e0b6796b54b923b0a1b7ab71d682312209423b17979319dcf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7b8dc9863790422e0b6796b54b923b0a1b7ab71d682312209423b17979319dcf",
+                    "hash" : "0x7b8dc9863790422e0b6796b54b923b0a1b7ab71d682312209423b17979319dcf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "7b8dc9863790422e0b6796b54b923b0a1b7ab71d682312209423b17979319dcf",
+                    "hash" : "0x7b8dc9863790422e0b6796b54b923b0a1b7ab71d682312209423b17979319dcf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "7b8dc9863790422e0b6796b54b923b0a1b7ab71d682312209423b17979319dcf",
+                    "hash" : "0x7b8dc9863790422e0b6796b54b923b0a1b7ab71d682312209423b17979319dcf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7b8dc9863790422e0b6796b54b923b0a1b7ab71d682312209423b17979319dcf",
+                    "hash" : "0x7b8dc9863790422e0b6796b54b923b0a1b7ab71d682312209423b17979319dcf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "7b8dc9863790422e0b6796b54b923b0a1b7ab71d682312209423b17979319dcf",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x427f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000010000000000000000000000000000000000000000437f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff807f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6844f1389163a444405b123678749c55",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,8 +96,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x731ee4d0"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest250.json b/GeneralStateTests/stRandom/randomStatetest250.json
index 4607d94c8..ec40f6962 100644
--- a/GeneralStateTests/stRandom/randomStatetest250.json
+++ b/GeneralStateTests/stRandom/randomStatetest250.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest250" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "cfbcad42dfd8524a08d45d9badd9a9db60dc4337f69d3c964f01af504f91a183",
+                    "hash" : "0xcfbcad42dfd8524a08d45d9badd9a9db60dc4337f69d3c964f01af504f91a183",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "cfbcad42dfd8524a08d45d9badd9a9db60dc4337f69d3c964f01af504f91a183",
+                    "hash" : "0xcfbcad42dfd8524a08d45d9badd9a9db60dc4337f69d3c964f01af504f91a183",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "cfbcad42dfd8524a08d45d9badd9a9db60dc4337f69d3c964f01af504f91a183",
+                    "hash" : "0xcfbcad42dfd8524a08d45d9badd9a9db60dc4337f69d3c964f01af504f91a183",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "cfbcad42dfd8524a08d45d9badd9a9db60dc4337f69d3c964f01af504f91a183",
+                    "hash" : "0xcfbcad42dfd8524a08d45d9badd9a9db60dc4337f69d3c964f01af504f91a183",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "cfbcad42dfd8524a08d45d9badd9a9db60dc4337f69d3c964f01af504f91a183",
+                    "hash" : "0xcfbcad42dfd8524a08d45d9badd9a9db60dc4337f69d3c964f01af504f91a183",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "cfbcad42dfd8524a08d45d9badd9a9db60dc4337f69d3c964f01af504f91a183",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x557ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5627f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b56a328b186e166407917c7af102925060005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1535680761"
+                "0x5b88a0f9"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest251.json b/GeneralStateTests/stRandom/randomStatetest251.json
index 3c2ad1a4b..4073df745 100644
--- a/GeneralStateTests/stRandom/randomStatetest251.json
+++ b/GeneralStateTests/stRandom/randomStatetest251.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest251" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "da85203ef9f44556143339fd61425f8184b51a8a0bd7a6b132933c1064f8b7f2",
+                    "hash" : "0xda85203ef9f44556143339fd61425f8184b51a8a0bd7a6b132933c1064f8b7f2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "da85203ef9f44556143339fd61425f8184b51a8a0bd7a6b132933c1064f8b7f2",
+                    "hash" : "0xda85203ef9f44556143339fd61425f8184b51a8a0bd7a6b132933c1064f8b7f2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "da85203ef9f44556143339fd61425f8184b51a8a0bd7a6b132933c1064f8b7f2",
+                    "hash" : "0xda85203ef9f44556143339fd61425f8184b51a8a0bd7a6b132933c1064f8b7f2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "da85203ef9f44556143339fd61425f8184b51a8a0bd7a6b132933c1064f8b7f2",
+                    "hash" : "0xda85203ef9f44556143339fd61425f8184b51a8a0bd7a6b132933c1064f8b7f2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "da85203ef9f44556143339fd61425f8184b51a8a0bd7a6b132933c1064f8b7f2",
+                    "hash" : "0xda85203ef9f44556143339fd61425f8184b51a8a0bd7a6b132933c1064f8b7f2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "da85203ef9f44556143339fd61425f8184b51a8a0bd7a6b132933c1064f8b7f2",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f0000000000000000000000000000000000000000000000000000000000000000447f000000000000000000000000000000000000000000000000000000000000c3505b7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe417f00000000000000000000000000000000000000000000000000000000000000006867f1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "395877699"
+                "0x17989d43"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest252.json b/GeneralStateTests/stRandom/randomStatetest252.json
index 0a85bcc51..415f4ff87 100644
--- a/GeneralStateTests/stRandom/randomStatetest252.json
+++ b/GeneralStateTests/stRandom/randomStatetest252.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest252" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1dab5ba92043d9382e5987e2efa9a15ae8e4bee0ee5b5b730edcd5d7d5d9c1ba",
+                    "hash" : "0x1dab5ba92043d9382e5987e2efa9a15ae8e4bee0ee5b5b730edcd5d7d5d9c1ba",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "1dab5ba92043d9382e5987e2efa9a15ae8e4bee0ee5b5b730edcd5d7d5d9c1ba",
+                    "hash" : "0x1dab5ba92043d9382e5987e2efa9a15ae8e4bee0ee5b5b730edcd5d7d5d9c1ba",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "1dab5ba92043d9382e5987e2efa9a15ae8e4bee0ee5b5b730edcd5d7d5d9c1ba",
+                    "hash" : "0x1dab5ba92043d9382e5987e2efa9a15ae8e4bee0ee5b5b730edcd5d7d5d9c1ba",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "1dab5ba92043d9382e5987e2efa9a15ae8e4bee0ee5b5b730edcd5d7d5d9c1ba",
+                    "hash" : "0x1dab5ba92043d9382e5987e2efa9a15ae8e4bee0ee5b5b730edcd5d7d5d9c1ba",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "1dab5ba92043d9382e5987e2efa9a15ae8e4bee0ee5b5b730edcd5d7d5d9c1ba",
+                    "hash" : "0x1dab5ba92043d9382e5987e2efa9a15ae8e4bee0ee5b5b730edcd5d7d5d9c1ba",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "1dab5ba92043d9382e5987e2efa9a15ae8e4bee0ee5b5b730edcd5d7d5d9c1ba",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x387b414543444043899e863a628b55",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest253.json b/GeneralStateTests/stRandom/randomStatetest253.json
index 3ea8fc52b..aae7cd708 100644
--- a/GeneralStateTests/stRandom/randomStatetest253.json
+++ b/GeneralStateTests/stRandom/randomStatetest253.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest253" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9c851a286719519aaf0fec9889bb897519db633fc49dd0572868d52f0d5db9f9",
+                    "hash" : "0x9c851a286719519aaf0fec9889bb897519db633fc49dd0572868d52f0d5db9f9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9c851a286719519aaf0fec9889bb897519db633fc49dd0572868d52f0d5db9f9",
+                    "hash" : "0x9c851a286719519aaf0fec9889bb897519db633fc49dd0572868d52f0d5db9f9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "83a2e1f19e92cc28847d488bc7dbe8d2445dd2555e49296d838bacf3c6948744",
+                    "hash" : "0x83a2e1f19e92cc28847d488bc7dbe8d2445dd2555e49296d838bacf3c6948744",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "83a2e1f19e92cc28847d488bc7dbe8d2445dd2555e49296d838bacf3c6948744",
+                    "hash" : "0x83a2e1f19e92cc28847d488bc7dbe8d2445dd2555e49296d838bacf3c6948744",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9c851a286719519aaf0fec9889bb897519db633fc49dd0572868d52f0d5db9f9",
+                    "hash" : "0x9c851a286719519aaf0fec9889bb897519db633fc49dd0572868d52f0d5db9f9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "10160446332a414b6d3d6f92cbb080f5f9f21c284ddf1f9256d7cd5958e297d8",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x4243428144424140f271f155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest254.json b/GeneralStateTests/stRandom/randomStatetest254.json
index a6463d8ae..0aafd7b11 100644
--- a/GeneralStateTests/stRandom/randomStatetest254.json
+++ b/GeneralStateTests/stRandom/randomStatetest254.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest254" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "488d7e2efe45b261af7711a80c37196e8228351a2f76f3a3efcf84a933e7118a",
+                    "hash" : "0x488d7e2efe45b261af7711a80c37196e8228351a2f76f3a3efcf84a933e7118a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "488d7e2efe45b261af7711a80c37196e8228351a2f76f3a3efcf84a933e7118a",
+                    "hash" : "0x488d7e2efe45b261af7711a80c37196e8228351a2f76f3a3efcf84a933e7118a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "488d7e2efe45b261af7711a80c37196e8228351a2f76f3a3efcf84a933e7118a",
+                    "hash" : "0x488d7e2efe45b261af7711a80c37196e8228351a2f76f3a3efcf84a933e7118a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "488d7e2efe45b261af7711a80c37196e8228351a2f76f3a3efcf84a933e7118a",
+                    "hash" : "0x488d7e2efe45b261af7711a80c37196e8228351a2f76f3a3efcf84a933e7118a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "488d7e2efe45b261af7711a80c37196e8228351a2f76f3a3efcf84a933e7118a",
+                    "hash" : "0x488d7e2efe45b261af7711a80c37196e8228351a2f76f3a3efcf84a933e7118a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "488d7e2efe45b261af7711a80c37196e8228351a2f76f3a3efcf84a933e7118a",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000001000000000000000000000000000000000000000041417f0000000000000000000000000000000000000000000000000000000000000001447fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3506f059b6b83f294740688598c52195a925560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1544798975"
+                "0x5c13c2ff"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest255.json b/GeneralStateTests/stRandom/randomStatetest255.json
index d914e5a74..589cbaa74 100644
--- a/GeneralStateTests/stRandom/randomStatetest255.json
+++ b/GeneralStateTests/stRandom/randomStatetest255.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest255" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e3b2658612bf422a62d7a3aa42899b0b91f1343687b3e62d9cd975c58c571d20",
+                    "hash" : "0xe3b2658612bf422a62d7a3aa42899b0b91f1343687b3e62d9cd975c58c571d20",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e3b2658612bf422a62d7a3aa42899b0b91f1343687b3e62d9cd975c58c571d20",
+                    "hash" : "0xe3b2658612bf422a62d7a3aa42899b0b91f1343687b3e62d9cd975c58c571d20",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e3b2658612bf422a62d7a3aa42899b0b91f1343687b3e62d9cd975c58c571d20",
+                    "hash" : "0xe3b2658612bf422a62d7a3aa42899b0b91f1343687b3e62d9cd975c58c571d20",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e3b2658612bf422a62d7a3aa42899b0b91f1343687b3e62d9cd975c58c571d20",
+                    "hash" : "0xe3b2658612bf422a62d7a3aa42899b0b91f1343687b3e62d9cd975c58c571d20",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e3b2658612bf422a62d7a3aa42899b0b91f1343687b3e62d9cd975c58c571d20",
+                    "hash" : "0xe3b2658612bf422a62d7a3aa42899b0b91f1343687b3e62d9cd975c58c571d20",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "e3b2658612bf422a62d7a3aa42899b0b91f1343687b3e62d9cd975c58c571d20",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000000040407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f0000000000000000000000000000000000000000000000000000000000000001456f92663a70a367083877458c56936f835560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "879863735"
+                "0x3471a7b7"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest256.json b/GeneralStateTests/stRandom/randomStatetest256.json
index f110d6a90..458c6e4fd 100644
--- a/GeneralStateTests/stRandom/randomStatetest256.json
+++ b/GeneralStateTests/stRandom/randomStatetest256.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest256" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6e6c83c1b0f2d5613676cc69779130072bb10e7961fd4ca52ce8a7a611e1d952",
+                    "hash" : "0x6e6c83c1b0f2d5613676cc69779130072bb10e7961fd4ca52ce8a7a611e1d952",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6e6c83c1b0f2d5613676cc69779130072bb10e7961fd4ca52ce8a7a611e1d952",
+                    "hash" : "0x6e6c83c1b0f2d5613676cc69779130072bb10e7961fd4ca52ce8a7a611e1d952",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "8f5b99c3d4de0aa4b47e586400c702d403cee0384423423b20c446ef4a109907",
+                    "hash" : "0x8f5b99c3d4de0aa4b47e586400c702d403cee0384423423b20c446ef4a109907",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "8f5b99c3d4de0aa4b47e586400c702d403cee0384423423b20c446ef4a109907",
+                    "hash" : "0x8f5b99c3d4de0aa4b47e586400c702d403cee0384423423b20c446ef4a109907",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6e6c83c1b0f2d5613676cc69779130072bb10e7961fd4ca52ce8a7a611e1d952",
+                    "hash" : "0x6e6c83c1b0f2d5613676cc69779130072bb10e7961fd4ca52ce8a7a611e1d952",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "8f5b99c3d4de0aa4b47e586400c702d403cee0384423423b20c446ef4a109907",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff4080371a54065560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "39487269"
+                "0x025a8725"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest257.json b/GeneralStateTests/stRandom/randomStatetest257.json
index 4c8ab9942..70ce23912 100644
--- a/GeneralStateTests/stRandom/randomStatetest257.json
+++ b/GeneralStateTests/stRandom/randomStatetest257.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest257" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b91b3d631e6b6f635a4448954b5633aa870671ea8558c44a7e1dfe6c028652a9",
+                    "hash" : "0xb91b3d631e6b6f635a4448954b5633aa870671ea8558c44a7e1dfe6c028652a9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b91b3d631e6b6f635a4448954b5633aa870671ea8558c44a7e1dfe6c028652a9",
+                    "hash" : "0xb91b3d631e6b6f635a4448954b5633aa870671ea8558c44a7e1dfe6c028652a9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b91b3d631e6b6f635a4448954b5633aa870671ea8558c44a7e1dfe6c028652a9",
+                    "hash" : "0xb91b3d631e6b6f635a4448954b5633aa870671ea8558c44a7e1dfe6c028652a9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b91b3d631e6b6f635a4448954b5633aa870671ea8558c44a7e1dfe6c028652a9",
+                    "hash" : "0xb91b3d631e6b6f635a4448954b5633aa870671ea8558c44a7e1dfe6c028652a9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b91b3d631e6b6f635a4448954b5633aa870671ea8558c44a7e1dfe6c028652a9",
+                    "hash" : "0xb91b3d631e6b6f635a4448954b5633aa870671ea8558c44a7e1dfe6c028652a9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "b91b3d631e6b6f635a4448954b5633aa870671ea8558c44a7e1dfe6c028652a9",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff337f000000000000000000000000000000000000000000000000000000000000000099447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c350735b9f81208b6f526655",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "519689383"
+                "0x1ef9d4a7"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest258.json b/GeneralStateTests/stRandom/randomStatetest258.json
index d4bde8c76..be7290860 100644
--- a/GeneralStateTests/stRandom/randomStatetest258.json
+++ b/GeneralStateTests/stRandom/randomStatetest258.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest258" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "0d6bd12ba9ab116f0512e051376bdf5f8d63b97b2e7ed3ed17c45e6f05ea5c7f",
+                    "hash" : "0x0d6bd12ba9ab116f0512e051376bdf5f8d63b97b2e7ed3ed17c45e6f05ea5c7f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "0d6bd12ba9ab116f0512e051376bdf5f8d63b97b2e7ed3ed17c45e6f05ea5c7f",
+                    "hash" : "0x0d6bd12ba9ab116f0512e051376bdf5f8d63b97b2e7ed3ed17c45e6f05ea5c7f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "46e0dbebd85e7cfe2fb087ff6096ba6567060b30cb59a04f4ad45f22d05897cd",
+                    "hash" : "0x46e0dbebd85e7cfe2fb087ff6096ba6567060b30cb59a04f4ad45f22d05897cd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "46e0dbebd85e7cfe2fb087ff6096ba6567060b30cb59a04f4ad45f22d05897cd",
+                    "hash" : "0x46e0dbebd85e7cfe2fb087ff6096ba6567060b30cb59a04f4ad45f22d05897cd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0d6bd12ba9ab116f0512e051376bdf5f8d63b97b2e7ed3ed17c45e6f05ea5c7f",
+                    "hash" : "0x0d6bd12ba9ab116f0512e051376bdf5f8d63b97b2e7ed3ed17c45e6f05ea5c7f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "46e0dbebd85e7cfe2fb087ff6096ba6567060b30cb59a04f4ad45f22d05897cd",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b554447f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000145406f986d138a67320b4113330a64934f835560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1706432912"
+                "0x65b61990"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest259.json b/GeneralStateTests/stRandom/randomStatetest259.json
index 94dca3505..c41ff5f49 100644
--- a/GeneralStateTests/stRandom/randomStatetest259.json
+++ b/GeneralStateTests/stRandom/randomStatetest259.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest259" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d4764926b4a136876d9e7740ca79b6595340c39657138ba4b8cc0350272fcc44",
+                    "hash" : "0xd4764926b4a136876d9e7740ca79b6595340c39657138ba4b8cc0350272fcc44",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d4764926b4a136876d9e7740ca79b6595340c39657138ba4b8cc0350272fcc44",
+                    "hash" : "0xd4764926b4a136876d9e7740ca79b6595340c39657138ba4b8cc0350272fcc44",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "d4764926b4a136876d9e7740ca79b6595340c39657138ba4b8cc0350272fcc44",
+                    "hash" : "0xd4764926b4a136876d9e7740ca79b6595340c39657138ba4b8cc0350272fcc44",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "d4764926b4a136876d9e7740ca79b6595340c39657138ba4b8cc0350272fcc44",
+                    "hash" : "0xd4764926b4a136876d9e7740ca79b6595340c39657138ba4b8cc0350272fcc44",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d4764926b4a136876d9e7740ca79b6595340c39657138ba4b8cc0350272fcc44",
+                    "hash" : "0xd4764926b4a136876d9e7740ca79b6595340c39657138ba4b8cc0350272fcc44",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "d4764926b4a136876d9e7740ca79b6595340c39657138ba4b8cc0350272fcc44",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001587fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3506f04831adc0812f095449274079007095560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "250917223"
+                "0x0ef4b167"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest26.json b/GeneralStateTests/stRandom/randomStatetest26.json
index 2cd6a1135..7dfee1e6d 100644
--- a/GeneralStateTests/stRandom/randomStatetest26.json
+++ b/GeneralStateTests/stRandom/randomStatetest26.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest26" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "dea0ca00c20190e0864ffef1c17d42666582a6c7bca096dd870dacde18302588",
+                    "hash" : "0xdea0ca00c20190e0864ffef1c17d42666582a6c7bca096dd870dacde18302588",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "dea0ca00c20190e0864ffef1c17d42666582a6c7bca096dd870dacde18302588",
+                    "hash" : "0xdea0ca00c20190e0864ffef1c17d42666582a6c7bca096dd870dacde18302588",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "bd7aed55526905bcf0d828293e2d68e11b44250e3184845c768808213eb70d89",
+                    "hash" : "0xbd7aed55526905bcf0d828293e2d68e11b44250e3184845c768808213eb70d89",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "bd7aed55526905bcf0d828293e2d68e11b44250e3184845c768808213eb70d89",
+                    "hash" : "0xbd7aed55526905bcf0d828293e2d68e11b44250e3184845c768808213eb70d89",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "dea0ca00c20190e0864ffef1c17d42666582a6c7bca096dd870dacde18302588",
+                    "hash" : "0xdea0ca00c20190e0864ffef1c17d42666582a6c7bca096dd870dacde18302588",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "fb9ed88e1653c4b51474b246e3b8a02668a6736d9d6ba6a10f224353cb8e31f2",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x434242445b41310755",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest260.json b/GeneralStateTests/stRandom/randomStatetest260.json
index 5edaf44c6..0d62e5656 100644
--- a/GeneralStateTests/stRandom/randomStatetest260.json
+++ b/GeneralStateTests/stRandom/randomStatetest260.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest260" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
             {
@@ -21,7 +21,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d71ce638907117f6bdacd55d5547feb04ea50a8c2da296dc887f5bbb909540b5",
+                    "hash" : "0xd71ce638907117f6bdacd55d5547feb04ea50a8c2da296dc887f5bbb909540b5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d71ce638907117f6bdacd55d5547feb04ea50a8c2da296dc887f5bbb909540b5",
+                    "hash" : "0xd71ce638907117f6bdacd55d5547feb04ea50a8c2da296dc887f5bbb909540b5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "d71ce638907117f6bdacd55d5547feb04ea50a8c2da296dc887f5bbb909540b5",
+                    "hash" : "0xd71ce638907117f6bdacd55d5547feb04ea50a8c2da296dc887f5bbb909540b5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "d71ce638907117f6bdacd55d5547feb04ea50a8c2da296dc887f5bbb909540b5",
+                    "hash" : "0xd71ce638907117f6bdacd55d5547feb04ea50a8c2da296dc887f5bbb909540b5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,7 +61,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d71ce638907117f6bdacd55d5547feb04ea50a8c2da296dc887f5bbb909540b5",
+                    "hash" : "0xd71ce638907117f6bdacd55d5547feb04ea50a8c2da296dc887f5bbb909540b5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -72,23 +72,23 @@
         },
         "postStateRoot" : "d71ce638907117f6bdacd55d5547feb04ea50a8c2da296dc887f5bbb909540b5",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001a07ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350f36409156a6aa261413b56f20855",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -103,10 +103,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1762323696"
+                "0x690aecf0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest261.json b/GeneralStateTests/stRandom/randomStatetest261.json
index dcce43ed8..d556e1c04 100644
--- a/GeneralStateTests/stRandom/randomStatetest261.json
+++ b/GeneralStateTests/stRandom/randomStatetest261.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest261" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9f7393391be46ce93394f3c033bcee51a83392d9e1c5b0bdc14e9907194c86d4",
+                    "hash" : "0x9f7393391be46ce93394f3c033bcee51a83392d9e1c5b0bdc14e9907194c86d4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9f7393391be46ce93394f3c033bcee51a83392d9e1c5b0bdc14e9907194c86d4",
+                    "hash" : "0x9f7393391be46ce93394f3c033bcee51a83392d9e1c5b0bdc14e9907194c86d4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9f7393391be46ce93394f3c033bcee51a83392d9e1c5b0bdc14e9907194c86d4",
+                    "hash" : "0x9f7393391be46ce93394f3c033bcee51a83392d9e1c5b0bdc14e9907194c86d4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9f7393391be46ce93394f3c033bcee51a83392d9e1c5b0bdc14e9907194c86d4",
+                    "hash" : "0x9f7393391be46ce93394f3c033bcee51a83392d9e1c5b0bdc14e9907194c86d4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9f7393391be46ce93394f3c033bcee51a83392d9e1c5b0bdc14e9907194c86d4",
+                    "hash" : "0x9f7393391be46ce93394f3c033bcee51a83392d9e1c5b0bdc14e9907194c86d4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "9f7393391be46ce93394f3c033bcee51a83392d9e1c5b0bdc14e9907194c86d4",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f0000000000000000000000000000000000000000000000000000000000000000447fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000001231b61993",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,8 +96,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x14fb56ac"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest262.json b/GeneralStateTests/stRandom/randomStatetest262.json
index f727b367d..078f26d02 100644
--- a/GeneralStateTests/stRandom/randomStatetest262.json
+++ b/GeneralStateTests/stRandom/randomStatetest262.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest262" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a978179fb10aaa06a1aaee32a0c29dacd53911272c419f706e94991bc3dc8159",
+                    "hash" : "0xa978179fb10aaa06a1aaee32a0c29dacd53911272c419f706e94991bc3dc8159",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a978179fb10aaa06a1aaee32a0c29dacd53911272c419f706e94991bc3dc8159",
+                    "hash" : "0xa978179fb10aaa06a1aaee32a0c29dacd53911272c419f706e94991bc3dc8159",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a978179fb10aaa06a1aaee32a0c29dacd53911272c419f706e94991bc3dc8159",
+                    "hash" : "0xa978179fb10aaa06a1aaee32a0c29dacd53911272c419f706e94991bc3dc8159",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a978179fb10aaa06a1aaee32a0c29dacd53911272c419f706e94991bc3dc8159",
+                    "hash" : "0xa978179fb10aaa06a1aaee32a0c29dacd53911272c419f706e94991bc3dc8159",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a978179fb10aaa06a1aaee32a0c29dacd53911272c419f706e94991bc3dc8159",
+                    "hash" : "0xa978179fb10aaa06a1aaee32a0c29dacd53911272c419f706e94991bc3dc8159",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "a978179fb10aaa06a1aaee32a0c29dacd53911272c419f706e94991bc3dc8159",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe44407f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff095560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "120719985"
+                "0x07320a71"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest263.json b/GeneralStateTests/stRandom/randomStatetest263.json
index 77cb12c15..5420775e2 100644
--- a/GeneralStateTests/stRandom/randomStatetest263.json
+++ b/GeneralStateTests/stRandom/randomStatetest263.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest263" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e42ed72d895b6b92d283a2650d51929dd38bd2dead7822da0cfd0fe3921b8f6f",
+                    "hash" : "0xe42ed72d895b6b92d283a2650d51929dd38bd2dead7822da0cfd0fe3921b8f6f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e42ed72d895b6b92d283a2650d51929dd38bd2dead7822da0cfd0fe3921b8f6f",
+                    "hash" : "0xe42ed72d895b6b92d283a2650d51929dd38bd2dead7822da0cfd0fe3921b8f6f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e42ed72d895b6b92d283a2650d51929dd38bd2dead7822da0cfd0fe3921b8f6f",
+                    "hash" : "0xe42ed72d895b6b92d283a2650d51929dd38bd2dead7822da0cfd0fe3921b8f6f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e42ed72d895b6b92d283a2650d51929dd38bd2dead7822da0cfd0fe3921b8f6f",
+                    "hash" : "0xe42ed72d895b6b92d283a2650d51929dd38bd2dead7822da0cfd0fe3921b8f6f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e42ed72d895b6b92d283a2650d51929dd38bd2dead7822da0cfd0fe3921b8f6f",
+                    "hash" : "0xe42ed72d895b6b92d283a2650d51929dd38bd2dead7822da0cfd0fe3921b8f6f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "e42ed72d895b6b92d283a2650d51929dd38bd2dead7822da0cfd0fe3921b8f6f",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5807f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0418625560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "767067244"
+                "0x2db8846c"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest264.json b/GeneralStateTests/stRandom/randomStatetest264.json
index a6dfe380a..de5eb825e 100644
--- a/GeneralStateTests/stRandom/randomStatetest264.json
+++ b/GeneralStateTests/stRandom/randomStatetest264.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest264" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "78559176356b9df2e9c7fa3a28e771cbfb06b268118dd1971408302a19d2940a",
+                    "hash" : "0x78559176356b9df2e9c7fa3a28e771cbfb06b268118dd1971408302a19d2940a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "78559176356b9df2e9c7fa3a28e771cbfb06b268118dd1971408302a19d2940a",
+                    "hash" : "0x78559176356b9df2e9c7fa3a28e771cbfb06b268118dd1971408302a19d2940a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "78559176356b9df2e9c7fa3a28e771cbfb06b268118dd1971408302a19d2940a",
+                    "hash" : "0x78559176356b9df2e9c7fa3a28e771cbfb06b268118dd1971408302a19d2940a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "78559176356b9df2e9c7fa3a28e771cbfb06b268118dd1971408302a19d2940a",
+                    "hash" : "0x78559176356b9df2e9c7fa3a28e771cbfb06b268118dd1971408302a19d2940a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "78559176356b9df2e9c7fa3a28e771cbfb06b268118dd1971408302a19d2940a",
+                    "hash" : "0x78559176356b9df2e9c7fa3a28e771cbfb06b268118dd1971408302a19d2940a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "78559176356b9df2e9c7fa3a28e771cbfb06b268118dd1971408302a19d2940a",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe427f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0955",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1165785335"
+                "0x457c78f7"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest265.json b/GeneralStateTests/stRandom/randomStatetest265.json
index 330a1b4dc..5700e484f 100644
--- a/GeneralStateTests/stRandom/randomStatetest265.json
+++ b/GeneralStateTests/stRandom/randomStatetest265.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest265" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "2d93c82e45bb07d22215880fe456d79b9014c2a35ced1127020db662e2f649bb",
+                    "hash" : "0x2d93c82e45bb07d22215880fe456d79b9014c2a35ced1127020db662e2f649bb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "2d93c82e45bb07d22215880fe456d79b9014c2a35ced1127020db662e2f649bb",
+                    "hash" : "0x2d93c82e45bb07d22215880fe456d79b9014c2a35ced1127020db662e2f649bb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "404dde61aad41090e3d66c5d042237aed1302501a8da14fb725c3a8d1778f847",
+                    "hash" : "0x404dde61aad41090e3d66c5d042237aed1302501a8da14fb725c3a8d1778f847",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "404dde61aad41090e3d66c5d042237aed1302501a8da14fb725c3a8d1778f847",
+                    "hash" : "0x404dde61aad41090e3d66c5d042237aed1302501a8da14fb725c3a8d1778f847",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "2d93c82e45bb07d22215880fe456d79b9014c2a35ced1127020db662e2f649bb",
+                    "hash" : "0x2d93c82e45bb07d22215880fe456d79b9014c2a35ced1127020db662e2f649bb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "404dde61aad41090e3d66c5d042237aed1302501a8da14fb725c3a8d1778f847",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3503b7f000000000000000000000000000000000000000000000000000000000000c3506a7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000745b9b824070397f921960005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,8 +96,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x2217865b"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest266.json b/GeneralStateTests/stRandom/randomStatetest266.json
index c79612028..6a3b340eb 100644
--- a/GeneralStateTests/stRandom/randomStatetest266.json
+++ b/GeneralStateTests/stRandom/randomStatetest266.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest266" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "bd1b2ff89b5cf1937099243e6436c1c6b802324d1225ffd5e9c3de634ef3703a",
+                    "hash" : "0xbd1b2ff89b5cf1937099243e6436c1c6b802324d1225ffd5e9c3de634ef3703a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "bd1b2ff89b5cf1937099243e6436c1c6b802324d1225ffd5e9c3de634ef3703a",
+                    "hash" : "0xbd1b2ff89b5cf1937099243e6436c1c6b802324d1225ffd5e9c3de634ef3703a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "bd1b2ff89b5cf1937099243e6436c1c6b802324d1225ffd5e9c3de634ef3703a",
+                    "hash" : "0xbd1b2ff89b5cf1937099243e6436c1c6b802324d1225ffd5e9c3de634ef3703a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "bd1b2ff89b5cf1937099243e6436c1c6b802324d1225ffd5e9c3de634ef3703a",
+                    "hash" : "0xbd1b2ff89b5cf1937099243e6436c1c6b802324d1225ffd5e9c3de634ef3703a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "bd1b2ff89b5cf1937099243e6436c1c6b802324d1225ffd5e9c3de634ef3703a",
+                    "hash" : "0xbd1b2ff89b5cf1937099243e6436c1c6b802324d1225ffd5e9c3de634ef3703a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "bd1b2ff89b5cf1937099243e6436c1c6b802324d1225ffd5e9c3de634ef3703a",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x3041047f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000005555945667793459633c993060005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "249765705"
+                "0x0ee31f49"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest267.json b/GeneralStateTests/stRandom/randomStatetest267.json
index 19cd23f3b..c258df4f4 100644
--- a/GeneralStateTests/stRandom/randomStatetest267.json
+++ b/GeneralStateTests/stRandom/randomStatetest267.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest267" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "3ad2f3eb4c80cfea073f7d19dd49b560f8e1acfff2833438ec6000979255c9dc",
+                    "hash" : "0x3ad2f3eb4c80cfea073f7d19dd49b560f8e1acfff2833438ec6000979255c9dc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "3ad2f3eb4c80cfea073f7d19dd49b560f8e1acfff2833438ec6000979255c9dc",
+                    "hash" : "0x3ad2f3eb4c80cfea073f7d19dd49b560f8e1acfff2833438ec6000979255c9dc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3ad2f3eb4c80cfea073f7d19dd49b560f8e1acfff2833438ec6000979255c9dc",
+                    "hash" : "0x3ad2f3eb4c80cfea073f7d19dd49b560f8e1acfff2833438ec6000979255c9dc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3ad2f3eb4c80cfea073f7d19dd49b560f8e1acfff2833438ec6000979255c9dc",
+                    "hash" : "0x3ad2f3eb4c80cfea073f7d19dd49b560f8e1acfff2833438ec6000979255c9dc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "3ad2f3eb4c80cfea073f7d19dd49b560f8e1acfff2833438ec6000979255c9dc",
+                    "hash" : "0x3ad2f3eb4c80cfea073f7d19dd49b560f8e1acfff2833438ec6000979255c9dc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "3ad2f3eb4c80cfea073f7d19dd49b560f8e1acfff2833438ec6000979255c9dc",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x447f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000007e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5a132776d398e3b7c14686a07346f60005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "256968366"
+                "0x0f5106ae"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest268.json b/GeneralStateTests/stRandom/randomStatetest268.json
index 2cbd57396..4c9e5e34b 100644
--- a/GeneralStateTests/stRandom/randomStatetest268.json
+++ b/GeneralStateTests/stRandom/randomStatetest268.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest268" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "dc693e02818bf20ab803905f8fbe059dcd065dbf1c3393a8fd12091bbbed1219",
+                    "hash" : "0xdc693e02818bf20ab803905f8fbe059dcd065dbf1c3393a8fd12091bbbed1219",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "dc693e02818bf20ab803905f8fbe059dcd065dbf1c3393a8fd12091bbbed1219",
+                    "hash" : "0xdc693e02818bf20ab803905f8fbe059dcd065dbf1c3393a8fd12091bbbed1219",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "dc693e02818bf20ab803905f8fbe059dcd065dbf1c3393a8fd12091bbbed1219",
+                    "hash" : "0xdc693e02818bf20ab803905f8fbe059dcd065dbf1c3393a8fd12091bbbed1219",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "dc693e02818bf20ab803905f8fbe059dcd065dbf1c3393a8fd12091bbbed1219",
+                    "hash" : "0xdc693e02818bf20ab803905f8fbe059dcd065dbf1c3393a8fd12091bbbed1219",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "dc693e02818bf20ab803905f8fbe059dcd065dbf1c3393a8fd12091bbbed1219",
+                    "hash" : "0xdc693e02818bf20ab803905f8fbe059dcd065dbf1c3393a8fd12091bbbed1219",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "dc693e02818bf20ab803905f8fbe059dcd065dbf1c3393a8fd12091bbbed1219",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000016f7466f0a0733d8632639340634094425560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "593549642"
+                "0x2360d94a"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest269.json b/GeneralStateTests/stRandom/randomStatetest269.json
index 6b663c51c..355a53c17 100644
--- a/GeneralStateTests/stRandom/randomStatetest269.json
+++ b/GeneralStateTests/stRandom/randomStatetest269.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest269" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d94c703fa989aa575dda329d0b94a86404a7f8c2cec091baefdc61a95b4f419a",
+                    "hash" : "0xd94c703fa989aa575dda329d0b94a86404a7f8c2cec091baefdc61a95b4f419a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d94c703fa989aa575dda329d0b94a86404a7f8c2cec091baefdc61a95b4f419a",
+                    "hash" : "0xd94c703fa989aa575dda329d0b94a86404a7f8c2cec091baefdc61a95b4f419a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "d94c703fa989aa575dda329d0b94a86404a7f8c2cec091baefdc61a95b4f419a",
+                    "hash" : "0xd94c703fa989aa575dda329d0b94a86404a7f8c2cec091baefdc61a95b4f419a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "d94c703fa989aa575dda329d0b94a86404a7f8c2cec091baefdc61a95b4f419a",
+                    "hash" : "0xd94c703fa989aa575dda329d0b94a86404a7f8c2cec091baefdc61a95b4f419a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d94c703fa989aa575dda329d0b94a86404a7f8c2cec091baefdc61a95b4f419a",
+                    "hash" : "0xd94c703fa989aa575dda329d0b94a86404a7f8c2cec091baefdc61a95b4f419a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "d94c703fa989aa575dda329d0b94a86404a7f8c2cec091baefdc61a95b4f419a",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6676029968ffa27d0455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1239417538"
+                "0x49e002c2"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest27.json b/GeneralStateTests/stRandom/randomStatetest27.json
index b64de142e..8dde6a4d3 100644
--- a/GeneralStateTests/stRandom/randomStatetest27.json
+++ b/GeneralStateTests/stRandom/randomStatetest27.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest27" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f2b0e19104d0cf0a08bbcf69b6edbb4769bd7577efda21f7bcfce89b7440b929",
+                    "hash" : "0xf2b0e19104d0cf0a08bbcf69b6edbb4769bd7577efda21f7bcfce89b7440b929",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f2b0e19104d0cf0a08bbcf69b6edbb4769bd7577efda21f7bcfce89b7440b929",
+                    "hash" : "0xf2b0e19104d0cf0a08bbcf69b6edbb4769bd7577efda21f7bcfce89b7440b929",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f2b0e19104d0cf0a08bbcf69b6edbb4769bd7577efda21f7bcfce89b7440b929",
+                    "hash" : "0xf2b0e19104d0cf0a08bbcf69b6edbb4769bd7577efda21f7bcfce89b7440b929",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f2b0e19104d0cf0a08bbcf69b6edbb4769bd7577efda21f7bcfce89b7440b929",
+                    "hash" : "0xf2b0e19104d0cf0a08bbcf69b6edbb4769bd7577efda21f7bcfce89b7440b929",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f2b0e19104d0cf0a08bbcf69b6edbb4769bd7577efda21f7bcfce89b7440b929",
+                    "hash" : "0xf2b0e19104d0cf0a08bbcf69b6edbb4769bd7577efda21f7bcfce89b7440b929",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "f2b0e19104d0cf0a08bbcf69b6edbb4769bd7577efda21f7bcfce89b7440b929",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000000960005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "541933198"
+                "0x204d3e8e"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest270.json b/GeneralStateTests/stRandom/randomStatetest270.json
index 7d33af5aa..eb8b77c1e 100644
--- a/GeneralStateTests/stRandom/randomStatetest270.json
+++ b/GeneralStateTests/stRandom/randomStatetest270.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest270" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "3b43c92e4f1b3327abd8566dfa4244c3473be179137ef855b3c5eba8afb41d8d",
+                    "hash" : "0x3b43c92e4f1b3327abd8566dfa4244c3473be179137ef855b3c5eba8afb41d8d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "3b43c92e4f1b3327abd8566dfa4244c3473be179137ef855b3c5eba8afb41d8d",
+                    "hash" : "0x3b43c92e4f1b3327abd8566dfa4244c3473be179137ef855b3c5eba8afb41d8d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3b43c92e4f1b3327abd8566dfa4244c3473be179137ef855b3c5eba8afb41d8d",
+                    "hash" : "0x3b43c92e4f1b3327abd8566dfa4244c3473be179137ef855b3c5eba8afb41d8d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3b43c92e4f1b3327abd8566dfa4244c3473be179137ef855b3c5eba8afb41d8d",
+                    "hash" : "0x3b43c92e4f1b3327abd8566dfa4244c3473be179137ef855b3c5eba8afb41d8d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "3b43c92e4f1b3327abd8566dfa4244c3473be179137ef855b3c5eba8afb41d8d",
+                    "hash" : "0x3b43c92e4f1b3327abd8566dfa4244c3473be179137ef855b3c5eba8afb41d8d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "3b43c92e4f1b3327abd8566dfa4244c3473be179137ef855b3c5eba8afb41d8d",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x427f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001395560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1633146389"
+                "0x6157d615"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest271.json b/GeneralStateTests/stRandom/randomStatetest271.json
index 68427e508..e42ede427 100644
--- a/GeneralStateTests/stRandom/randomStatetest271.json
+++ b/GeneralStateTests/stRandom/randomStatetest271.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest271" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6324451a8166d889002f19b63b979bfee3f09bc36b8da54eba9aa36ad565dc8e",
+                    "hash" : "0x6324451a8166d889002f19b63b979bfee3f09bc36b8da54eba9aa36ad565dc8e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6324451a8166d889002f19b63b979bfee3f09bc36b8da54eba9aa36ad565dc8e",
+                    "hash" : "0x6324451a8166d889002f19b63b979bfee3f09bc36b8da54eba9aa36ad565dc8e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6324451a8166d889002f19b63b979bfee3f09bc36b8da54eba9aa36ad565dc8e",
+                    "hash" : "0x6324451a8166d889002f19b63b979bfee3f09bc36b8da54eba9aa36ad565dc8e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6324451a8166d889002f19b63b979bfee3f09bc36b8da54eba9aa36ad565dc8e",
+                    "hash" : "0x6324451a8166d889002f19b63b979bfee3f09bc36b8da54eba9aa36ad565dc8e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6324451a8166d889002f19b63b979bfee3f09bc36b8da54eba9aa36ad565dc8e",
+                    "hash" : "0x6324451a8166d889002f19b63b979bfee3f09bc36b8da54eba9aa36ad565dc8e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "6324451a8166d889002f19b63b979bfee3f09bc36b8da54eba9aa36ad565dc8e",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f0000000000000000000000000000000000000000000000000000000000000001457f000000000000000000000000000000000000000000000000000000000000c350417f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f0000000000000000000000000000000000000000000000000000000000000000357f00000000000000000000000000000000000000000000000000000000000000000b6d7d958a0269995560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "193990328"
+                "0x0b900eb8"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest272.json b/GeneralStateTests/stRandom/randomStatetest272.json
index 2f1c05730..7e4b99e40 100644
--- a/GeneralStateTests/stRandom/randomStatetest272.json
+++ b/GeneralStateTests/stRandom/randomStatetest272.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest272" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "007843f21a3fe9bd8628103ce51088264a66f68a1a8db0672fbf021a12ea465c",
+                    "hash" : "0x007843f21a3fe9bd8628103ce51088264a66f68a1a8db0672fbf021a12ea465c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "007843f21a3fe9bd8628103ce51088264a66f68a1a8db0672fbf021a12ea465c",
+                    "hash" : "0x007843f21a3fe9bd8628103ce51088264a66f68a1a8db0672fbf021a12ea465c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "1f286772f4d0035bcb272815f89fe7b032aaccdc442607927f913596886e3649",
+                    "hash" : "0x1f286772f4d0035bcb272815f89fe7b032aaccdc442607927f913596886e3649",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "1f286772f4d0035bcb272815f89fe7b032aaccdc442607927f913596886e3649",
+                    "hash" : "0x1f286772f4d0035bcb272815f89fe7b032aaccdc442607927f913596886e3649",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "007843f21a3fe9bd8628103ce51088264a66f68a1a8db0672fbf021a12ea465c",
+                    "hash" : "0x007843f21a3fe9bd8628103ce51088264a66f68a1a8db0672fbf021a12ea465c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "35b93c1ab2e2f784d668fd0eb3801da7f4c6331980043f8ed3a7931124d8855d",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x42424042434445413155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest273.json b/GeneralStateTests/stRandom/randomStatetest273.json
index 82f323735..7749692b3 100644
--- a/GeneralStateTests/stRandom/randomStatetest273.json
+++ b/GeneralStateTests/stRandom/randomStatetest273.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest273" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1ec2086f63b0aa1f3d2d688fefa3d749328339374e35150e0f1266fb65802dcb",
+                    "hash" : "0x1ec2086f63b0aa1f3d2d688fefa3d749328339374e35150e0f1266fb65802dcb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "1ec2086f63b0aa1f3d2d688fefa3d749328339374e35150e0f1266fb65802dcb",
+                    "hash" : "0x1ec2086f63b0aa1f3d2d688fefa3d749328339374e35150e0f1266fb65802dcb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5d84ed93d635f2893dc0b02c8bead33c7baf3bc075ec632795ab0641ed2039c5",
+                    "hash" : "0x5d84ed93d635f2893dc0b02c8bead33c7baf3bc075ec632795ab0641ed2039c5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5d84ed93d635f2893dc0b02c8bead33c7baf3bc075ec632795ab0641ed2039c5",
+                    "hash" : "0x5d84ed93d635f2893dc0b02c8bead33c7baf3bc075ec632795ab0641ed2039c5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "1ec2086f63b0aa1f3d2d688fefa3d749328339374e35150e0f1266fb65802dcb",
+                    "hash" : "0x1ec2086f63b0aa1f3d2d688fefa3d749328339374e35150e0f1266fb65802dcb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "0455f96a64406f18634b9f7f441fda3b1dd6ab9aec9deed10513ce053e5b405c",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x4342424343425b4495fff04285609955",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest274.json b/GeneralStateTests/stRandom/randomStatetest274.json
index eeacafdd9..bca2188c2 100644
--- a/GeneralStateTests/stRandom/randomStatetest274.json
+++ b/GeneralStateTests/stRandom/randomStatetest274.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest274" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "523f1bafc827465557ef569f1c1f0e047d287c61485d8ecf12a9331a4f367e52",
+                    "hash" : "0x523f1bafc827465557ef569f1c1f0e047d287c61485d8ecf12a9331a4f367e52",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "523f1bafc827465557ef569f1c1f0e047d287c61485d8ecf12a9331a4f367e52",
+                    "hash" : "0x523f1bafc827465557ef569f1c1f0e047d287c61485d8ecf12a9331a4f367e52",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "523f1bafc827465557ef569f1c1f0e047d287c61485d8ecf12a9331a4f367e52",
+                    "hash" : "0x523f1bafc827465557ef569f1c1f0e047d287c61485d8ecf12a9331a4f367e52",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "523f1bafc827465557ef569f1c1f0e047d287c61485d8ecf12a9331a4f367e52",
+                    "hash" : "0x523f1bafc827465557ef569f1c1f0e047d287c61485d8ecf12a9331a4f367e52",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "523f1bafc827465557ef569f1c1f0e047d287c61485d8ecf12a9331a4f367e52",
+                    "hash" : "0x523f1bafc827465557ef569f1c1f0e047d287c61485d8ecf12a9331a4f367e52",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "523f1bafc827465557ef569f1c1f0e047d287c61485d8ecf12a9331a4f367e52",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffffa405457f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b588015a9a0542a13a051497514215",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "191496672"
+                "0x0b6a01e0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest275.json b/GeneralStateTests/stRandom/randomStatetest275.json
index b16c2075e..6dc85b311 100644
--- a/GeneralStateTests/stRandom/randomStatetest275.json
+++ b/GeneralStateTests/stRandom/randomStatetest275.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest275" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b5a6f9ba236c75bba3990ca26c4d8cc06392d1f4931c3246aff22d9a1f51f98d",
+                    "hash" : "0xb5a6f9ba236c75bba3990ca26c4d8cc06392d1f4931c3246aff22d9a1f51f98d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b5a6f9ba236c75bba3990ca26c4d8cc06392d1f4931c3246aff22d9a1f51f98d",
+                    "hash" : "0xb5a6f9ba236c75bba3990ca26c4d8cc06392d1f4931c3246aff22d9a1f51f98d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b5a6f9ba236c75bba3990ca26c4d8cc06392d1f4931c3246aff22d9a1f51f98d",
+                    "hash" : "0xb5a6f9ba236c75bba3990ca26c4d8cc06392d1f4931c3246aff22d9a1f51f98d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b5a6f9ba236c75bba3990ca26c4d8cc06392d1f4931c3246aff22d9a1f51f98d",
+                    "hash" : "0xb5a6f9ba236c75bba3990ca26c4d8cc06392d1f4931c3246aff22d9a1f51f98d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b5a6f9ba236c75bba3990ca26c4d8cc06392d1f4931c3246aff22d9a1f51f98d",
+                    "hash" : "0xb5a6f9ba236c75bba3990ca26c4d8cc06392d1f4931c3246aff22d9a1f51f98d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "b5a6f9ba236c75bba3990ca26c4d8cc06392d1f4931c3246aff22d9a1f51f98d",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x437f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000197ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09656756323c597455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "4157391"
+                "0x3f6fcf"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest276.json b/GeneralStateTests/stRandom/randomStatetest276.json
index 5f7262b18..cf59b7465 100644
--- a/GeneralStateTests/stRandom/randomStatetest276.json
+++ b/GeneralStateTests/stRandom/randomStatetest276.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest276" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "678d7b89b0050819a4120ed894bf5493844e34153f04099263572d899fadf630",
+                    "hash" : "0x678d7b89b0050819a4120ed894bf5493844e34153f04099263572d899fadf630",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "678d7b89b0050819a4120ed894bf5493844e34153f04099263572d899fadf630",
+                    "hash" : "0x678d7b89b0050819a4120ed894bf5493844e34153f04099263572d899fadf630",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "678d7b89b0050819a4120ed894bf5493844e34153f04099263572d899fadf630",
+                    "hash" : "0x678d7b89b0050819a4120ed894bf5493844e34153f04099263572d899fadf630",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "678d7b89b0050819a4120ed894bf5493844e34153f04099263572d899fadf630",
+                    "hash" : "0x678d7b89b0050819a4120ed894bf5493844e34153f04099263572d899fadf630",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "678d7b89b0050819a4120ed894bf5493844e34153f04099263572d899fadf630",
+                    "hash" : "0x678d7b89b0050819a4120ed894bf5493844e34153f04099263572d899fadf630",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "678d7b89b0050819a4120ed894bf5493844e34153f04099263572d899fadf630",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f4382349f7b370589141a31f39741a4f260005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1026778874"
+                "0x3d3366fa"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest277.json b/GeneralStateTests/stRandom/randomStatetest277.json
index dfe0fcc8e..c469df1e3 100644
--- a/GeneralStateTests/stRandom/randomStatetest277.json
+++ b/GeneralStateTests/stRandom/randomStatetest277.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest277" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "743bef3f08eded6159757c337346e5c2e6000979173b8bbbd163b6328e1080b8",
+                    "hash" : "0x743bef3f08eded6159757c337346e5c2e6000979173b8bbbd163b6328e1080b8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "743bef3f08eded6159757c337346e5c2e6000979173b8bbbd163b6328e1080b8",
+                    "hash" : "0x743bef3f08eded6159757c337346e5c2e6000979173b8bbbd163b6328e1080b8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "743bef3f08eded6159757c337346e5c2e6000979173b8bbbd163b6328e1080b8",
+                    "hash" : "0x743bef3f08eded6159757c337346e5c2e6000979173b8bbbd163b6328e1080b8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "743bef3f08eded6159757c337346e5c2e6000979173b8bbbd163b6328e1080b8",
+                    "hash" : "0x743bef3f08eded6159757c337346e5c2e6000979173b8bbbd163b6328e1080b8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "743bef3f08eded6159757c337346e5c2e6000979173b8bbbd163b6328e1080b8",
+                    "hash" : "0x743bef3f08eded6159757c337346e5c2e6000979173b8bbbd163b6328e1080b8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "743bef3f08eded6159757c337346e5c2e6000979173b8bbbd163b6328e1080b8",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x41434243414041",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest278.json b/GeneralStateTests/stRandom/randomStatetest278.json
index dcf59dd08..5614ffca5 100644
--- a/GeneralStateTests/stRandom/randomStatetest278.json
+++ b/GeneralStateTests/stRandom/randomStatetest278.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest278" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "579f22e4004bdb7d9901dad97944e1e6c8a6ca5bde5bc7f3e5293f6d9002cb62",
+                    "hash" : "0x579f22e4004bdb7d9901dad97944e1e6c8a6ca5bde5bc7f3e5293f6d9002cb62",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "579f22e4004bdb7d9901dad97944e1e6c8a6ca5bde5bc7f3e5293f6d9002cb62",
+                    "hash" : "0x579f22e4004bdb7d9901dad97944e1e6c8a6ca5bde5bc7f3e5293f6d9002cb62",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "579f22e4004bdb7d9901dad97944e1e6c8a6ca5bde5bc7f3e5293f6d9002cb62",
+                    "hash" : "0x579f22e4004bdb7d9901dad97944e1e6c8a6ca5bde5bc7f3e5293f6d9002cb62",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "579f22e4004bdb7d9901dad97944e1e6c8a6ca5bde5bc7f3e5293f6d9002cb62",
+                    "hash" : "0x579f22e4004bdb7d9901dad97944e1e6c8a6ca5bde5bc7f3e5293f6d9002cb62",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "579f22e4004bdb7d9901dad97944e1e6c8a6ca5bde5bc7f3e5293f6d9002cb62",
+                    "hash" : "0x579f22e4004bdb7d9901dad97944e1e6c8a6ca5bde5bc7f3e5293f6d9002cb62",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "579f22e4004bdb7d9901dad97944e1e6c8a6ca5bde5bc7f3e5293f6d9002cb62",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001377f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff60005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1577249919"
+                "0x5e02ec7f"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest279.json b/GeneralStateTests/stRandom/randomStatetest279.json
index dd4e9af83..7ce2ce46e 100644
--- a/GeneralStateTests/stRandom/randomStatetest279.json
+++ b/GeneralStateTests/stRandom/randomStatetest279.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest279" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "df7a2395377733685e4ffd910ac50c5e14adceb1d0648200e6a35451f7ffe707",
+                    "hash" : "0xdf7a2395377733685e4ffd910ac50c5e14adceb1d0648200e6a35451f7ffe707",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "df7a2395377733685e4ffd910ac50c5e14adceb1d0648200e6a35451f7ffe707",
+                    "hash" : "0xdf7a2395377733685e4ffd910ac50c5e14adceb1d0648200e6a35451f7ffe707",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "df7a2395377733685e4ffd910ac50c5e14adceb1d0648200e6a35451f7ffe707",
+                    "hash" : "0xdf7a2395377733685e4ffd910ac50c5e14adceb1d0648200e6a35451f7ffe707",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "df7a2395377733685e4ffd910ac50c5e14adceb1d0648200e6a35451f7ffe707",
+                    "hash" : "0xdf7a2395377733685e4ffd910ac50c5e14adceb1d0648200e6a35451f7ffe707",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "df7a2395377733685e4ffd910ac50c5e14adceb1d0648200e6a35451f7ffe707",
+                    "hash" : "0xdf7a2395377733685e4ffd910ac50c5e14adceb1d0648200e6a35451f7ffe707",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "df7a2395377733685e4ffd910ac50c5e14adceb1d0648200e6a35451f7ffe707",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000000000000000000000000000000000000000947f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,8 +96,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x4e91b038"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest28.json b/GeneralStateTests/stRandom/randomStatetest28.json
index 82de5bcdf..07e0e53d4 100644
--- a/GeneralStateTests/stRandom/randomStatetest28.json
+++ b/GeneralStateTests/stRandom/randomStatetest28.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest28" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "445137f7725bc5327741f01636b4b402a7c22af2088f61c05082a1401191bbf2",
+                    "hash" : "0x445137f7725bc5327741f01636b4b402a7c22af2088f61c05082a1401191bbf2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "445137f7725bc5327741f01636b4b402a7c22af2088f61c05082a1401191bbf2",
+                    "hash" : "0x445137f7725bc5327741f01636b4b402a7c22af2088f61c05082a1401191bbf2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "445137f7725bc5327741f01636b4b402a7c22af2088f61c05082a1401191bbf2",
+                    "hash" : "0x445137f7725bc5327741f01636b4b402a7c22af2088f61c05082a1401191bbf2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "445137f7725bc5327741f01636b4b402a7c22af2088f61c05082a1401191bbf2",
+                    "hash" : "0x445137f7725bc5327741f01636b4b402a7c22af2088f61c05082a1401191bbf2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "445137f7725bc5327741f01636b4b402a7c22af2088f61c05082a1401191bbf2",
+                    "hash" : "0x445137f7725bc5327741f01636b4b402a7c22af2088f61c05082a1401191bbf2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "445137f7725bc5327741f01636b4b402a7c22af2088f61c05082a1401191bbf2",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff417f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b56f38129d68939a19a2697172926f6a67363055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1370440167"
+                "0x51af41e7"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest280.json b/GeneralStateTests/stRandom/randomStatetest280.json
index 4cf4190de..2f0cbef1e 100644
--- a/GeneralStateTests/stRandom/randomStatetest280.json
+++ b/GeneralStateTests/stRandom/randomStatetest280.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest280" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7ea0acfbc5a2fed4628be9e955f1b65827d99945c92da7b67b9ea1b733bcf36e",
+                    "hash" : "0x7ea0acfbc5a2fed4628be9e955f1b65827d99945c92da7b67b9ea1b733bcf36e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7ea0acfbc5a2fed4628be9e955f1b65827d99945c92da7b67b9ea1b733bcf36e",
+                    "hash" : "0x7ea0acfbc5a2fed4628be9e955f1b65827d99945c92da7b67b9ea1b733bcf36e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "7ea0acfbc5a2fed4628be9e955f1b65827d99945c92da7b67b9ea1b733bcf36e",
+                    "hash" : "0x7ea0acfbc5a2fed4628be9e955f1b65827d99945c92da7b67b9ea1b733bcf36e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "7ea0acfbc5a2fed4628be9e955f1b65827d99945c92da7b67b9ea1b733bcf36e",
+                    "hash" : "0x7ea0acfbc5a2fed4628be9e955f1b65827d99945c92da7b67b9ea1b733bcf36e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7ea0acfbc5a2fed4628be9e955f1b65827d99945c92da7b67b9ea1b733bcf36e",
+                    "hash" : "0x7ea0acfbc5a2fed4628be9e955f1b65827d99945c92da7b67b9ea1b733bcf36e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "7ea0acfbc5a2fed4628be9e955f1b65827d99945c92da7b67b9ea1b733bcf36e",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000000143507f000000000000000000000000000000000000000000000000000000000000c350417f00000000000000000000000000000000000000000000000000000000000000006f423b3c407e7c6f16718668738d193cf260005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "809294938"
+                "0x303cdc5a"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest281.json b/GeneralStateTests/stRandom/randomStatetest281.json
index a2a91116d..a207898f5 100644
--- a/GeneralStateTests/stRandom/randomStatetest281.json
+++ b/GeneralStateTests/stRandom/randomStatetest281.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest281" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "79576c8d2755ff19c13fb7fa1fe408be88ae2eb75812a0cc28939cb6caa03b44",
+                    "hash" : "0x79576c8d2755ff19c13fb7fa1fe408be88ae2eb75812a0cc28939cb6caa03b44",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "79576c8d2755ff19c13fb7fa1fe408be88ae2eb75812a0cc28939cb6caa03b44",
+                    "hash" : "0x79576c8d2755ff19c13fb7fa1fe408be88ae2eb75812a0cc28939cb6caa03b44",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "79576c8d2755ff19c13fb7fa1fe408be88ae2eb75812a0cc28939cb6caa03b44",
+                    "hash" : "0x79576c8d2755ff19c13fb7fa1fe408be88ae2eb75812a0cc28939cb6caa03b44",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "79576c8d2755ff19c13fb7fa1fe408be88ae2eb75812a0cc28939cb6caa03b44",
+                    "hash" : "0x79576c8d2755ff19c13fb7fa1fe408be88ae2eb75812a0cc28939cb6caa03b44",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "79576c8d2755ff19c13fb7fa1fe408be88ae2eb75812a0cc28939cb6caa03b44",
+                    "hash" : "0x79576c8d2755ff19c13fb7fa1fe408be88ae2eb75812a0cc28939cb6caa03b44",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "79576c8d2755ff19c13fb7fa1fe408be88ae2eb75812a0cc28939cb6caa03b44",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5457f000000000000000000000000000000000000000000000000000000000000c350417f00000000000000000000000000000000000000000000000000000000000000016f649a7a3457645670a27fa170639718a260005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1714316412"
+                "0x662e647c"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest282.json b/GeneralStateTests/stRandom/randomStatetest282.json
index b3b43b285..d007848a1 100644
--- a/GeneralStateTests/stRandom/randomStatetest282.json
+++ b/GeneralStateTests/stRandom/randomStatetest282.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest282" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "0af7e489bf47e763077f315ad383eb1aeb954cb8ae3186a2899af28def3a9c25",
+                    "hash" : "0x0af7e489bf47e763077f315ad383eb1aeb954cb8ae3186a2899af28def3a9c25",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "0af7e489bf47e763077f315ad383eb1aeb954cb8ae3186a2899af28def3a9c25",
+                    "hash" : "0x0af7e489bf47e763077f315ad383eb1aeb954cb8ae3186a2899af28def3a9c25",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "992a638ffd5a3629e809c4320c0f8ec2d1b21319f2c22be8f0eef0349534449e",
+                    "hash" : "0x992a638ffd5a3629e809c4320c0f8ec2d1b21319f2c22be8f0eef0349534449e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "992a638ffd5a3629e809c4320c0f8ec2d1b21319f2c22be8f0eef0349534449e",
+                    "hash" : "0x992a638ffd5a3629e809c4320c0f8ec2d1b21319f2c22be8f0eef0349534449e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0af7e489bf47e763077f315ad383eb1aeb954cb8ae3186a2899af28def3a9c25",
+                    "hash" : "0x0af7e489bf47e763077f315ad383eb1aeb954cb8ae3186a2899af28def3a9c25",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "992a638ffd5a3629e809c4320c0f8ec2d1b21319f2c22be8f0eef0349534449e",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5ff447f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff429d415560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "2067523496"
+                "0x7b3be7a8"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest283.json b/GeneralStateTests/stRandom/randomStatetest283.json
index 8fba3e896..3ce8034de 100644
--- a/GeneralStateTests/stRandom/randomStatetest283.json
+++ b/GeneralStateTests/stRandom/randomStatetest283.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest283" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "3de67b2b42a6acc185985b6ce8d9d8324b447b4f5b0ed58871d0e5fb01bf264e",
+                    "hash" : "0x3de67b2b42a6acc185985b6ce8d9d8324b447b4f5b0ed58871d0e5fb01bf264e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "3de67b2b42a6acc185985b6ce8d9d8324b447b4f5b0ed58871d0e5fb01bf264e",
+                    "hash" : "0x3de67b2b42a6acc185985b6ce8d9d8324b447b4f5b0ed58871d0e5fb01bf264e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3de67b2b42a6acc185985b6ce8d9d8324b447b4f5b0ed58871d0e5fb01bf264e",
+                    "hash" : "0x3de67b2b42a6acc185985b6ce8d9d8324b447b4f5b0ed58871d0e5fb01bf264e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3de67b2b42a6acc185985b6ce8d9d8324b447b4f5b0ed58871d0e5fb01bf264e",
+                    "hash" : "0x3de67b2b42a6acc185985b6ce8d9d8324b447b4f5b0ed58871d0e5fb01bf264e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "3de67b2b42a6acc185985b6ce8d9d8324b447b4f5b0ed58871d0e5fb01bf264e",
+                    "hash" : "0x3de67b2b42a6acc185985b6ce8d9d8324b447b4f5b0ed58871d0e5fb01bf264e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "3de67b2b42a6acc185985b6ce8d9d8324b447b4f5b0ed58871d0e5fb01bf264e",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000013960005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1602431327"
+                "0x5f83295f"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest284.json b/GeneralStateTests/stRandom/randomStatetest284.json
index 78bec9947..f1fe233b0 100644
--- a/GeneralStateTests/stRandom/randomStatetest284.json
+++ b/GeneralStateTests/stRandom/randomStatetest284.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest284" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "47753bc8ef9d92cf8861231784db226a9cb08d8aba89a842b7515a93f4123027",
+                    "hash" : "0x47753bc8ef9d92cf8861231784db226a9cb08d8aba89a842b7515a93f4123027",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "47753bc8ef9d92cf8861231784db226a9cb08d8aba89a842b7515a93f4123027",
+                    "hash" : "0x47753bc8ef9d92cf8861231784db226a9cb08d8aba89a842b7515a93f4123027",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9bfe791ae77437f94a9768f5ba5ae336dad7eeab155897b8a8ea8a5445f50d9e",
+                    "hash" : "0x9bfe791ae77437f94a9768f5ba5ae336dad7eeab155897b8a8ea8a5445f50d9e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9bfe791ae77437f94a9768f5ba5ae336dad7eeab155897b8a8ea8a5445f50d9e",
+                    "hash" : "0x9bfe791ae77437f94a9768f5ba5ae336dad7eeab155897b8a8ea8a5445f50d9e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "47753bc8ef9d92cf8861231784db226a9cb08d8aba89a842b7515a93f4123027",
+                    "hash" : "0x47753bc8ef9d92cf8861231784db226a9cb08d8aba89a842b7515a93f4123027",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "9bfe791ae77437f94a9768f5ba5ae336dad7eeab155897b8a8ea8a5445f50d9e",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f0000000000000000000000000000000000000000000000000000000000000000457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff3b6f88a3615234423703758c55",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1384582119"
+                "0x52870be7"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest285.json b/GeneralStateTests/stRandom/randomStatetest285.json
index 0dcb12700..814ef5d13 100644
--- a/GeneralStateTests/stRandom/randomStatetest285.json
+++ b/GeneralStateTests/stRandom/randomStatetest285.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest285" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "48c91e076cd24e5f58e55f430004dcf79c3edbcc1f65b79d990ffce5182bc572",
+                    "hash" : "0x48c91e076cd24e5f58e55f430004dcf79c3edbcc1f65b79d990ffce5182bc572",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "48c91e076cd24e5f58e55f430004dcf79c3edbcc1f65b79d990ffce5182bc572",
+                    "hash" : "0x48c91e076cd24e5f58e55f430004dcf79c3edbcc1f65b79d990ffce5182bc572",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "48c91e076cd24e5f58e55f430004dcf79c3edbcc1f65b79d990ffce5182bc572",
+                    "hash" : "0x48c91e076cd24e5f58e55f430004dcf79c3edbcc1f65b79d990ffce5182bc572",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "48c91e076cd24e5f58e55f430004dcf79c3edbcc1f65b79d990ffce5182bc572",
+                    "hash" : "0x48c91e076cd24e5f58e55f430004dcf79c3edbcc1f65b79d990ffce5182bc572",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "48c91e076cd24e5f58e55f430004dcf79c3edbcc1f65b79d990ffce5182bc572",
+                    "hash" : "0x48c91e076cd24e5f58e55f430004dcf79c3edbcc1f65b79d990ffce5182bc572",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "921517cc33b5f4267a76b110e54b0578754d4ffb748085d8b4ed4195ad2d0af9",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x413443f3404242433389ff723810",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest286.json b/GeneralStateTests/stRandom/randomStatetest286.json
index 9e665881f..93054b54c 100644
--- a/GeneralStateTests/stRandom/randomStatetest286.json
+++ b/GeneralStateTests/stRandom/randomStatetest286.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest286" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "3e851f3c349fe94e83a519b8b7d7b3cc6cd00f7236a82f322f31538efff23e21",
+                    "hash" : "0x3e851f3c349fe94e83a519b8b7d7b3cc6cd00f7236a82f322f31538efff23e21",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "3e851f3c349fe94e83a519b8b7d7b3cc6cd00f7236a82f322f31538efff23e21",
+                    "hash" : "0x3e851f3c349fe94e83a519b8b7d7b3cc6cd00f7236a82f322f31538efff23e21",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3e851f3c349fe94e83a519b8b7d7b3cc6cd00f7236a82f322f31538efff23e21",
+                    "hash" : "0x3e851f3c349fe94e83a519b8b7d7b3cc6cd00f7236a82f322f31538efff23e21",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3e851f3c349fe94e83a519b8b7d7b3cc6cd00f7236a82f322f31538efff23e21",
+                    "hash" : "0x3e851f3c349fe94e83a519b8b7d7b3cc6cd00f7236a82f322f31538efff23e21",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "3e851f3c349fe94e83a519b8b7d7b3cc6cd00f7236a82f322f31538efff23e21",
+                    "hash" : "0x3e851f3c349fe94e83a519b8b7d7b3cc6cd00f7236a82f322f31538efff23e21",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "3e851f3c349fe94e83a519b8b7d7b3cc6cd00f7236a82f322f31538efff23e21",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x5a7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000009582860460005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1522313647"
+                "0x5abca9af"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest287.json b/GeneralStateTests/stRandom/randomStatetest287.json
index 9b3a09319..7ccc17348 100644
--- a/GeneralStateTests/stRandom/randomStatetest287.json
+++ b/GeneralStateTests/stRandom/randomStatetest287.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest287" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "918e9fe708b1316d33f2a2fe6961a8a30cc81b2017fbb7b3951bf779faa7ab0c",
+                    "hash" : "0x918e9fe708b1316d33f2a2fe6961a8a30cc81b2017fbb7b3951bf779faa7ab0c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "918e9fe708b1316d33f2a2fe6961a8a30cc81b2017fbb7b3951bf779faa7ab0c",
+                    "hash" : "0x918e9fe708b1316d33f2a2fe6961a8a30cc81b2017fbb7b3951bf779faa7ab0c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "85992cbec4ce4913e401ed40cddbfa2b1bbc184286c617adde5cdf18649d75a7",
+                    "hash" : "0x85992cbec4ce4913e401ed40cddbfa2b1bbc184286c617adde5cdf18649d75a7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "85992cbec4ce4913e401ed40cddbfa2b1bbc184286c617adde5cdf18649d75a7",
+                    "hash" : "0x85992cbec4ce4913e401ed40cddbfa2b1bbc184286c617adde5cdf18649d75a7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "918e9fe708b1316d33f2a2fe6961a8a30cc81b2017fbb7b3951bf779faa7ab0c",
+                    "hash" : "0x918e9fe708b1316d33f2a2fe6961a8a30cc81b2017fbb7b3951bf779faa7ab0c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "85992cbec4ce4913e401ed40cddbfa2b1bbc184286c617adde5cdf18649d75a7",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5ff7f00000000000000000000000100000000000000000000000000000000000000000759",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1406933351"
+                "0x53dc1967"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest288.json b/GeneralStateTests/stRandom/randomStatetest288.json
index 7ac4f6c3e..6d21aada6 100644
--- a/GeneralStateTests/stRandom/randomStatetest288.json
+++ b/GeneralStateTests/stRandom/randomStatetest288.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest288" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c5fd66cfd27414f0b06ab651ee27bfa757aab2358d1688ad57d16942674f8c5e",
+                    "hash" : "0xc5fd66cfd27414f0b06ab651ee27bfa757aab2358d1688ad57d16942674f8c5e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c5fd66cfd27414f0b06ab651ee27bfa757aab2358d1688ad57d16942674f8c5e",
+                    "hash" : "0xc5fd66cfd27414f0b06ab651ee27bfa757aab2358d1688ad57d16942674f8c5e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "c5fd66cfd27414f0b06ab651ee27bfa757aab2358d1688ad57d16942674f8c5e",
+                    "hash" : "0xc5fd66cfd27414f0b06ab651ee27bfa757aab2358d1688ad57d16942674f8c5e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c5fd66cfd27414f0b06ab651ee27bfa757aab2358d1688ad57d16942674f8c5e",
+                    "hash" : "0xc5fd66cfd27414f0b06ab651ee27bfa757aab2358d1688ad57d16942674f8c5e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c5fd66cfd27414f0b06ab651ee27bfa757aab2358d1688ad57d16942674f8c5e",
+                    "hash" : "0xc5fd66cfd27414f0b06ab651ee27bfa757aab2358d1688ad57d16942674f8c5e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "c5fd66cfd27414f0b06ab651ee27bfa757aab2358d1688ad57d16942674f8c5e",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x76404140424242458c1f11410b",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest289.json b/GeneralStateTests/stRandom/randomStatetest289.json
index fbdc7d3e1..f1a9b9bbf 100644
--- a/GeneralStateTests/stRandom/randomStatetest289.json
+++ b/GeneralStateTests/stRandom/randomStatetest289.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest289" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "5c4ea1a144f21e5b3d823ca508d53887fd6f2e581b57b9eace6f7aad233c8049",
+                    "hash" : "0x5c4ea1a144f21e5b3d823ca508d53887fd6f2e581b57b9eace6f7aad233c8049",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "5c4ea1a144f21e5b3d823ca508d53887fd6f2e581b57b9eace6f7aad233c8049",
+                    "hash" : "0x5c4ea1a144f21e5b3d823ca508d53887fd6f2e581b57b9eace6f7aad233c8049",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5c4ea1a144f21e5b3d823ca508d53887fd6f2e581b57b9eace6f7aad233c8049",
+                    "hash" : "0x5c4ea1a144f21e5b3d823ca508d53887fd6f2e581b57b9eace6f7aad233c8049",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5c4ea1a144f21e5b3d823ca508d53887fd6f2e581b57b9eace6f7aad233c8049",
+                    "hash" : "0x5c4ea1a144f21e5b3d823ca508d53887fd6f2e581b57b9eace6f7aad233c8049",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "5c4ea1a144f21e5b3d823ca508d53887fd6f2e581b57b9eace6f7aad233c8049",
+                    "hash" : "0x5c4ea1a144f21e5b3d823ca508d53887fd6f2e581b57b9eace6f7aad233c8049",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "5c4ea1a144f21e5b3d823ca508d53887fd6f2e581b57b9eace6f7aad233c8049",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0955",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1684451328"
+                "0x6466b000"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest29.json b/GeneralStateTests/stRandom/randomStatetest29.json
index 47598f702..0f4776131 100644
--- a/GeneralStateTests/stRandom/randomStatetest29.json
+++ b/GeneralStateTests/stRandom/randomStatetest29.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest29" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "11e1bb4869a85ce4434200ac454467b78ddfad4c301f49ac4b5485daa0e22556",
+                    "hash" : "0x11e1bb4869a85ce4434200ac454467b78ddfad4c301f49ac4b5485daa0e22556",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "11e1bb4869a85ce4434200ac454467b78ddfad4c301f49ac4b5485daa0e22556",
+                    "hash" : "0x11e1bb4869a85ce4434200ac454467b78ddfad4c301f49ac4b5485daa0e22556",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "11e1bb4869a85ce4434200ac454467b78ddfad4c301f49ac4b5485daa0e22556",
+                    "hash" : "0x11e1bb4869a85ce4434200ac454467b78ddfad4c301f49ac4b5485daa0e22556",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "11e1bb4869a85ce4434200ac454467b78ddfad4c301f49ac4b5485daa0e22556",
+                    "hash" : "0x11e1bb4869a85ce4434200ac454467b78ddfad4c301f49ac4b5485daa0e22556",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "11e1bb4869a85ce4434200ac454467b78ddfad4c301f49ac4b5485daa0e22556",
+                    "hash" : "0x11e1bb4869a85ce4434200ac454467b78ddfad4c301f49ac4b5485daa0e22556",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "11e1bb4869a85ce4434200ac454467b78ddfad4c301f49ac4b5485daa0e22556",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff087fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0955",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "558543347"
+                "0x214ab1f3"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest290.json b/GeneralStateTests/stRandom/randomStatetest290.json
index 4ec255af7..b2fb7a3e4 100644
--- a/GeneralStateTests/stRandom/randomStatetest290.json
+++ b/GeneralStateTests/stRandom/randomStatetest290.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest290" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "09ff797b2ccb7ba95b2fa0e9dc51a99208e75da246528808068f60fb04179128",
+                    "hash" : "0x09ff797b2ccb7ba95b2fa0e9dc51a99208e75da246528808068f60fb04179128",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "09ff797b2ccb7ba95b2fa0e9dc51a99208e75da246528808068f60fb04179128",
+                    "hash" : "0x09ff797b2ccb7ba95b2fa0e9dc51a99208e75da246528808068f60fb04179128",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "09ff797b2ccb7ba95b2fa0e9dc51a99208e75da246528808068f60fb04179128",
+                    "hash" : "0x09ff797b2ccb7ba95b2fa0e9dc51a99208e75da246528808068f60fb04179128",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "09ff797b2ccb7ba95b2fa0e9dc51a99208e75da246528808068f60fb04179128",
+                    "hash" : "0x09ff797b2ccb7ba95b2fa0e9dc51a99208e75da246528808068f60fb04179128",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "09ff797b2ccb7ba95b2fa0e9dc51a99208e75da246528808068f60fb04179128",
+                    "hash" : "0x09ff797b2ccb7ba95b2fa0e9dc51a99208e75da246528808068f60fb04179128",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "09ff797b2ccb7ba95b2fa0e9dc51a99208e75da246528808068f60fb04179128",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe830960005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1834111958"
+                "0x6d5253d6"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest291.json b/GeneralStateTests/stRandom/randomStatetest291.json
index 79ac16b73..6e1f8d846 100644
--- a/GeneralStateTests/stRandom/randomStatetest291.json
+++ b/GeneralStateTests/stRandom/randomStatetest291.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest291" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "2ac7a32edf453f27c5910d2e018b0b8825e1d849ba2bfa68fffb6899e9f57cb0",
+                    "hash" : "0x2ac7a32edf453f27c5910d2e018b0b8825e1d849ba2bfa68fffb6899e9f57cb0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "2ac7a32edf453f27c5910d2e018b0b8825e1d849ba2bfa68fffb6899e9f57cb0",
+                    "hash" : "0x2ac7a32edf453f27c5910d2e018b0b8825e1d849ba2bfa68fffb6899e9f57cb0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2ac7a32edf453f27c5910d2e018b0b8825e1d849ba2bfa68fffb6899e9f57cb0",
+                    "hash" : "0x2ac7a32edf453f27c5910d2e018b0b8825e1d849ba2bfa68fffb6899e9f57cb0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "2ac7a32edf453f27c5910d2e018b0b8825e1d849ba2bfa68fffb6899e9f57cb0",
+                    "hash" : "0x2ac7a32edf453f27c5910d2e018b0b8825e1d849ba2bfa68fffb6899e9f57cb0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "2ac7a32edf453f27c5910d2e018b0b8825e1d849ba2bfa68fffb6899e9f57cb0",
+                    "hash" : "0x2ac7a32edf453f27c5910d2e018b0b8825e1d849ba2bfa68fffb6899e9f57cb0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "2ac7a32edf453f27c5910d2e018b0b8825e1d849ba2bfa68fffb6899e9f57cb0",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000015560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,8 +96,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x3f7ada4a"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest292.json b/GeneralStateTests/stRandom/randomStatetest292.json
index 0ed89f75e..855ea65ef 100644
--- a/GeneralStateTests/stRandom/randomStatetest292.json
+++ b/GeneralStateTests/stRandom/randomStatetest292.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest292" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1829b72b95a73eb31adf971f232abc7561961a0fc2c4714d6bd9fefb936137b5",
+                    "hash" : "0x1829b72b95a73eb31adf971f232abc7561961a0fc2c4714d6bd9fefb936137b5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "1829b72b95a73eb31adf971f232abc7561961a0fc2c4714d6bd9fefb936137b5",
+                    "hash" : "0x1829b72b95a73eb31adf971f232abc7561961a0fc2c4714d6bd9fefb936137b5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "1829b72b95a73eb31adf971f232abc7561961a0fc2c4714d6bd9fefb936137b5",
+                    "hash" : "0x1829b72b95a73eb31adf971f232abc7561961a0fc2c4714d6bd9fefb936137b5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "1829b72b95a73eb31adf971f232abc7561961a0fc2c4714d6bd9fefb936137b5",
+                    "hash" : "0x1829b72b95a73eb31adf971f232abc7561961a0fc2c4714d6bd9fefb936137b5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "1829b72b95a73eb31adf971f232abc7561961a0fc2c4714d6bd9fefb936137b5",
+                    "hash" : "0x1829b72b95a73eb31adf971f232abc7561961a0fc2c4714d6bd9fefb936137b5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "1829b72b95a73eb31adf971f232abc7561961a0fc2c4714d6bd9fefb936137b5",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5417f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000013063a09c825a338e",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "828199880"
+                "0x315d53c8"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest293.json b/GeneralStateTests/stRandom/randomStatetest293.json
index 3b9471586..785715b1b 100644
--- a/GeneralStateTests/stRandom/randomStatetest293.json
+++ b/GeneralStateTests/stRandom/randomStatetest293.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest293" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "fada8bae596515e87eb13f4010b032184ff59e46b61c35c5f44f85d577e9957e",
+                    "hash" : "0xfada8bae596515e87eb13f4010b032184ff59e46b61c35c5f44f85d577e9957e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "fada8bae596515e87eb13f4010b032184ff59e46b61c35c5f44f85d577e9957e",
+                    "hash" : "0xfada8bae596515e87eb13f4010b032184ff59e46b61c35c5f44f85d577e9957e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "fada8bae596515e87eb13f4010b032184ff59e46b61c35c5f44f85d577e9957e",
+                    "hash" : "0xfada8bae596515e87eb13f4010b032184ff59e46b61c35c5f44f85d577e9957e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "fada8bae596515e87eb13f4010b032184ff59e46b61c35c5f44f85d577e9957e",
+                    "hash" : "0xfada8bae596515e87eb13f4010b032184ff59e46b61c35c5f44f85d577e9957e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "fada8bae596515e87eb13f4010b032184ff59e46b61c35c5f44f85d577e9957e",
+                    "hash" : "0xfada8bae596515e87eb13f4010b032184ff59e46b61c35c5f44f85d577e9957e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "fada8bae596515e87eb13f4010b032184ff59e46b61c35c5f44f85d577e9957e",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe417f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f458962699489837460090897f3056682845560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1022808999"
+                "0x3cf6d3a7"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest294.json b/GeneralStateTests/stRandom/randomStatetest294.json
index c98fbd98e..4bc9aa1c4 100644
--- a/GeneralStateTests/stRandom/randomStatetest294.json
+++ b/GeneralStateTests/stRandom/randomStatetest294.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest294" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f8bdbcffd96ce72abd3cd418b18faf596fb05e65184326457f9f3e5bc7527642",
+                    "hash" : "0xf8bdbcffd96ce72abd3cd418b18faf596fb05e65184326457f9f3e5bc7527642",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f8bdbcffd96ce72abd3cd418b18faf596fb05e65184326457f9f3e5bc7527642",
+                    "hash" : "0xf8bdbcffd96ce72abd3cd418b18faf596fb05e65184326457f9f3e5bc7527642",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f8bdbcffd96ce72abd3cd418b18faf596fb05e65184326457f9f3e5bc7527642",
+                    "hash" : "0xf8bdbcffd96ce72abd3cd418b18faf596fb05e65184326457f9f3e5bc7527642",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f8bdbcffd96ce72abd3cd418b18faf596fb05e65184326457f9f3e5bc7527642",
+                    "hash" : "0xf8bdbcffd96ce72abd3cd418b18faf596fb05e65184326457f9f3e5bc7527642",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f8bdbcffd96ce72abd3cd418b18faf596fb05e65184326457f9f3e5bc7527642",
+                    "hash" : "0xf8bdbcffd96ce72abd3cd418b18faf596fb05e65184326457f9f3e5bc7527642",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "f8bdbcffd96ce72abd3cd418b18faf596fb05e65184326457f9f3e5bc7527642",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x057fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe3c7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9d0718f377825843028dfa02158878",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1741399653"
+                "0x67cba665"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest295.json b/GeneralStateTests/stRandom/randomStatetest295.json
index f51a641cd..249d436a9 100644
--- a/GeneralStateTests/stRandom/randomStatetest295.json
+++ b/GeneralStateTests/stRandom/randomStatetest295.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest295" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "16a3262f16dda1ac45a8d1e01aeb81424c27ab65092b6590c205cece4b412cf4",
+                    "hash" : "0x16a3262f16dda1ac45a8d1e01aeb81424c27ab65092b6590c205cece4b412cf4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "16a3262f16dda1ac45a8d1e01aeb81424c27ab65092b6590c205cece4b412cf4",
+                    "hash" : "0x16a3262f16dda1ac45a8d1e01aeb81424c27ab65092b6590c205cece4b412cf4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "16a3262f16dda1ac45a8d1e01aeb81424c27ab65092b6590c205cece4b412cf4",
+                    "hash" : "0x16a3262f16dda1ac45a8d1e01aeb81424c27ab65092b6590c205cece4b412cf4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "16a3262f16dda1ac45a8d1e01aeb81424c27ab65092b6590c205cece4b412cf4",
+                    "hash" : "0x16a3262f16dda1ac45a8d1e01aeb81424c27ab65092b6590c205cece4b412cf4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "16a3262f16dda1ac45a8d1e01aeb81424c27ab65092b6590c205cece4b412cf4",
+                    "hash" : "0x16a3262f16dda1ac45a8d1e01aeb81424c27ab65092b6590c205cece4b412cf4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "16a3262f16dda1ac45a8d1e01aeb81424c27ab65092b6590c205cece4b412cf4",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b531353a0b3c8b17eb55",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "587483939"
+                "0x23044b23"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest296.json b/GeneralStateTests/stRandom/randomStatetest296.json
index 19419f2a6..2a109bb3f 100644
--- a/GeneralStateTests/stRandom/randomStatetest296.json
+++ b/GeneralStateTests/stRandom/randomStatetest296.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest296" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "4c1a23fe6e433d7bda3b573e94605a4b924ab3601d81b546f0ff3f43089956f7",
+                    "hash" : "0x4c1a23fe6e433d7bda3b573e94605a4b924ab3601d81b546f0ff3f43089956f7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "4c1a23fe6e433d7bda3b573e94605a4b924ab3601d81b546f0ff3f43089956f7",
+                    "hash" : "0x4c1a23fe6e433d7bda3b573e94605a4b924ab3601d81b546f0ff3f43089956f7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4c1a23fe6e433d7bda3b573e94605a4b924ab3601d81b546f0ff3f43089956f7",
+                    "hash" : "0x4c1a23fe6e433d7bda3b573e94605a4b924ab3601d81b546f0ff3f43089956f7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4c1a23fe6e433d7bda3b573e94605a4b924ab3601d81b546f0ff3f43089956f7",
+                    "hash" : "0x4c1a23fe6e433d7bda3b573e94605a4b924ab3601d81b546f0ff3f43089956f7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "4c1a23fe6e433d7bda3b573e94605a4b924ab3601d81b546f0ff3f43089956f7",
+                    "hash" : "0x4c1a23fe6e433d7bda3b573e94605a4b924ab3601d81b546f0ff3f43089956f7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "4c1a23fe6e433d7bda3b573e94605a4b924ab3601d81b546f0ff3f43089956f7",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff417f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5385b9655558f510a6c73",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "185739865"
+                "0x0b122a59"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest297.json b/GeneralStateTests/stRandom/randomStatetest297.json
index 6c8328d78..843e69df2 100644
--- a/GeneralStateTests/stRandom/randomStatetest297.json
+++ b/GeneralStateTests/stRandom/randomStatetest297.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest297" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "8edc079aef7f0cf7e6d3d52d2c3eccb324677be55d9c0aa15f87f1cdc39229bc",
+                    "hash" : "0x8edc079aef7f0cf7e6d3d52d2c3eccb324677be55d9c0aa15f87f1cdc39229bc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "8edc079aef7f0cf7e6d3d52d2c3eccb324677be55d9c0aa15f87f1cdc39229bc",
+                    "hash" : "0x8edc079aef7f0cf7e6d3d52d2c3eccb324677be55d9c0aa15f87f1cdc39229bc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "8edc079aef7f0cf7e6d3d52d2c3eccb324677be55d9c0aa15f87f1cdc39229bc",
+                    "hash" : "0x8edc079aef7f0cf7e6d3d52d2c3eccb324677be55d9c0aa15f87f1cdc39229bc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "8edc079aef7f0cf7e6d3d52d2c3eccb324677be55d9c0aa15f87f1cdc39229bc",
+                    "hash" : "0x8edc079aef7f0cf7e6d3d52d2c3eccb324677be55d9c0aa15f87f1cdc39229bc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "8edc079aef7f0cf7e6d3d52d2c3eccb324677be55d9c0aa15f87f1cdc39229bc",
+                    "hash" : "0x8edc079aef7f0cf7e6d3d52d2c3eccb324677be55d9c0aa15f87f1cdc39229bc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "8edc079aef7f0cf7e6d3d52d2c3eccb324677be55d9c0aa15f87f1cdc39229bc",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5437f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe426f91085661509214157d9c8a777585185560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "2086766474"
+                "0x7c61878a"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest298.json b/GeneralStateTests/stRandom/randomStatetest298.json
index 5042dbcbe..cb553b772 100644
--- a/GeneralStateTests/stRandom/randomStatetest298.json
+++ b/GeneralStateTests/stRandom/randomStatetest298.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest298" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7e503a725058cb403d3dae9a5defb7814719ead1906027e1052eee24d02519d6",
+                    "hash" : "0x7e503a725058cb403d3dae9a5defb7814719ead1906027e1052eee24d02519d6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7e503a725058cb403d3dae9a5defb7814719ead1906027e1052eee24d02519d6",
+                    "hash" : "0x7e503a725058cb403d3dae9a5defb7814719ead1906027e1052eee24d02519d6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "7e503a725058cb403d3dae9a5defb7814719ead1906027e1052eee24d02519d6",
+                    "hash" : "0x7e503a725058cb403d3dae9a5defb7814719ead1906027e1052eee24d02519d6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "7e503a725058cb403d3dae9a5defb7814719ead1906027e1052eee24d02519d6",
+                    "hash" : "0x7e503a725058cb403d3dae9a5defb7814719ead1906027e1052eee24d02519d6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7e503a725058cb403d3dae9a5defb7814719ead1906027e1052eee24d02519d6",
+                    "hash" : "0x7e503a725058cb403d3dae9a5defb7814719ead1906027e1052eee24d02519d6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "7e503a725058cb403d3dae9a5defb7814719ead1906027e1052eee24d02519d6",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3500a6f7c542006528b69ff3a7a3a0401613c5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "2114938379"
+                "0x7e0f660b"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest299.json b/GeneralStateTests/stRandom/randomStatetest299.json
index ac72e7e7e..fc9f28134 100644
--- a/GeneralStateTests/stRandom/randomStatetest299.json
+++ b/GeneralStateTests/stRandom/randomStatetest299.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest299" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e94bd181433d3eeadd99d0ec50a7e227c8e8c9d46d8bcd89fda1fa82953025aa",
+                    "hash" : "0xe94bd181433d3eeadd99d0ec50a7e227c8e8c9d46d8bcd89fda1fa82953025aa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e94bd181433d3eeadd99d0ec50a7e227c8e8c9d46d8bcd89fda1fa82953025aa",
+                    "hash" : "0xe94bd181433d3eeadd99d0ec50a7e227c8e8c9d46d8bcd89fda1fa82953025aa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e94bd181433d3eeadd99d0ec50a7e227c8e8c9d46d8bcd89fda1fa82953025aa",
+                    "hash" : "0xe94bd181433d3eeadd99d0ec50a7e227c8e8c9d46d8bcd89fda1fa82953025aa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e94bd181433d3eeadd99d0ec50a7e227c8e8c9d46d8bcd89fda1fa82953025aa",
+                    "hash" : "0xe94bd181433d3eeadd99d0ec50a7e227c8e8c9d46d8bcd89fda1fa82953025aa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e94bd181433d3eeadd99d0ec50a7e227c8e8c9d46d8bcd89fda1fa82953025aa",
+                    "hash" : "0xe94bd181433d3eeadd99d0ec50a7e227c8e8c9d46d8bcd89fda1fa82953025aa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "e94bd181433d3eeadd99d0ec50a7e227c8e8c9d46d8bcd89fda1fa82953025aa",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f540813697adf70f20906389d128bf05560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "440906036"
+                "0x1a47b134"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest3.json b/GeneralStateTests/stRandom/randomStatetest3.json
index c17308b86..5541173b6 100644
--- a/GeneralStateTests/stRandom/randomStatetest3.json
+++ b/GeneralStateTests/stRandom/randomStatetest3.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest3" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "5c006cbf978674807a6d4fc7926703add138cde08ee901131e832947ae1fd002",
+                    "hash" : "0x5c006cbf978674807a6d4fc7926703add138cde08ee901131e832947ae1fd002",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "5c006cbf978674807a6d4fc7926703add138cde08ee901131e832947ae1fd002",
+                    "hash" : "0x5c006cbf978674807a6d4fc7926703add138cde08ee901131e832947ae1fd002",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5c006cbf978674807a6d4fc7926703add138cde08ee901131e832947ae1fd002",
+                    "hash" : "0x5c006cbf978674807a6d4fc7926703add138cde08ee901131e832947ae1fd002",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5c006cbf978674807a6d4fc7926703add138cde08ee901131e832947ae1fd002",
+                    "hash" : "0x5c006cbf978674807a6d4fc7926703add138cde08ee901131e832947ae1fd002",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "5c006cbf978674807a6d4fc7926703add138cde08ee901131e832947ae1fd002",
+                    "hash" : "0x5c006cbf978674807a6d4fc7926703add138cde08ee901131e832947ae1fd002",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "5c006cbf978674807a6d4fc7926703add138cde08ee901131e832947ae1fd002",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe427f000000000000000000000000000000000000000000000000000000000000c3504160005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,8 +96,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x5eaa223f"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest30.json b/GeneralStateTests/stRandom/randomStatetest30.json
index 9201fe2aa..0e2032ef0 100644
--- a/GeneralStateTests/stRandom/randomStatetest30.json
+++ b/GeneralStateTests/stRandom/randomStatetest30.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest30" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b96e142e4f47b46028b253ba06935ff9c89ef17b47024112f23a9153fd074777",
+                    "hash" : "0xb96e142e4f47b46028b253ba06935ff9c89ef17b47024112f23a9153fd074777",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b96e142e4f47b46028b253ba06935ff9c89ef17b47024112f23a9153fd074777",
+                    "hash" : "0xb96e142e4f47b46028b253ba06935ff9c89ef17b47024112f23a9153fd074777",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b2b265a8f3197237d108257414212611077d8ad4ea9d9b0f8e455d73ff6f552c",
+                    "hash" : "0xb2b265a8f3197237d108257414212611077d8ad4ea9d9b0f8e455d73ff6f552c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b2b265a8f3197237d108257414212611077d8ad4ea9d9b0f8e455d73ff6f552c",
+                    "hash" : "0xb2b265a8f3197237d108257414212611077d8ad4ea9d9b0f8e455d73ff6f552c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b96e142e4f47b46028b253ba06935ff9c89ef17b47024112f23a9153fd074777",
+                    "hash" : "0xb96e142e4f47b46028b253ba06935ff9c89ef17b47024112f23a9153fd074777",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "b2b265a8f3197237d108257414212611077d8ad4ea9d9b0f8e455d73ff6f552c",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x41314155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest300.json b/GeneralStateTests/stRandom/randomStatetest300.json
index 27b19d9f6..bf5b4930b 100644
--- a/GeneralStateTests/stRandom/randomStatetest300.json
+++ b/GeneralStateTests/stRandom/randomStatetest300.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest300" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "54b6f50f518be844cd51ecb45b2579ce2bf90b6fe98a5efdba9d552942db757a",
+                    "hash" : "0x54b6f50f518be844cd51ecb45b2579ce2bf90b6fe98a5efdba9d552942db757a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "54b6f50f518be844cd51ecb45b2579ce2bf90b6fe98a5efdba9d552942db757a",
+                    "hash" : "0x54b6f50f518be844cd51ecb45b2579ce2bf90b6fe98a5efdba9d552942db757a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "54b6f50f518be844cd51ecb45b2579ce2bf90b6fe98a5efdba9d552942db757a",
+                    "hash" : "0x54b6f50f518be844cd51ecb45b2579ce2bf90b6fe98a5efdba9d552942db757a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "54b6f50f518be844cd51ecb45b2579ce2bf90b6fe98a5efdba9d552942db757a",
+                    "hash" : "0x54b6f50f518be844cd51ecb45b2579ce2bf90b6fe98a5efdba9d552942db757a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "54b6f50f518be844cd51ecb45b2579ce2bf90b6fe98a5efdba9d552942db757a",
+                    "hash" : "0x54b6f50f518be844cd51ecb45b2579ce2bf90b6fe98a5efdba9d552942db757a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "54b6f50f518be844cd51ecb45b2579ce2bf90b6fe98a5efdba9d552942db757a",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f0000000000000000000000000000000000000000000000000000000000000000447f000000000000000000000000000000000000000000000000000000000000c350757f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c35060005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1430892634"
+                "0x5549b05a"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest301.json b/GeneralStateTests/stRandom/randomStatetest301.json
index 5984cbf27..0cfa96d32 100644
--- a/GeneralStateTests/stRandom/randomStatetest301.json
+++ b/GeneralStateTests/stRandom/randomStatetest301.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest301" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "416f784b98a311bba0342984f5ce4966b32979109981a04eb97f813d277c2e8f",
+                    "hash" : "0x416f784b98a311bba0342984f5ce4966b32979109981a04eb97f813d277c2e8f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "416f784b98a311bba0342984f5ce4966b32979109981a04eb97f813d277c2e8f",
+                    "hash" : "0x416f784b98a311bba0342984f5ce4966b32979109981a04eb97f813d277c2e8f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "416f784b98a311bba0342984f5ce4966b32979109981a04eb97f813d277c2e8f",
+                    "hash" : "0x416f784b98a311bba0342984f5ce4966b32979109981a04eb97f813d277c2e8f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "416f784b98a311bba0342984f5ce4966b32979109981a04eb97f813d277c2e8f",
+                    "hash" : "0x416f784b98a311bba0342984f5ce4966b32979109981a04eb97f813d277c2e8f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "416f784b98a311bba0342984f5ce4966b32979109981a04eb97f813d277c2e8f",
+                    "hash" : "0x416f784b98a311bba0342984f5ce4966b32979109981a04eb97f813d277c2e8f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "416f784b98a311bba0342984f5ce4966b32979109981a04eb97f813d277c2e8f",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000003784946a737aa092f1975664518a5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "323025358"
+                "0x1340f9ce"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest302.json b/GeneralStateTests/stRandom/randomStatetest302.json
index 9e536ab36..e1efe1c7e 100644
--- a/GeneralStateTests/stRandom/randomStatetest302.json
+++ b/GeneralStateTests/stRandom/randomStatetest302.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest302" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e5fb82c5770b521740b1410ab3d5acd21b3b7ac5665d3ef83f61f5a73c5ad50b",
+                    "hash" : "0xe5fb82c5770b521740b1410ab3d5acd21b3b7ac5665d3ef83f61f5a73c5ad50b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e5fb82c5770b521740b1410ab3d5acd21b3b7ac5665d3ef83f61f5a73c5ad50b",
+                    "hash" : "0xe5fb82c5770b521740b1410ab3d5acd21b3b7ac5665d3ef83f61f5a73c5ad50b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e5fb82c5770b521740b1410ab3d5acd21b3b7ac5665d3ef83f61f5a73c5ad50b",
+                    "hash" : "0xe5fb82c5770b521740b1410ab3d5acd21b3b7ac5665d3ef83f61f5a73c5ad50b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e5fb82c5770b521740b1410ab3d5acd21b3b7ac5665d3ef83f61f5a73c5ad50b",
+                    "hash" : "0xe5fb82c5770b521740b1410ab3d5acd21b3b7ac5665d3ef83f61f5a73c5ad50b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e5fb82c5770b521740b1410ab3d5acd21b3b7ac5665d3ef83f61f5a73c5ad50b",
+                    "hash" : "0xe5fb82c5770b521740b1410ab3d5acd21b3b7ac5665d3ef83f61f5a73c5ad50b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "e5fb82c5770b521740b1410ab3d5acd21b3b7ac5665d3ef83f61f5a73c5ad50b",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000971a7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff447f00000000000000000000000000000000000000000000000000000000000000006989206c0b8a01867bf155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,8 +96,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x774e407c"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest303.json b/GeneralStateTests/stRandom/randomStatetest303.json
index fda3c7276..fb59c0f66 100644
--- a/GeneralStateTests/stRandom/randomStatetest303.json
+++ b/GeneralStateTests/stRandom/randomStatetest303.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest303" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "341d35dcd68e14ed391c23300e89fb48d60096e473e4e8b84589df12381e8d0e",
+                    "hash" : "0x341d35dcd68e14ed391c23300e89fb48d60096e473e4e8b84589df12381e8d0e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "341d35dcd68e14ed391c23300e89fb48d60096e473e4e8b84589df12381e8d0e",
+                    "hash" : "0x341d35dcd68e14ed391c23300e89fb48d60096e473e4e8b84589df12381e8d0e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "341d35dcd68e14ed391c23300e89fb48d60096e473e4e8b84589df12381e8d0e",
+                    "hash" : "0x341d35dcd68e14ed391c23300e89fb48d60096e473e4e8b84589df12381e8d0e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "341d35dcd68e14ed391c23300e89fb48d60096e473e4e8b84589df12381e8d0e",
+                    "hash" : "0x341d35dcd68e14ed391c23300e89fb48d60096e473e4e8b84589df12381e8d0e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "341d35dcd68e14ed391c23300e89fb48d60096e473e4e8b84589df12381e8d0e",
+                    "hash" : "0x341d35dcd68e14ed391c23300e89fb48d60096e473e4e8b84589df12381e8d0e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "341d35dcd68e14ed391c23300e89fb48d60096e473e4e8b84589df12381e8d0e",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5457f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff441a35803a0ba46699913755",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,8 +96,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x377df0d4"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest304.json b/GeneralStateTests/stRandom/randomStatetest304.json
index d680871eb..96354443e 100644
--- a/GeneralStateTests/stRandom/randomStatetest304.json
+++ b/GeneralStateTests/stRandom/randomStatetest304.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest304" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6cfc27db102eef174dcf122d8f31a69f009fb0d349fafc44f01c46c5475a92f5",
+                    "hash" : "0x6cfc27db102eef174dcf122d8f31a69f009fb0d349fafc44f01c46c5475a92f5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6cfc27db102eef174dcf122d8f31a69f009fb0d349fafc44f01c46c5475a92f5",
+                    "hash" : "0x6cfc27db102eef174dcf122d8f31a69f009fb0d349fafc44f01c46c5475a92f5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6cfc27db102eef174dcf122d8f31a69f009fb0d349fafc44f01c46c5475a92f5",
+                    "hash" : "0x6cfc27db102eef174dcf122d8f31a69f009fb0d349fafc44f01c46c5475a92f5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6cfc27db102eef174dcf122d8f31a69f009fb0d349fafc44f01c46c5475a92f5",
+                    "hash" : "0x6cfc27db102eef174dcf122d8f31a69f009fb0d349fafc44f01c46c5475a92f5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6cfc27db102eef174dcf122d8f31a69f009fb0d349fafc44f01c46c5475a92f5",
+                    "hash" : "0x6cfc27db102eef174dcf122d8f31a69f009fb0d349fafc44f01c46c5475a92f5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "6cfc27db102eef174dcf122d8f31a69f009fb0d349fafc44f01c46c5475a92f5",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f0000000000000000000000010000000000000000000000000000000000000000a27f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff167ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff42070b8c5430070bf15560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,8 +96,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x293d448f"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest305.json b/GeneralStateTests/stRandom/randomStatetest305.json
index 582d78827..75c6e0527 100644
--- a/GeneralStateTests/stRandom/randomStatetest305.json
+++ b/GeneralStateTests/stRandom/randomStatetest305.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest305" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c44f8088f3ca403a164ca1162d3dbad4f11cbf446b96483be6a6da5607d5a72f",
+                    "hash" : "0xc44f8088f3ca403a164ca1162d3dbad4f11cbf446b96483be6a6da5607d5a72f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c44f8088f3ca403a164ca1162d3dbad4f11cbf446b96483be6a6da5607d5a72f",
+                    "hash" : "0xc44f8088f3ca403a164ca1162d3dbad4f11cbf446b96483be6a6da5607d5a72f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "c44f8088f3ca403a164ca1162d3dbad4f11cbf446b96483be6a6da5607d5a72f",
+                    "hash" : "0xc44f8088f3ca403a164ca1162d3dbad4f11cbf446b96483be6a6da5607d5a72f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c44f8088f3ca403a164ca1162d3dbad4f11cbf446b96483be6a6da5607d5a72f",
+                    "hash" : "0xc44f8088f3ca403a164ca1162d3dbad4f11cbf446b96483be6a6da5607d5a72f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c44f8088f3ca403a164ca1162d3dbad4f11cbf446b96483be6a6da5607d5a72f",
+                    "hash" : "0xc44f8088f3ca403a164ca1162d3dbad4f11cbf446b96483be6a6da5607d5a72f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "c44f8088f3ca403a164ca1162d3dbad4f11cbf446b96483be6a6da5607d5a72f",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000006f606e048240069c409313318736200b5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "218159006"
+                "0x0d00d79e"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest306.json b/GeneralStateTests/stRandom/randomStatetest306.json
index 9b0af0fcd..bc65e8f1d 100644
--- a/GeneralStateTests/stRandom/randomStatetest306.json
+++ b/GeneralStateTests/stRandom/randomStatetest306.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest306" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
             {
@@ -24,7 +24,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f08f2266bb1ca985fcdff61d5623010c512034053acf9501f9de6cfc568cfca6",
+                    "hash" : "0xf08f2266bb1ca985fcdff61d5623010c512034053acf9501f9de6cfc568cfca6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f08f2266bb1ca985fcdff61d5623010c512034053acf9501f9de6cfc568cfca6",
+                    "hash" : "0xf08f2266bb1ca985fcdff61d5623010c512034053acf9501f9de6cfc568cfca6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3fe1453d8f9c0cb3357383e4e2d2f0136e987399786a4ea92908719995bc63a5",
+                    "hash" : "0x3fe1453d8f9c0cb3357383e4e2d2f0136e987399786a4ea92908719995bc63a5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3fe1453d8f9c0cb3357383e4e2d2f0136e987399786a4ea92908719995bc63a5",
+                    "hash" : "0x3fe1453d8f9c0cb3357383e4e2d2f0136e987399786a4ea92908719995bc63a5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -64,7 +64,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f08f2266bb1ca985fcdff61d5623010c512034053acf9501f9de6cfc568cfca6",
+                    "hash" : "0xf08f2266bb1ca985fcdff61d5623010c512034053acf9501f9de6cfc568cfca6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -75,23 +75,23 @@
         },
         "postStateRoot" : "3fe1453d8f9c0cb3357383e4e2d2f0136e987399786a4ea92908719995bc63a5",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x60d36e84517b3285b0867cd4144ff5f688d60b6a07592395d95e37246c06736c78c9fa9e4b5e5db5a4b6ac4ced6dd169cda4fc3c11e9a6f0b4cec2f56019617df7a363788c155473412582d556f06c6d5864cf4be6a2d1318b8e40ba1377454cc8d0510823591dee680d7dddc8c149bfcc24c65c69e66c2b9d3e28f05faf2587c446509405759901ec0946bf3d786827225faf5da81e158cd9b2b4666f71a29fbe89f77c340dcbd7d67aedf852136b6c76affb38beb802e0af269e65c22f52807c677b5e2c7d8c473aff18fe912c7ed21ab60fe5d4916a76c93539332c6ab16b3f81b990f4b34b0228c7f5b1656bdd21d458717330e4be7d7bb91cc95818140eef086cd82d2d6f0d66c92a7ffb27125a625c77a8967268f212339508d6f60d9c93a9e201f2ae883cb9752460ec0dcb4ba3b84a4db899c29f08ef1b0f506b4f3c05601f6001601060116328b0eb5f73095e7baea6a6c7c4c2dfeb977efac326af552d87630a4eb375f17df238e15d7d51240301521f173d628e7a68d01354faaf406ce541f753db89671f6aedcf261f632e6244e8c3799a2de002f15ba4681fd3c609c0f522dfd964f95def9926f812327781b2de33196cc22776e9b26d8a0d65c57bdac987d0b3e0db66c0f1232c7add3365f209cc53592f73502d0c5889b1bbf131f8bb6a6b5e2e067b9ef676768d48b3f5790c3304e046f0a9c8a838a0596583d6258f196dcf982a9de5cec4f871470e7a6c9289615e1e7d140fdc038972916223fb8012e29350295f3919cb28a36411845930d5e91b68510faac5e0677953467cedb653f73818749e8cbaf15a5d64ba7ee5cabc98137167b924a2aac9147f159713d115e0225a84a54d6471dc7a01a7e4e814145305c9d04d2880c5be42fc6c52ced3e983d91a580a4142021b73e99c3180117914b9ad03c580a8dac862be9b599a73ccfcfb230bcffc425c13c265f3b06b8c9f104c10752740765567374c211601a5f51501d18c48081998ff7b7a8bfdf0bec9eb4385b554870a996e0cab662d991d0e5f9357f2f99f98",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -106,8 +106,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x5af02372"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest307.json b/GeneralStateTests/stRandom/randomStatetest307.json
index 109f75efc..0d3e8f1a4 100644
--- a/GeneralStateTests/stRandom/randomStatetest307.json
+++ b/GeneralStateTests/stRandom/randomStatetest307.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest307" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "ef11ce1e16918296f9c991397583e071eb87b41d2dafef8a0b866f5cc2ce4c86",
+                    "hash" : "0xef11ce1e16918296f9c991397583e071eb87b41d2dafef8a0b866f5cc2ce4c86",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "5344f3d0f00b34cf8359c610bac581c9afe0aac3f980f6b2f3cdc895a2668c18",
+                    "hash" : "0x5344f3d0f00b34cf8359c610bac581c9afe0aac3f980f6b2f3cdc895a2668c18",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "d04b66431e303267d08004a1239a4a9cdf974aeac6a40ae39e8fb6fc1e130350",
+                    "hash" : "0xd04b66431e303267d08004a1239a4a9cdf974aeac6a40ae39e8fb6fc1e130350",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "d04b66431e303267d08004a1239a4a9cdf974aeac6a40ae39e8fb6fc1e130350",
+                    "hash" : "0xd04b66431e303267d08004a1239a4a9cdf974aeac6a40ae39e8fb6fc1e130350",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "5344f3d0f00b34cf8359c610bac581c9afe0aac3f980f6b2f3cdc895a2668c18",
+                    "hash" : "0x5344f3d0f00b34cf8359c610bac581c9afe0aac3f980f6b2f3cdc895a2668c18",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "d04b66431e303267d08004a1239a4a9cdf974aeac6a40ae39e8fb6fc1e130350",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5547f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000037f055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1254784781"
+                "0x4aca7f0d"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest308.json b/GeneralStateTests/stRandom/randomStatetest308.json
index 615d6fdd0..a9d7d6d51 100644
--- a/GeneralStateTests/stRandom/randomStatetest308.json
+++ b/GeneralStateTests/stRandom/randomStatetest308.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest308" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "95a026865d7bef9b68198e20c174107e34ede038d24d97496b17449e6cd5d959",
+                    "hash" : "0x95a026865d7bef9b68198e20c174107e34ede038d24d97496b17449e6cd5d959",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "95a026865d7bef9b68198e20c174107e34ede038d24d97496b17449e6cd5d959",
+                    "hash" : "0x95a026865d7bef9b68198e20c174107e34ede038d24d97496b17449e6cd5d959",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "95a026865d7bef9b68198e20c174107e34ede038d24d97496b17449e6cd5d959",
+                    "hash" : "0x95a026865d7bef9b68198e20c174107e34ede038d24d97496b17449e6cd5d959",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "95a026865d7bef9b68198e20c174107e34ede038d24d97496b17449e6cd5d959",
+                    "hash" : "0x95a026865d7bef9b68198e20c174107e34ede038d24d97496b17449e6cd5d959",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "95a026865d7bef9b68198e20c174107e34ede038d24d97496b17449e6cd5d959",
+                    "hash" : "0x95a026865d7bef9b68198e20c174107e34ede038d24d97496b17449e6cd5d959",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "2b5136571e9040874b7ee9f489478934e463fb9e74410c90e4bff0783993d3ea",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5357f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe427f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000010000000000000000000000000000000000000000085a01096630f38c9a60005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "23682877"
+                "0x01695f3d"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest309.json b/GeneralStateTests/stRandom/randomStatetest309.json
index 71243aa18..7a9bb6d44 100644
--- a/GeneralStateTests/stRandom/randomStatetest309.json
+++ b/GeneralStateTests/stRandom/randomStatetest309.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest309" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9adeffd1dc5c9481f9ae5efb6960d633848bfb4b00bc7f279d56ea45f2a2298f",
+                    "hash" : "0x9adeffd1dc5c9481f9ae5efb6960d633848bfb4b00bc7f279d56ea45f2a2298f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9adeffd1dc5c9481f9ae5efb6960d633848bfb4b00bc7f279d56ea45f2a2298f",
+                    "hash" : "0x9adeffd1dc5c9481f9ae5efb6960d633848bfb4b00bc7f279d56ea45f2a2298f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9adeffd1dc5c9481f9ae5efb6960d633848bfb4b00bc7f279d56ea45f2a2298f",
+                    "hash" : "0x9adeffd1dc5c9481f9ae5efb6960d633848bfb4b00bc7f279d56ea45f2a2298f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9adeffd1dc5c9481f9ae5efb6960d633848bfb4b00bc7f279d56ea45f2a2298f",
+                    "hash" : "0x9adeffd1dc5c9481f9ae5efb6960d633848bfb4b00bc7f279d56ea45f2a2298f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9adeffd1dc5c9481f9ae5efb6960d633848bfb4b00bc7f279d56ea45f2a2298f",
+                    "hash" : "0x9adeffd1dc5c9481f9ae5efb6960d633848bfb4b00bc7f279d56ea45f2a2298f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "9adeffd1dc5c9481f9ae5efb6960d633848bfb4b00bc7f279d56ea45f2a2298f",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x43454545085a55",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest31.json b/GeneralStateTests/stRandom/randomStatetest31.json
index 8ff81033e..ba0645fb6 100644
--- a/GeneralStateTests/stRandom/randomStatetest31.json
+++ b/GeneralStateTests/stRandom/randomStatetest31.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest31" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "4872c668e82ccc833ce9035f94ae7c021051c1a48667b8883eab583d3e5f1e96",
+                    "hash" : "0x4872c668e82ccc833ce9035f94ae7c021051c1a48667b8883eab583d3e5f1e96",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "4872c668e82ccc833ce9035f94ae7c021051c1a48667b8883eab583d3e5f1e96",
+                    "hash" : "0x4872c668e82ccc833ce9035f94ae7c021051c1a48667b8883eab583d3e5f1e96",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4872c668e82ccc833ce9035f94ae7c021051c1a48667b8883eab583d3e5f1e96",
+                    "hash" : "0x4872c668e82ccc833ce9035f94ae7c021051c1a48667b8883eab583d3e5f1e96",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4872c668e82ccc833ce9035f94ae7c021051c1a48667b8883eab583d3e5f1e96",
+                    "hash" : "0x4872c668e82ccc833ce9035f94ae7c021051c1a48667b8883eab583d3e5f1e96",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "4872c668e82ccc833ce9035f94ae7c021051c1a48667b8883eab583d3e5f1e96",
+                    "hash" : "0x4872c668e82ccc833ce9035f94ae7c021051c1a48667b8883eab583d3e5f1e96",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "4872c668e82ccc833ce9035f94ae7c021051c1a48667b8883eab583d3e5f1e96",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x387f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000090375560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1344810912"
+                "0x50282fa0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest310.json b/GeneralStateTests/stRandom/randomStatetest310.json
index f939b77bc..6854fe373 100644
--- a/GeneralStateTests/stRandom/randomStatetest310.json
+++ b/GeneralStateTests/stRandom/randomStatetest310.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest310" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "003fa0e50c8def5b82816519bf4473b0a5e7822d1c29157ef51c4e543d9f5cb9",
+                    "hash" : "0x003fa0e50c8def5b82816519bf4473b0a5e7822d1c29157ef51c4e543d9f5cb9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "003fa0e50c8def5b82816519bf4473b0a5e7822d1c29157ef51c4e543d9f5cb9",
+                    "hash" : "0x003fa0e50c8def5b82816519bf4473b0a5e7822d1c29157ef51c4e543d9f5cb9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "003fa0e50c8def5b82816519bf4473b0a5e7822d1c29157ef51c4e543d9f5cb9",
+                    "hash" : "0x003fa0e50c8def5b82816519bf4473b0a5e7822d1c29157ef51c4e543d9f5cb9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "003fa0e50c8def5b82816519bf4473b0a5e7822d1c29157ef51c4e543d9f5cb9",
+                    "hash" : "0x003fa0e50c8def5b82816519bf4473b0a5e7822d1c29157ef51c4e543d9f5cb9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "003fa0e50c8def5b82816519bf4473b0a5e7822d1c29157ef51c4e543d9f5cb9",
+                    "hash" : "0x003fa0e50c8def5b82816519bf4473b0a5e7822d1c29157ef51c4e543d9f5cb9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "003fa0e50c8def5b82816519bf4473b0a5e7822d1c29157ef51c4e543d9f5cb9",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x44587fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff59907fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1a37160b6a650645597c796e9c97955560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "460778909"
+                "0x1b76ed9d"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest311.json b/GeneralStateTests/stRandom/randomStatetest311.json
index 25190b3c9..4aa3dd147 100644
--- a/GeneralStateTests/stRandom/randomStatetest311.json
+++ b/GeneralStateTests/stRandom/randomStatetest311.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest311" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1ff85a391e539effce05663166f44cd4df2d6c61eb28efbc185d029300ca5a6c",
+                    "hash" : "0x1ff85a391e539effce05663166f44cd4df2d6c61eb28efbc185d029300ca5a6c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "1ff85a391e539effce05663166f44cd4df2d6c61eb28efbc185d029300ca5a6c",
+                    "hash" : "0x1ff85a391e539effce05663166f44cd4df2d6c61eb28efbc185d029300ca5a6c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "1ff85a391e539effce05663166f44cd4df2d6c61eb28efbc185d029300ca5a6c",
+                    "hash" : "0x1ff85a391e539effce05663166f44cd4df2d6c61eb28efbc185d029300ca5a6c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "1ff85a391e539effce05663166f44cd4df2d6c61eb28efbc185d029300ca5a6c",
+                    "hash" : "0x1ff85a391e539effce05663166f44cd4df2d6c61eb28efbc185d029300ca5a6c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "1ff85a391e539effce05663166f44cd4df2d6c61eb28efbc185d029300ca5a6c",
+                    "hash" : "0x1ff85a391e539effce05663166f44cd4df2d6c61eb28efbc185d029300ca5a6c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "1ff85a391e539effce05663166f44cd4df2d6c61eb28efbc185d029300ca5a6c",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x447f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3506f13971264a1197d72ff18971902387b5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "97322261"
+                "0x05cd0515"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest312.json b/GeneralStateTests/stRandom/randomStatetest312.json
index 6e6de1978..16b40c513 100644
--- a/GeneralStateTests/stRandom/randomStatetest312.json
+++ b/GeneralStateTests/stRandom/randomStatetest312.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest312" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "4229d22eba45964985613259c569942393f6cb51bf3b409442acee73e0ed778a",
+                    "hash" : "0x4229d22eba45964985613259c569942393f6cb51bf3b409442acee73e0ed778a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "4229d22eba45964985613259c569942393f6cb51bf3b409442acee73e0ed778a",
+                    "hash" : "0x4229d22eba45964985613259c569942393f6cb51bf3b409442acee73e0ed778a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4229d22eba45964985613259c569942393f6cb51bf3b409442acee73e0ed778a",
+                    "hash" : "0x4229d22eba45964985613259c569942393f6cb51bf3b409442acee73e0ed778a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4229d22eba45964985613259c569942393f6cb51bf3b409442acee73e0ed778a",
+                    "hash" : "0x4229d22eba45964985613259c569942393f6cb51bf3b409442acee73e0ed778a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "4229d22eba45964985613259c569942393f6cb51bf3b409442acee73e0ed778a",
+                    "hash" : "0x4229d22eba45964985613259c569942393f6cb51bf3b409442acee73e0ed778a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "4229d22eba45964985613259c569942393f6cb51bf3b409442acee73e0ed778a",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff427f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f0000000000000000000000000000000000000000000000000000000000000000187b55",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "992438124"
+                "0x3b27676c"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest313.json b/GeneralStateTests/stRandom/randomStatetest313.json
index 01473b2ea..4823524e9 100644
--- a/GeneralStateTests/stRandom/randomStatetest313.json
+++ b/GeneralStateTests/stRandom/randomStatetest313.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest313" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f356f55e90b79b2b441790436315fe7067f1db8a9e00061266cfc67af7a0ae28",
+                    "hash" : "0xf356f55e90b79b2b441790436315fe7067f1db8a9e00061266cfc67af7a0ae28",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f356f55e90b79b2b441790436315fe7067f1db8a9e00061266cfc67af7a0ae28",
+                    "hash" : "0xf356f55e90b79b2b441790436315fe7067f1db8a9e00061266cfc67af7a0ae28",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f356f55e90b79b2b441790436315fe7067f1db8a9e00061266cfc67af7a0ae28",
+                    "hash" : "0xf356f55e90b79b2b441790436315fe7067f1db8a9e00061266cfc67af7a0ae28",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f356f55e90b79b2b441790436315fe7067f1db8a9e00061266cfc67af7a0ae28",
+                    "hash" : "0xf356f55e90b79b2b441790436315fe7067f1db8a9e00061266cfc67af7a0ae28",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f356f55e90b79b2b441790436315fe7067f1db8a9e00061266cfc67af7a0ae28",
+                    "hash" : "0xf356f55e90b79b2b441790436315fe7067f1db8a9e00061266cfc67af7a0ae28",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "f356f55e90b79b2b441790436315fe7067f1db8a9e00061266cfc67af7a0ae28",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x0b7f00000000000000000000000000000000000000000000000000000000000000013c7f000000000000000000000000000000000000000000000000000000000000c350a345457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8287a3208c8c5a60005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "827973881"
+                "0x3159e0f9"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest314.json b/GeneralStateTests/stRandom/randomStatetest314.json
index 89a426cff..49431f993 100644
--- a/GeneralStateTests/stRandom/randomStatetest314.json
+++ b/GeneralStateTests/stRandom/randomStatetest314.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest314" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7337a9554ae9e50b923d014b1479e931a5c2bb6c8f4692bfb89025134da13c78",
+                    "hash" : "0x7337a9554ae9e50b923d014b1479e931a5c2bb6c8f4692bfb89025134da13c78",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7337a9554ae9e50b923d014b1479e931a5c2bb6c8f4692bfb89025134da13c78",
+                    "hash" : "0x7337a9554ae9e50b923d014b1479e931a5c2bb6c8f4692bfb89025134da13c78",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "7337a9554ae9e50b923d014b1479e931a5c2bb6c8f4692bfb89025134da13c78",
+                    "hash" : "0x7337a9554ae9e50b923d014b1479e931a5c2bb6c8f4692bfb89025134da13c78",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "7337a9554ae9e50b923d014b1479e931a5c2bb6c8f4692bfb89025134da13c78",
+                    "hash" : "0x7337a9554ae9e50b923d014b1479e931a5c2bb6c8f4692bfb89025134da13c78",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7337a9554ae9e50b923d014b1479e931a5c2bb6c8f4692bfb89025134da13c78",
+                    "hash" : "0x7337a9554ae9e50b923d014b1479e931a5c2bb6c8f4692bfb89025134da13c78",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "7337a9554ae9e50b923d014b1479e931a5c2bb6c8f4692bfb89025134da13c78",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x4542444041",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest315.json b/GeneralStateTests/stRandom/randomStatetest315.json
index b090033d0..010a372c1 100644
--- a/GeneralStateTests/stRandom/randomStatetest315.json
+++ b/GeneralStateTests/stRandom/randomStatetest315.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest315" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "db4d38464f224aa4beb174d0de026bf43446fcb69565268d160cb7cf1cc42488",
+                    "hash" : "0xdb4d38464f224aa4beb174d0de026bf43446fcb69565268d160cb7cf1cc42488",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "db4d38464f224aa4beb174d0de026bf43446fcb69565268d160cb7cf1cc42488",
+                    "hash" : "0xdb4d38464f224aa4beb174d0de026bf43446fcb69565268d160cb7cf1cc42488",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "db4d38464f224aa4beb174d0de026bf43446fcb69565268d160cb7cf1cc42488",
+                    "hash" : "0xdb4d38464f224aa4beb174d0de026bf43446fcb69565268d160cb7cf1cc42488",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "db4d38464f224aa4beb174d0de026bf43446fcb69565268d160cb7cf1cc42488",
+                    "hash" : "0xdb4d38464f224aa4beb174d0de026bf43446fcb69565268d160cb7cf1cc42488",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "db4d38464f224aa4beb174d0de026bf43446fcb69565268d160cb7cf1cc42488",
+                    "hash" : "0xdb4d38464f224aa4beb174d0de026bf43446fcb69565268d160cb7cf1cc42488",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "db4d38464f224aa4beb174d0de026bf43446fcb69565268d160cb7cf1cc42488",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff067f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f98516a388683755669892b8b3719575560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "332964958"
+                "0x13d8a45e"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest316.json b/GeneralStateTests/stRandom/randomStatetest316.json
index 61179e553..fbd567788 100644
--- a/GeneralStateTests/stRandom/randomStatetest316.json
+++ b/GeneralStateTests/stRandom/randomStatetest316.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest316" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f1c48b65e15db7f1f39198ef38cb09143e2605fc058343b3fe6e1cebe50b475f",
+                    "hash" : "0xf1c48b65e15db7f1f39198ef38cb09143e2605fc058343b3fe6e1cebe50b475f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f1c48b65e15db7f1f39198ef38cb09143e2605fc058343b3fe6e1cebe50b475f",
+                    "hash" : "0xf1c48b65e15db7f1f39198ef38cb09143e2605fc058343b3fe6e1cebe50b475f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f1c48b65e15db7f1f39198ef38cb09143e2605fc058343b3fe6e1cebe50b475f",
+                    "hash" : "0xf1c48b65e15db7f1f39198ef38cb09143e2605fc058343b3fe6e1cebe50b475f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f1c48b65e15db7f1f39198ef38cb09143e2605fc058343b3fe6e1cebe50b475f",
+                    "hash" : "0xf1c48b65e15db7f1f39198ef38cb09143e2605fc058343b3fe6e1cebe50b475f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f1c48b65e15db7f1f39198ef38cb09143e2605fc058343b3fe6e1cebe50b475f",
+                    "hash" : "0xf1c48b65e15db7f1f39198ef38cb09143e2605fc058343b3fe6e1cebe50b475f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "f1c48b65e15db7f1f39198ef38cb09143e2605fc058343b3fe6e1cebe50b475f",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0855",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "973933687"
+                "0x3a0d0c77"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest317.json b/GeneralStateTests/stRandom/randomStatetest317.json
index 83b5a1aab..836f29c1d 100644
--- a/GeneralStateTests/stRandom/randomStatetest317.json
+++ b/GeneralStateTests/stRandom/randomStatetest317.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest317" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "5b075ffffa6101dc17e8d958afc7fd21a23f561fd05ce80593438b4d08c73d7a",
+                    "hash" : "0x5b075ffffa6101dc17e8d958afc7fd21a23f561fd05ce80593438b4d08c73d7a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "5b075ffffa6101dc17e8d958afc7fd21a23f561fd05ce80593438b4d08c73d7a",
+                    "hash" : "0x5b075ffffa6101dc17e8d958afc7fd21a23f561fd05ce80593438b4d08c73d7a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "1b1421bd444bf0a73bbcb81f6737f29388c648ba3d1a7783cfb63023867b84b8",
+                    "hash" : "0x1b1421bd444bf0a73bbcb81f6737f29388c648ba3d1a7783cfb63023867b84b8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "1b1421bd444bf0a73bbcb81f6737f29388c648ba3d1a7783cfb63023867b84b8",
+                    "hash" : "0x1b1421bd444bf0a73bbcb81f6737f29388c648ba3d1a7783cfb63023867b84b8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "5b075ffffa6101dc17e8d958afc7fd21a23f561fd05ce80593438b4d08c73d7a",
+                    "hash" : "0x5b075ffffa6101dc17e8d958afc7fd21a23f561fd05ce80593438b4d08c73d7a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "1b1421bd444bf0a73bbcb81f6737f29388c648ba3d1a7783cfb63023867b84b8",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x42444545454042415a8554f355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest318.json b/GeneralStateTests/stRandom/randomStatetest318.json
index 5f91982b6..6cf8ba060 100644
--- a/GeneralStateTests/stRandom/randomStatetest318.json
+++ b/GeneralStateTests/stRandom/randomStatetest318.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest318" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "5e3a74f2c69f332d008779081b99e03c426e95a7ac6eca90a7cd4c4fb555acc1",
+                    "hash" : "0x5e3a74f2c69f332d008779081b99e03c426e95a7ac6eca90a7cd4c4fb555acc1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "5e3a74f2c69f332d008779081b99e03c426e95a7ac6eca90a7cd4c4fb555acc1",
+                    "hash" : "0x5e3a74f2c69f332d008779081b99e03c426e95a7ac6eca90a7cd4c4fb555acc1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5e3a74f2c69f332d008779081b99e03c426e95a7ac6eca90a7cd4c4fb555acc1",
+                    "hash" : "0x5e3a74f2c69f332d008779081b99e03c426e95a7ac6eca90a7cd4c4fb555acc1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5e3a74f2c69f332d008779081b99e03c426e95a7ac6eca90a7cd4c4fb555acc1",
+                    "hash" : "0x5e3a74f2c69f332d008779081b99e03c426e95a7ac6eca90a7cd4c4fb555acc1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "5e3a74f2c69f332d008779081b99e03c426e95a7ac6eca90a7cd4c4fb555acc1",
+                    "hash" : "0x5e3a74f2c69f332d008779081b99e03c426e95a7ac6eca90a7cd4c4fb555acc1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "5e3a74f2c69f332d008779081b99e03c426e95a7ac6eca90a7cd4c4fb555acc1",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350457f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3506f8206a30a83887e5a3164667796308d5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "603571959"
+                "0x23f9c6f7"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest319.json b/GeneralStateTests/stRandom/randomStatetest319.json
index 6bd3d2195..41d224133 100644
--- a/GeneralStateTests/stRandom/randomStatetest319.json
+++ b/GeneralStateTests/stRandom/randomStatetest319.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest319" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "27ff3393b4da66f1926221342ab2c79657b7f61b7f8a1f6f018f3f58d123c1a5",
+                    "hash" : "0x27ff3393b4da66f1926221342ab2c79657b7f61b7f8a1f6f018f3f58d123c1a5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "27ff3393b4da66f1926221342ab2c79657b7f61b7f8a1f6f018f3f58d123c1a5",
+                    "hash" : "0x27ff3393b4da66f1926221342ab2c79657b7f61b7f8a1f6f018f3f58d123c1a5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "27ff3393b4da66f1926221342ab2c79657b7f61b7f8a1f6f018f3f58d123c1a5",
+                    "hash" : "0x27ff3393b4da66f1926221342ab2c79657b7f61b7f8a1f6f018f3f58d123c1a5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "27ff3393b4da66f1926221342ab2c79657b7f61b7f8a1f6f018f3f58d123c1a5",
+                    "hash" : "0x27ff3393b4da66f1926221342ab2c79657b7f61b7f8a1f6f018f3f58d123c1a5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "27ff3393b4da66f1926221342ab2c79657b7f61b7f8a1f6f018f3f58d123c1a5",
+                    "hash" : "0x27ff3393b4da66f1926221342ab2c79657b7f61b7f8a1f6f018f3f58d123c1a5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "536740e0d4cd485ee0b740c8c69a63fb034c60279e38980b25f399e562310bca",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x44404243424142915a2055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest32.json b/GeneralStateTests/stRandom/randomStatetest32.json
index dc8ee34ba..d641acaaf 100644
--- a/GeneralStateTests/stRandom/randomStatetest32.json
+++ b/GeneralStateTests/stRandom/randomStatetest32.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest32" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6509e6133738f7498be6520c3c15e360f49b8b1fafb97bf2d13ff75638145143",
+                    "hash" : "0x6509e6133738f7498be6520c3c15e360f49b8b1fafb97bf2d13ff75638145143",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6509e6133738f7498be6520c3c15e360f49b8b1fafb97bf2d13ff75638145143",
+                    "hash" : "0x6509e6133738f7498be6520c3c15e360f49b8b1fafb97bf2d13ff75638145143",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6509e6133738f7498be6520c3c15e360f49b8b1fafb97bf2d13ff75638145143",
+                    "hash" : "0x6509e6133738f7498be6520c3c15e360f49b8b1fafb97bf2d13ff75638145143",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6509e6133738f7498be6520c3c15e360f49b8b1fafb97bf2d13ff75638145143",
+                    "hash" : "0x6509e6133738f7498be6520c3c15e360f49b8b1fafb97bf2d13ff75638145143",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6509e6133738f7498be6520c3c15e360f49b8b1fafb97bf2d13ff75638145143",
+                    "hash" : "0x6509e6133738f7498be6520c3c15e360f49b8b1fafb97bf2d13ff75638145143",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "deed71a9ae875d93a1014a7607dd2db227ed40a6a41a67d857f422e2e44e43af",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x434142433a424440f26f",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest320.json b/GeneralStateTests/stRandom/randomStatetest320.json
index 76ccbdfba..35b1d9ae7 100644
--- a/GeneralStateTests/stRandom/randomStatetest320.json
+++ b/GeneralStateTests/stRandom/randomStatetest320.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest320" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "17e529f47db8b8fde95c285b5de8f37cd8f8c94dd1ac48a1289b8791676b8558",
+                    "hash" : "0x17e529f47db8b8fde95c285b5de8f37cd8f8c94dd1ac48a1289b8791676b8558",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "17e529f47db8b8fde95c285b5de8f37cd8f8c94dd1ac48a1289b8791676b8558",
+                    "hash" : "0x17e529f47db8b8fde95c285b5de8f37cd8f8c94dd1ac48a1289b8791676b8558",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "17e529f47db8b8fde95c285b5de8f37cd8f8c94dd1ac48a1289b8791676b8558",
+                    "hash" : "0x17e529f47db8b8fde95c285b5de8f37cd8f8c94dd1ac48a1289b8791676b8558",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "17e529f47db8b8fde95c285b5de8f37cd8f8c94dd1ac48a1289b8791676b8558",
+                    "hash" : "0x17e529f47db8b8fde95c285b5de8f37cd8f8c94dd1ac48a1289b8791676b8558",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "17e529f47db8b8fde95c285b5de8f37cd8f8c94dd1ac48a1289b8791676b8558",
+                    "hash" : "0x17e529f47db8b8fde95c285b5de8f37cd8f8c94dd1ac48a1289b8791676b8558",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "17e529f47db8b8fde95c285b5de8f37cd8f8c94dd1ac48a1289b8791676b8558",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff45457f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3505b0a36095511805131558f14fc3b",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "831662408"
+                "0x31922948"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest321.json b/GeneralStateTests/stRandom/randomStatetest321.json
index d203f1fb9..d9834ba19 100644
--- a/GeneralStateTests/stRandom/randomStatetest321.json
+++ b/GeneralStateTests/stRandom/randomStatetest321.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest321" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "8b9afa9dee2fef920f0d9e0933aedd94cf3a1ad0dff782835db49ea498d4ed51",
+                    "hash" : "0x8b9afa9dee2fef920f0d9e0933aedd94cf3a1ad0dff782835db49ea498d4ed51",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "8b9afa9dee2fef920f0d9e0933aedd94cf3a1ad0dff782835db49ea498d4ed51",
+                    "hash" : "0x8b9afa9dee2fef920f0d9e0933aedd94cf3a1ad0dff782835db49ea498d4ed51",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "8b9afa9dee2fef920f0d9e0933aedd94cf3a1ad0dff782835db49ea498d4ed51",
+                    "hash" : "0x8b9afa9dee2fef920f0d9e0933aedd94cf3a1ad0dff782835db49ea498d4ed51",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "8b9afa9dee2fef920f0d9e0933aedd94cf3a1ad0dff782835db49ea498d4ed51",
+                    "hash" : "0x8b9afa9dee2fef920f0d9e0933aedd94cf3a1ad0dff782835db49ea498d4ed51",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "8b9afa9dee2fef920f0d9e0933aedd94cf3a1ad0dff782835db49ea498d4ed51",
+                    "hash" : "0x8b9afa9dee2fef920f0d9e0933aedd94cf3a1ad0dff782835db49ea498d4ed51",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "8b9afa9dee2fef920f0d9e0933aedd94cf3a1ad0dff782835db49ea498d4ed51",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000006a7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff033a06869867986202413a537c60005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1664390209"
+                "0x63349441"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest322.json b/GeneralStateTests/stRandom/randomStatetest322.json
index 4b6f5747b..bab267696 100644
--- a/GeneralStateTests/stRandom/randomStatetest322.json
+++ b/GeneralStateTests/stRandom/randomStatetest322.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest322" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f96efd0bceca361d62ea9e417ba953e1d508ea984f778bc72e68a702104c74fe",
+                    "hash" : "0xf96efd0bceca361d62ea9e417ba953e1d508ea984f778bc72e68a702104c74fe",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f96efd0bceca361d62ea9e417ba953e1d508ea984f778bc72e68a702104c74fe",
+                    "hash" : "0xf96efd0bceca361d62ea9e417ba953e1d508ea984f778bc72e68a702104c74fe",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f96efd0bceca361d62ea9e417ba953e1d508ea984f778bc72e68a702104c74fe",
+                    "hash" : "0xf96efd0bceca361d62ea9e417ba953e1d508ea984f778bc72e68a702104c74fe",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f96efd0bceca361d62ea9e417ba953e1d508ea984f778bc72e68a702104c74fe",
+                    "hash" : "0xf96efd0bceca361d62ea9e417ba953e1d508ea984f778bc72e68a702104c74fe",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f96efd0bceca361d62ea9e417ba953e1d508ea984f778bc72e68a702104c74fe",
+                    "hash" : "0xf96efd0bceca361d62ea9e417ba953e1d508ea984f778bc72e68a702104c74fe",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "f96efd0bceca361d62ea9e417ba953e1d508ea984f778bc72e68a702104c74fe",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000427f000000000000000000000000000000000000000000000000000000000000c3506f1206060508840294304101a3128f345560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "824326372"
+                "0x312238e4"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest323.json b/GeneralStateTests/stRandom/randomStatetest323.json
index 83c1dee10..0b93ec53c 100644
--- a/GeneralStateTests/stRandom/randomStatetest323.json
+++ b/GeneralStateTests/stRandom/randomStatetest323.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest323" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "90d9ee4c28bc9fc8ce533dc87f1ed0349c3ea302c5b37bd3f354ca4d30dd9c25",
+                    "hash" : "0x90d9ee4c28bc9fc8ce533dc87f1ed0349c3ea302c5b37bd3f354ca4d30dd9c25",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "90d9ee4c28bc9fc8ce533dc87f1ed0349c3ea302c5b37bd3f354ca4d30dd9c25",
+                    "hash" : "0x90d9ee4c28bc9fc8ce533dc87f1ed0349c3ea302c5b37bd3f354ca4d30dd9c25",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "90d9ee4c28bc9fc8ce533dc87f1ed0349c3ea302c5b37bd3f354ca4d30dd9c25",
+                    "hash" : "0x90d9ee4c28bc9fc8ce533dc87f1ed0349c3ea302c5b37bd3f354ca4d30dd9c25",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "90d9ee4c28bc9fc8ce533dc87f1ed0349c3ea302c5b37bd3f354ca4d30dd9c25",
+                    "hash" : "0x90d9ee4c28bc9fc8ce533dc87f1ed0349c3ea302c5b37bd3f354ca4d30dd9c25",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "90d9ee4c28bc9fc8ce533dc87f1ed0349c3ea302c5b37bd3f354ca4d30dd9c25",
+                    "hash" : "0x90d9ee4c28bc9fc8ce533dc87f1ed0349c3ea302c5b37bd3f354ca4d30dd9c25",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "90d9ee4c28bc9fc8ce533dc87f1ed0349c3ea302c5b37bd3f354ca4d30dd9c25",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x6f7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe74977f000000000000000000000000000000000000000000000000000000000000c3506f6b7936181136392060005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1955628831"
+                "0x7490871f"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest324.json b/GeneralStateTests/stRandom/randomStatetest324.json
index b370d0e4b..3aa5ca17b 100644
--- a/GeneralStateTests/stRandom/randomStatetest324.json
+++ b/GeneralStateTests/stRandom/randomStatetest324.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest324" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
             {
@@ -30,7 +30,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b23cb1bd12609cf57740af880e3dc41c847ae72f8270aced0e614e6b8fe7118f",
+                    "hash" : "0xb23cb1bd12609cf57740af880e3dc41c847ae72f8270aced0e614e6b8fe7118f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -40,7 +40,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b23cb1bd12609cf57740af880e3dc41c847ae72f8270aced0e614e6b8fe7118f",
+                    "hash" : "0xb23cb1bd12609cf57740af880e3dc41c847ae72f8270aced0e614e6b8fe7118f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -50,7 +50,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b23cb1bd12609cf57740af880e3dc41c847ae72f8270aced0e614e6b8fe7118f",
+                    "hash" : "0xb23cb1bd12609cf57740af880e3dc41c847ae72f8270aced0e614e6b8fe7118f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -60,7 +60,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b23cb1bd12609cf57740af880e3dc41c847ae72f8270aced0e614e6b8fe7118f",
+                    "hash" : "0xb23cb1bd12609cf57740af880e3dc41c847ae72f8270aced0e614e6b8fe7118f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -70,7 +70,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b23cb1bd12609cf57740af880e3dc41c847ae72f8270aced0e614e6b8fe7118f",
+                    "hash" : "0xb23cb1bd12609cf57740af880e3dc41c847ae72f8270aced0e614e6b8fe7118f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -81,23 +81,23 @@
         },
         "postStateRoot" : "b23cb1bd12609cf57740af880e3dc41c847ae72f8270aced0e614e6b8fe7118f",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff827ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000000000000000000000000001457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff620a445643a20543a055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -112,10 +112,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1211446051"
+                "0x48353323"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest325.json b/GeneralStateTests/stRandom/randomStatetest325.json
index b4d94b058..e87865899 100644
--- a/GeneralStateTests/stRandom/randomStatetest325.json
+++ b/GeneralStateTests/stRandom/randomStatetest325.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest325" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "93c9e3449282448434ac64d26445a4cb91cba6fbe46f300bb30a2c7f14194520",
+                    "hash" : "0x93c9e3449282448434ac64d26445a4cb91cba6fbe46f300bb30a2c7f14194520",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "93c9e3449282448434ac64d26445a4cb91cba6fbe46f300bb30a2c7f14194520",
+                    "hash" : "0x93c9e3449282448434ac64d26445a4cb91cba6fbe46f300bb30a2c7f14194520",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "93c9e3449282448434ac64d26445a4cb91cba6fbe46f300bb30a2c7f14194520",
+                    "hash" : "0x93c9e3449282448434ac64d26445a4cb91cba6fbe46f300bb30a2c7f14194520",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "93c9e3449282448434ac64d26445a4cb91cba6fbe46f300bb30a2c7f14194520",
+                    "hash" : "0x93c9e3449282448434ac64d26445a4cb91cba6fbe46f300bb30a2c7f14194520",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "93c9e3449282448434ac64d26445a4cb91cba6fbe46f300bb30a2c7f14194520",
+                    "hash" : "0x93c9e3449282448434ac64d26445a4cb91cba6fbe46f300bb30a2c7f14194520",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "febf3fa4bfd6ab1ec17e35f05d75d9d7b3266b2aa871b993aba8b570261a8e79",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x437fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff427fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe81090360005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "457480517"
+                "0x1b449945"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest326.json b/GeneralStateTests/stRandom/randomStatetest326.json
index e52019e12..f97ee0ea5 100644
--- a/GeneralStateTests/stRandom/randomStatetest326.json
+++ b/GeneralStateTests/stRandom/randomStatetest326.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest326" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
             {
@@ -22,7 +22,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d1525021b99d833333eff698fe8865b01cf5d958b8aa38474797634098dd13e2",
+                    "hash" : "0xd1525021b99d833333eff698fe8865b01cf5d958b8aa38474797634098dd13e2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -32,7 +32,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d1525021b99d833333eff698fe8865b01cf5d958b8aa38474797634098dd13e2",
+                    "hash" : "0xd1525021b99d833333eff698fe8865b01cf5d958b8aa38474797634098dd13e2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -42,7 +42,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "d1525021b99d833333eff698fe8865b01cf5d958b8aa38474797634098dd13e2",
+                    "hash" : "0xd1525021b99d833333eff698fe8865b01cf5d958b8aa38474797634098dd13e2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -52,7 +52,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "d1525021b99d833333eff698fe8865b01cf5d958b8aa38474797634098dd13e2",
+                    "hash" : "0xd1525021b99d833333eff698fe8865b01cf5d958b8aa38474797634098dd13e2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,7 +62,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d1525021b99d833333eff698fe8865b01cf5d958b8aa38474797634098dd13e2",
+                    "hash" : "0xd1525021b99d833333eff698fe8865b01cf5d958b8aa38474797634098dd13e2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -73,23 +73,23 @@
         },
         "postStateRoot" : "634fc8a01590172b79cba0ea677dd15e0c634dc950a9e7a4199148cd6cd749a8",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000000034577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000426259cb6142a1196e3168c986758aa4",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -104,10 +104,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1579124913"
+                "0x5e1f88b1"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest327.json b/GeneralStateTests/stRandom/randomStatetest327.json
index a52ba657e..b6ae73519 100644
--- a/GeneralStateTests/stRandom/randomStatetest327.json
+++ b/GeneralStateTests/stRandom/randomStatetest327.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest327" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "40072f5f137ca3604e5904d1da01778435aa9f16af53721046d822b5b1def18c",
+                    "hash" : "0x40072f5f137ca3604e5904d1da01778435aa9f16af53721046d822b5b1def18c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "40072f5f137ca3604e5904d1da01778435aa9f16af53721046d822b5b1def18c",
+                    "hash" : "0x40072f5f137ca3604e5904d1da01778435aa9f16af53721046d822b5b1def18c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "40072f5f137ca3604e5904d1da01778435aa9f16af53721046d822b5b1def18c",
+                    "hash" : "0x40072f5f137ca3604e5904d1da01778435aa9f16af53721046d822b5b1def18c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "40072f5f137ca3604e5904d1da01778435aa9f16af53721046d822b5b1def18c",
+                    "hash" : "0x40072f5f137ca3604e5904d1da01778435aa9f16af53721046d822b5b1def18c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "40072f5f137ca3604e5904d1da01778435aa9f16af53721046d822b5b1def18c",
+                    "hash" : "0x40072f5f137ca3604e5904d1da01778435aa9f16af53721046d822b5b1def18c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "40072f5f137ca3604e5904d1da01778435aa9f16af53721046d822b5b1def18c",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001458b5554397513",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "592296179"
+                "0x234db8f3"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest328.json b/GeneralStateTests/stRandom/randomStatetest328.json
index 4994db3c1..5ca4d3004 100644
--- a/GeneralStateTests/stRandom/randomStatetest328.json
+++ b/GeneralStateTests/stRandom/randomStatetest328.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest328" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "bf233aae0ba21e414ccbe30c56e008db2d8121b6cb471faa323f9512b5ec75a1",
+                    "hash" : "0xbf233aae0ba21e414ccbe30c56e008db2d8121b6cb471faa323f9512b5ec75a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "bf233aae0ba21e414ccbe30c56e008db2d8121b6cb471faa323f9512b5ec75a1",
+                    "hash" : "0xbf233aae0ba21e414ccbe30c56e008db2d8121b6cb471faa323f9512b5ec75a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "bf233aae0ba21e414ccbe30c56e008db2d8121b6cb471faa323f9512b5ec75a1",
+                    "hash" : "0xbf233aae0ba21e414ccbe30c56e008db2d8121b6cb471faa323f9512b5ec75a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "bf233aae0ba21e414ccbe30c56e008db2d8121b6cb471faa323f9512b5ec75a1",
+                    "hash" : "0xbf233aae0ba21e414ccbe30c56e008db2d8121b6cb471faa323f9512b5ec75a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "bf233aae0ba21e414ccbe30c56e008db2d8121b6cb471faa323f9512b5ec75a1",
+                    "hash" : "0xbf233aae0ba21e414ccbe30c56e008db2d8121b6cb471faa323f9512b5ec75a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "9f71ffb0ecc7f579f2e35ed2a6c8549d4eaf8cf5d8ea33616b420b38dca392ea",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x454555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest329.json b/GeneralStateTests/stRandom/randomStatetest329.json
index eba58086a..c3ada8a9c 100644
--- a/GeneralStateTests/stRandom/randomStatetest329.json
+++ b/GeneralStateTests/stRandom/randomStatetest329.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest329" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "ba24808b036c7fffa5bbfe602b0b447891cbe7e72c1816646a84aacfb90a8eaf",
+                    "hash" : "0xba24808b036c7fffa5bbfe602b0b447891cbe7e72c1816646a84aacfb90a8eaf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "ba24808b036c7fffa5bbfe602b0b447891cbe7e72c1816646a84aacfb90a8eaf",
+                    "hash" : "0xba24808b036c7fffa5bbfe602b0b447891cbe7e72c1816646a84aacfb90a8eaf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "ba24808b036c7fffa5bbfe602b0b447891cbe7e72c1816646a84aacfb90a8eaf",
+                    "hash" : "0xba24808b036c7fffa5bbfe602b0b447891cbe7e72c1816646a84aacfb90a8eaf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ba24808b036c7fffa5bbfe602b0b447891cbe7e72c1816646a84aacfb90a8eaf",
+                    "hash" : "0xba24808b036c7fffa5bbfe602b0b447891cbe7e72c1816646a84aacfb90a8eaf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "ba24808b036c7fffa5bbfe602b0b447891cbe7e72c1816646a84aacfb90a8eaf",
+                    "hash" : "0xba24808b036c7fffa5bbfe602b0b447891cbe7e72c1816646a84aacfb90a8eaf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "ba24808b036c7fffa5bbfe602b0b447891cbe7e72c1816646a84aacfb90a8eaf",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff426fa48d775458574133769c8b750207ff5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1532627820"
+                "0x5b5a0b6c"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest33.json b/GeneralStateTests/stRandom/randomStatetest33.json
index 29201da7d..7c3fa8054 100644
--- a/GeneralStateTests/stRandom/randomStatetest33.json
+++ b/GeneralStateTests/stRandom/randomStatetest33.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest33" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "be61561c4782eec71c48082dd0ec23efdf0a875e99835724300bab2969e96dad",
+                    "hash" : "0xbe61561c4782eec71c48082dd0ec23efdf0a875e99835724300bab2969e96dad",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "be61561c4782eec71c48082dd0ec23efdf0a875e99835724300bab2969e96dad",
+                    "hash" : "0xbe61561c4782eec71c48082dd0ec23efdf0a875e99835724300bab2969e96dad",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "be61561c4782eec71c48082dd0ec23efdf0a875e99835724300bab2969e96dad",
+                    "hash" : "0xbe61561c4782eec71c48082dd0ec23efdf0a875e99835724300bab2969e96dad",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "be61561c4782eec71c48082dd0ec23efdf0a875e99835724300bab2969e96dad",
+                    "hash" : "0xbe61561c4782eec71c48082dd0ec23efdf0a875e99835724300bab2969e96dad",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "be61561c4782eec71c48082dd0ec23efdf0a875e99835724300bab2969e96dad",
+                    "hash" : "0xbe61561c4782eec71c48082dd0ec23efdf0a875e99835724300bab2969e96dad",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "be61561c4782eec71c48082dd0ec23efdf0a875e99835724300bab2969e96dad",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000015a7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3506f6940566279386017a362876372698f5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "123424954"
+                "0x075b50ba"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest330.json b/GeneralStateTests/stRandom/randomStatetest330.json
index 13d3b5988..5adffa97c 100644
--- a/GeneralStateTests/stRandom/randomStatetest330.json
+++ b/GeneralStateTests/stRandom/randomStatetest330.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest330" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "89080c123d6b918d81d77443a96aadc776d56cf33f4e0d8b6eb56c4541689e30",
+                    "hash" : "0x89080c123d6b918d81d77443a96aadc776d56cf33f4e0d8b6eb56c4541689e30",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "89080c123d6b918d81d77443a96aadc776d56cf33f4e0d8b6eb56c4541689e30",
+                    "hash" : "0x89080c123d6b918d81d77443a96aadc776d56cf33f4e0d8b6eb56c4541689e30",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a02666cd1e8ecbdc5a953ccab2d4c9a74a159d2b425cb3845fd0f81223702bd7",
+                    "hash" : "0xa02666cd1e8ecbdc5a953ccab2d4c9a74a159d2b425cb3845fd0f81223702bd7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a02666cd1e8ecbdc5a953ccab2d4c9a74a159d2b425cb3845fd0f81223702bd7",
+                    "hash" : "0xa02666cd1e8ecbdc5a953ccab2d4c9a74a159d2b425cb3845fd0f81223702bd7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "89080c123d6b918d81d77443a96aadc776d56cf33f4e0d8b6eb56c4541689e30",
+                    "hash" : "0x89080c123d6b918d81d77443a96aadc776d56cf33f4e0d8b6eb56c4541689e30",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "a02666cd1e8ecbdc5a953ccab2d4c9a74a159d2b425cb3845fd0f81223702bd7",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f0000000000000000000000000000000000000000000000000000000000000001547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f3235543787103c923b41a1f08805115560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "690163138"
+                "0x29230dc2"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest331.json b/GeneralStateTests/stRandom/randomStatetest331.json
index 17f3d8588..ccc2a1ddb 100644
--- a/GeneralStateTests/stRandom/randomStatetest331.json
+++ b/GeneralStateTests/stRandom/randomStatetest331.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest331" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "3fbc90ad45682cfdf10f6cb421424559772b218a0452b1646c029634670b2cfa",
+                    "hash" : "0x3fbc90ad45682cfdf10f6cb421424559772b218a0452b1646c029634670b2cfa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "3fbc90ad45682cfdf10f6cb421424559772b218a0452b1646c029634670b2cfa",
+                    "hash" : "0x3fbc90ad45682cfdf10f6cb421424559772b218a0452b1646c029634670b2cfa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3fbc90ad45682cfdf10f6cb421424559772b218a0452b1646c029634670b2cfa",
+                    "hash" : "0x3fbc90ad45682cfdf10f6cb421424559772b218a0452b1646c029634670b2cfa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3fbc90ad45682cfdf10f6cb421424559772b218a0452b1646c029634670b2cfa",
+                    "hash" : "0x3fbc90ad45682cfdf10f6cb421424559772b218a0452b1646c029634670b2cfa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "3fbc90ad45682cfdf10f6cb421424559772b218a0452b1646c029634670b2cfa",
+                    "hash" : "0x3fbc90ad45682cfdf10f6cb421424559772b218a0452b1646c029634670b2cfa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "8142eea848215059272c6f827e23f5c2975fa53c8b128e91eb84fdbe876394ec",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5067f0000000000000000000000000000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c350427f00000000000000000000000000000000000000000000000000000000000000013a0960005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1472986584"
+                "0x57cbfdd8"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest332.json b/GeneralStateTests/stRandom/randomStatetest332.json
index eaa41483b..0d6ccbf18 100644
--- a/GeneralStateTests/stRandom/randomStatetest332.json
+++ b/GeneralStateTests/stRandom/randomStatetest332.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest332" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7d8e23833eb211e6a0bdcbe2040548de8ac0b00e66477a7ef78a71deb86f7262",
+                    "hash" : "0x7d8e23833eb211e6a0bdcbe2040548de8ac0b00e66477a7ef78a71deb86f7262",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7d8e23833eb211e6a0bdcbe2040548de8ac0b00e66477a7ef78a71deb86f7262",
+                    "hash" : "0x7d8e23833eb211e6a0bdcbe2040548de8ac0b00e66477a7ef78a71deb86f7262",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "7d8e23833eb211e6a0bdcbe2040548de8ac0b00e66477a7ef78a71deb86f7262",
+                    "hash" : "0x7d8e23833eb211e6a0bdcbe2040548de8ac0b00e66477a7ef78a71deb86f7262",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "7d8e23833eb211e6a0bdcbe2040548de8ac0b00e66477a7ef78a71deb86f7262",
+                    "hash" : "0x7d8e23833eb211e6a0bdcbe2040548de8ac0b00e66477a7ef78a71deb86f7262",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7d8e23833eb211e6a0bdcbe2040548de8ac0b00e66477a7ef78a71deb86f7262",
+                    "hash" : "0x7d8e23833eb211e6a0bdcbe2040548de8ac0b00e66477a7ef78a71deb86f7262",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "7d8e23833eb211e6a0bdcbe2040548de8ac0b00e66477a7ef78a71deb86f7262",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3506f7c098e7d625a64319d9e514bf350755560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1406473566"
+                "0x53d5155e"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest333.json b/GeneralStateTests/stRandom/randomStatetest333.json
index b296d7a4c..673e15517 100644
--- a/GeneralStateTests/stRandom/randomStatetest333.json
+++ b/GeneralStateTests/stRandom/randomStatetest333.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest333" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "60489e46827521cf4c909ff09a9fede078f86cc88735470c4268449dc49999f3",
+                    "hash" : "0x60489e46827521cf4c909ff09a9fede078f86cc88735470c4268449dc49999f3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "60489e46827521cf4c909ff09a9fede078f86cc88735470c4268449dc49999f3",
+                    "hash" : "0x60489e46827521cf4c909ff09a9fede078f86cc88735470c4268449dc49999f3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "60489e46827521cf4c909ff09a9fede078f86cc88735470c4268449dc49999f3",
+                    "hash" : "0x60489e46827521cf4c909ff09a9fede078f86cc88735470c4268449dc49999f3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "60489e46827521cf4c909ff09a9fede078f86cc88735470c4268449dc49999f3",
+                    "hash" : "0x60489e46827521cf4c909ff09a9fede078f86cc88735470c4268449dc49999f3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "60489e46827521cf4c909ff09a9fede078f86cc88735470c4268449dc49999f3",
+                    "hash" : "0x60489e46827521cf4c909ff09a9fede078f86cc88735470c4268449dc49999f3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "60489e46827521cf4c909ff09a9fede078f86cc88735470c4268449dc49999f3",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f410263f305963310856c15ff5037a05560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "807710883"
+                "0x3024b0a3"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest334.json b/GeneralStateTests/stRandom/randomStatetest334.json
index dc2382a3e..7fb8ac480 100644
--- a/GeneralStateTests/stRandom/randomStatetest334.json
+++ b/GeneralStateTests/stRandom/randomStatetest334.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest334" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "692ee43c37d50785a626face4e9e32d33f3f2c98c4d90c79f88cb814e5f09c91",
+                    "hash" : "0x692ee43c37d50785a626face4e9e32d33f3f2c98c4d90c79f88cb814e5f09c91",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "692ee43c37d50785a626face4e9e32d33f3f2c98c4d90c79f88cb814e5f09c91",
+                    "hash" : "0x692ee43c37d50785a626face4e9e32d33f3f2c98c4d90c79f88cb814e5f09c91",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "692ee43c37d50785a626face4e9e32d33f3f2c98c4d90c79f88cb814e5f09c91",
+                    "hash" : "0x692ee43c37d50785a626face4e9e32d33f3f2c98c4d90c79f88cb814e5f09c91",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "692ee43c37d50785a626face4e9e32d33f3f2c98c4d90c79f88cb814e5f09c91",
+                    "hash" : "0x692ee43c37d50785a626face4e9e32d33f3f2c98c4d90c79f88cb814e5f09c91",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "692ee43c37d50785a626face4e9e32d33f3f2c98c4d90c79f88cb814e5f09c91",
+                    "hash" : "0x692ee43c37d50785a626face4e9e32d33f3f2c98c4d90c79f88cb814e5f09c91",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "692ee43c37d50785a626face4e9e32d33f3f2c98c4d90c79f88cb814e5f09c91",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000013a7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f424468208e181851308b7c7a776863a160005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "916012823"
+                "0x36993f17"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest335.json b/GeneralStateTests/stRandom/randomStatetest335.json
index bb3c263d8..c2387587c 100644
--- a/GeneralStateTests/stRandom/randomStatetest335.json
+++ b/GeneralStateTests/stRandom/randomStatetest335.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest335" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7a8213cd835a09716c205b55f6e6246197ac00db46791920e570f4c45d9fd804",
+                    "hash" : "0x7a8213cd835a09716c205b55f6e6246197ac00db46791920e570f4c45d9fd804",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7a8213cd835a09716c205b55f6e6246197ac00db46791920e570f4c45d9fd804",
+                    "hash" : "0x7a8213cd835a09716c205b55f6e6246197ac00db46791920e570f4c45d9fd804",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "7a8213cd835a09716c205b55f6e6246197ac00db46791920e570f4c45d9fd804",
+                    "hash" : "0x7a8213cd835a09716c205b55f6e6246197ac00db46791920e570f4c45d9fd804",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "7a8213cd835a09716c205b55f6e6246197ac00db46791920e570f4c45d9fd804",
+                    "hash" : "0x7a8213cd835a09716c205b55f6e6246197ac00db46791920e570f4c45d9fd804",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7a8213cd835a09716c205b55f6e6246197ac00db46791920e570f4c45d9fd804",
+                    "hash" : "0x7a8213cd835a09716c205b55f6e6246197ac00db46791920e570f4c45d9fd804",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "7a8213cd835a09716c205b55f6e6246197ac00db46791920e570f4c45d9fd804",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350617e7608617c95f3ff584076e07b5a4460005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1650737351"
+                "0x626440c7"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest336.json b/GeneralStateTests/stRandom/randomStatetest336.json
index e4379b905..7b52ee1f3 100644
--- a/GeneralStateTests/stRandom/randomStatetest336.json
+++ b/GeneralStateTests/stRandom/randomStatetest336.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest336" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "aa312e8af562a43ee46639e96f6f855af216025e0dc4880be8cc848baed36bd1",
+                    "hash" : "0xaa312e8af562a43ee46639e96f6f855af216025e0dc4880be8cc848baed36bd1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "aa312e8af562a43ee46639e96f6f855af216025e0dc4880be8cc848baed36bd1",
+                    "hash" : "0xaa312e8af562a43ee46639e96f6f855af216025e0dc4880be8cc848baed36bd1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "aa312e8af562a43ee46639e96f6f855af216025e0dc4880be8cc848baed36bd1",
+                    "hash" : "0xaa312e8af562a43ee46639e96f6f855af216025e0dc4880be8cc848baed36bd1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "aa312e8af562a43ee46639e96f6f855af216025e0dc4880be8cc848baed36bd1",
+                    "hash" : "0xaa312e8af562a43ee46639e96f6f855af216025e0dc4880be8cc848baed36bd1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "aa312e8af562a43ee46639e96f6f855af216025e0dc4880be8cc848baed36bd1",
+                    "hash" : "0xaa312e8af562a43ee46639e96f6f855af216025e0dc4880be8cc848baed36bd1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "7c1c9d5ac72e2eb95fda2d9dd311ab95fcd3edab06bff04c5282460c030a691e",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x41443442f34241",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest337.json b/GeneralStateTests/stRandom/randomStatetest337.json
index e33900cd3..9de22dd63 100644
--- a/GeneralStateTests/stRandom/randomStatetest337.json
+++ b/GeneralStateTests/stRandom/randomStatetest337.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest337" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a5e94cc93d41d4d39cdebda112600410dd3dae8761245e03250101aa878201e6",
+                    "hash" : "0xa5e94cc93d41d4d39cdebda112600410dd3dae8761245e03250101aa878201e6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a5e94cc93d41d4d39cdebda112600410dd3dae8761245e03250101aa878201e6",
+                    "hash" : "0xa5e94cc93d41d4d39cdebda112600410dd3dae8761245e03250101aa878201e6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a5e94cc93d41d4d39cdebda112600410dd3dae8761245e03250101aa878201e6",
+                    "hash" : "0xa5e94cc93d41d4d39cdebda112600410dd3dae8761245e03250101aa878201e6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a5e94cc93d41d4d39cdebda112600410dd3dae8761245e03250101aa878201e6",
+                    "hash" : "0xa5e94cc93d41d4d39cdebda112600410dd3dae8761245e03250101aa878201e6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a5e94cc93d41d4d39cdebda112600410dd3dae8761245e03250101aa878201e6",
+                    "hash" : "0xa5e94cc93d41d4d39cdebda112600410dd3dae8761245e03250101aa878201e6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "a5e94cc93d41d4d39cdebda112600410dd3dae8761245e03250101aa878201e6",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350670b9af27e9a6468a15560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,8 +96,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x13da3c95"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest338.json b/GeneralStateTests/stRandom/randomStatetest338.json
index 610006825..8c4237af4 100644
--- a/GeneralStateTests/stRandom/randomStatetest338.json
+++ b/GeneralStateTests/stRandom/randomStatetest338.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest338" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "4faca28a1daa6dc61bfaea6f3a3fb48c826e3c804ce715936f5ecdbbce0db149",
+                    "hash" : "0x4faca28a1daa6dc61bfaea6f3a3fb48c826e3c804ce715936f5ecdbbce0db149",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "4faca28a1daa6dc61bfaea6f3a3fb48c826e3c804ce715936f5ecdbbce0db149",
+                    "hash" : "0x4faca28a1daa6dc61bfaea6f3a3fb48c826e3c804ce715936f5ecdbbce0db149",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4faca28a1daa6dc61bfaea6f3a3fb48c826e3c804ce715936f5ecdbbce0db149",
+                    "hash" : "0x4faca28a1daa6dc61bfaea6f3a3fb48c826e3c804ce715936f5ecdbbce0db149",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4faca28a1daa6dc61bfaea6f3a3fb48c826e3c804ce715936f5ecdbbce0db149",
+                    "hash" : "0x4faca28a1daa6dc61bfaea6f3a3fb48c826e3c804ce715936f5ecdbbce0db149",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "4faca28a1daa6dc61bfaea6f3a3fb48c826e3c804ce715936f5ecdbbce0db149",
+                    "hash" : "0x4faca28a1daa6dc61bfaea6f3a3fb48c826e3c804ce715936f5ecdbbce0db149",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "4faca28a1daa6dc61bfaea6f3a3fb48c826e3c804ce715936f5ecdbbce0db149",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff677a9df32e6851606c0119065560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1766886327"
+                "0x69508bb7"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest339.json b/GeneralStateTests/stRandom/randomStatetest339.json
index 4bc9bdcb2..6c0ca9c85 100644
--- a/GeneralStateTests/stRandom/randomStatetest339.json
+++ b/GeneralStateTests/stRandom/randomStatetest339.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest339" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "81a6fa4386b4b2fb06bbf539895ffe6ac9637029111c3e64d21c854736a0214d",
+                    "hash" : "0x81a6fa4386b4b2fb06bbf539895ffe6ac9637029111c3e64d21c854736a0214d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "81a6fa4386b4b2fb06bbf539895ffe6ac9637029111c3e64d21c854736a0214d",
+                    "hash" : "0x81a6fa4386b4b2fb06bbf539895ffe6ac9637029111c3e64d21c854736a0214d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "81a6fa4386b4b2fb06bbf539895ffe6ac9637029111c3e64d21c854736a0214d",
+                    "hash" : "0x81a6fa4386b4b2fb06bbf539895ffe6ac9637029111c3e64d21c854736a0214d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "81a6fa4386b4b2fb06bbf539895ffe6ac9637029111c3e64d21c854736a0214d",
+                    "hash" : "0x81a6fa4386b4b2fb06bbf539895ffe6ac9637029111c3e64d21c854736a0214d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "81a6fa4386b4b2fb06bbf539895ffe6ac9637029111c3e64d21c854736a0214d",
+                    "hash" : "0x81a6fa4386b4b2fb06bbf539895ffe6ac9637029111c3e64d21c854736a0214d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "81a6fa4386b4b2fb06bbf539895ffe6ac9637029111c3e64d21c854736a0214d",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3506f89029e850708a293905668f1a367a25560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1064880298"
+                "0x3f78c8aa"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest34.json b/GeneralStateTests/stRandom/randomStatetest34.json
index b238047f1..c7de654ae 100644
--- a/GeneralStateTests/stRandom/randomStatetest34.json
+++ b/GeneralStateTests/stRandom/randomStatetest34.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest34" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "06f53b4863ca112f38c25d45510e83a46b6ead8f7be32ef2afa662a4e034b6a9",
+                    "hash" : "0x06f53b4863ca112f38c25d45510e83a46b6ead8f7be32ef2afa662a4e034b6a9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "06f53b4863ca112f38c25d45510e83a46b6ead8f7be32ef2afa662a4e034b6a9",
+                    "hash" : "0x06f53b4863ca112f38c25d45510e83a46b6ead8f7be32ef2afa662a4e034b6a9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "06f53b4863ca112f38c25d45510e83a46b6ead8f7be32ef2afa662a4e034b6a9",
+                    "hash" : "0x06f53b4863ca112f38c25d45510e83a46b6ead8f7be32ef2afa662a4e034b6a9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "06f53b4863ca112f38c25d45510e83a46b6ead8f7be32ef2afa662a4e034b6a9",
+                    "hash" : "0x06f53b4863ca112f38c25d45510e83a46b6ead8f7be32ef2afa662a4e034b6a9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "06f53b4863ca112f38c25d45510e83a46b6ead8f7be32ef2afa662a4e034b6a9",
+                    "hash" : "0x06f53b4863ca112f38c25d45510e83a46b6ead8f7be32ef2afa662a4e034b6a9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "e849c13375436c9ac4e672396bae5886701cafb5c065aeaeb4e6c9555c2d5b0a",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x444140404242420555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest340.json b/GeneralStateTests/stRandom/randomStatetest340.json
index 7d4898991..da8da3ba3 100644
--- a/GeneralStateTests/stRandom/randomStatetest340.json
+++ b/GeneralStateTests/stRandom/randomStatetest340.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest340" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "56574351ad61caec1e1807367985ae0bea6c55716655a5ab9001f42c43adc3be",
+                    "hash" : "0x56574351ad61caec1e1807367985ae0bea6c55716655a5ab9001f42c43adc3be",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "56574351ad61caec1e1807367985ae0bea6c55716655a5ab9001f42c43adc3be",
+                    "hash" : "0x56574351ad61caec1e1807367985ae0bea6c55716655a5ab9001f42c43adc3be",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "86465463ac9e7721217b38c4dd8be6860943d3c52dc56325e5d9f05422ced540",
+                    "hash" : "0x86465463ac9e7721217b38c4dd8be6860943d3c52dc56325e5d9f05422ced540",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "86465463ac9e7721217b38c4dd8be6860943d3c52dc56325e5d9f05422ced540",
+                    "hash" : "0x86465463ac9e7721217b38c4dd8be6860943d3c52dc56325e5d9f05422ced540",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "56574351ad61caec1e1807367985ae0bea6c55716655a5ab9001f42c43adc3be",
+                    "hash" : "0x56574351ad61caec1e1807367985ae0bea6c55716655a5ab9001f42c43adc3be",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "86465463ac9e7721217b38c4dd8be6860943d3c52dc56325e5d9f05422ced540",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff095560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "39040167"
+                "0x0253b4a7"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest341.json b/GeneralStateTests/stRandom/randomStatetest341.json
index 24d68b025..5523ab51d 100644
--- a/GeneralStateTests/stRandom/randomStatetest341.json
+++ b/GeneralStateTests/stRandom/randomStatetest341.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest341" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "23bb4bd52c3e5cc3fee02d368f964f87b150387d4ef54939fa02bb001dd359d1",
+                    "hash" : "0x23bb4bd52c3e5cc3fee02d368f964f87b150387d4ef54939fa02bb001dd359d1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "23bb4bd52c3e5cc3fee02d368f964f87b150387d4ef54939fa02bb001dd359d1",
+                    "hash" : "0x23bb4bd52c3e5cc3fee02d368f964f87b150387d4ef54939fa02bb001dd359d1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "23bb4bd52c3e5cc3fee02d368f964f87b150387d4ef54939fa02bb001dd359d1",
+                    "hash" : "0x23bb4bd52c3e5cc3fee02d368f964f87b150387d4ef54939fa02bb001dd359d1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "23bb4bd52c3e5cc3fee02d368f964f87b150387d4ef54939fa02bb001dd359d1",
+                    "hash" : "0x23bb4bd52c3e5cc3fee02d368f964f87b150387d4ef54939fa02bb001dd359d1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "23bb4bd52c3e5cc3fee02d368f964f87b150387d4ef54939fa02bb001dd359d1",
+                    "hash" : "0x23bb4bd52c3e5cc3fee02d368f964f87b150387d4ef54939fa02bb001dd359d1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "23bb4bd52c3e5cc3fee02d368f964f87b150387d4ef54939fa02bb001dd359d1",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x427f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff583481f36a85646d53671639175b940860005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1485632"
+                "0x16ab40"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest342.json b/GeneralStateTests/stRandom/randomStatetest342.json
index d9aea1875..9c2beb133 100644
--- a/GeneralStateTests/stRandom/randomStatetest342.json
+++ b/GeneralStateTests/stRandom/randomStatetest342.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest342" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "8ba9cb2564717367ec0adf4ed75a2b783becfdd7cae2863ceeca35c612e8bfb0",
+                    "hash" : "0x8ba9cb2564717367ec0adf4ed75a2b783becfdd7cae2863ceeca35c612e8bfb0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "8ba9cb2564717367ec0adf4ed75a2b783becfdd7cae2863ceeca35c612e8bfb0",
+                    "hash" : "0x8ba9cb2564717367ec0adf4ed75a2b783becfdd7cae2863ceeca35c612e8bfb0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "8ba9cb2564717367ec0adf4ed75a2b783becfdd7cae2863ceeca35c612e8bfb0",
+                    "hash" : "0x8ba9cb2564717367ec0adf4ed75a2b783becfdd7cae2863ceeca35c612e8bfb0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "8ba9cb2564717367ec0adf4ed75a2b783becfdd7cae2863ceeca35c612e8bfb0",
+                    "hash" : "0x8ba9cb2564717367ec0adf4ed75a2b783becfdd7cae2863ceeca35c612e8bfb0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "8ba9cb2564717367ec0adf4ed75a2b783becfdd7cae2863ceeca35c612e8bfb0",
+                    "hash" : "0x8ba9cb2564717367ec0adf4ed75a2b783becfdd7cae2863ceeca35c612e8bfb0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "8ba9cb2564717367ec0adf4ed75a2b783becfdd7cae2863ceeca35c612e8bfb0",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000000041147fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f36314297399455797b42569e8f05565560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1662167236"
+                "0x6312a8c4"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest343.json b/GeneralStateTests/stRandom/randomStatetest343.json
index 6d4f36c0b..6af5a70b9 100644
--- a/GeneralStateTests/stRandom/randomStatetest343.json
+++ b/GeneralStateTests/stRandom/randomStatetest343.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest343" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "2a923bf935832273c37697eb9ea40a83dec794bd869ee5ca433072825a40c51d",
+                    "hash" : "0x2a923bf935832273c37697eb9ea40a83dec794bd869ee5ca433072825a40c51d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "2a923bf935832273c37697eb9ea40a83dec794bd869ee5ca433072825a40c51d",
+                    "hash" : "0x2a923bf935832273c37697eb9ea40a83dec794bd869ee5ca433072825a40c51d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2a923bf935832273c37697eb9ea40a83dec794bd869ee5ca433072825a40c51d",
+                    "hash" : "0x2a923bf935832273c37697eb9ea40a83dec794bd869ee5ca433072825a40c51d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "2a923bf935832273c37697eb9ea40a83dec794bd869ee5ca433072825a40c51d",
+                    "hash" : "0x2a923bf935832273c37697eb9ea40a83dec794bd869ee5ca433072825a40c51d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "2a923bf935832273c37697eb9ea40a83dec794bd869ee5ca433072825a40c51d",
+                    "hash" : "0x2a923bf935832273c37697eb9ea40a83dec794bd869ee5ca433072825a40c51d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "2a923bf935832273c37697eb9ea40a83dec794bd869ee5ca433072825a40c51d",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff1110103741355560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1301366640"
+                "0x4d914770"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest344.json b/GeneralStateTests/stRandom/randomStatetest344.json
index 6db3ee662..95b08728e 100644
--- a/GeneralStateTests/stRandom/randomStatetest344.json
+++ b/GeneralStateTests/stRandom/randomStatetest344.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest344" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "407b92f4a16694f40453f515a46cfb8c77020176938eb48103a0ae4441538907",
+                    "hash" : "0x407b92f4a16694f40453f515a46cfb8c77020176938eb48103a0ae4441538907",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "407b92f4a16694f40453f515a46cfb8c77020176938eb48103a0ae4441538907",
+                    "hash" : "0x407b92f4a16694f40453f515a46cfb8c77020176938eb48103a0ae4441538907",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "787f5453eded31c3e4e21cb18bb35e0ee98b37f5f79733bb34d7ac0786af6184",
+                    "hash" : "0x787f5453eded31c3e4e21cb18bb35e0ee98b37f5f79733bb34d7ac0786af6184",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "787f5453eded31c3e4e21cb18bb35e0ee98b37f5f79733bb34d7ac0786af6184",
+                    "hash" : "0x787f5453eded31c3e4e21cb18bb35e0ee98b37f5f79733bb34d7ac0786af6184",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "407b92f4a16694f40453f515a46cfb8c77020176938eb48103a0ae4441538907",
+                    "hash" : "0x407b92f4a16694f40453f515a46cfb8c77020176938eb48103a0ae4441538907",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "787f5453eded31c3e4e21cb18bb35e0ee98b37f5f79733bb34d7ac0786af6184",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe33405a417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8509ffda551a076d60005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "811058531"
+                "0x3057c563"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest345.json b/GeneralStateTests/stRandom/randomStatetest345.json
index fc6a00523..0d150e32f 100644
--- a/GeneralStateTests/stRandom/randomStatetest345.json
+++ b/GeneralStateTests/stRandom/randomStatetest345.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest345" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "41030abc2268083d35d279f5af56866707f9de5dac0d0e5e56aa002fa5dc6ed0",
+                    "hash" : "0x41030abc2268083d35d279f5af56866707f9de5dac0d0e5e56aa002fa5dc6ed0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "41030abc2268083d35d279f5af56866707f9de5dac0d0e5e56aa002fa5dc6ed0",
+                    "hash" : "0x41030abc2268083d35d279f5af56866707f9de5dac0d0e5e56aa002fa5dc6ed0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "41030abc2268083d35d279f5af56866707f9de5dac0d0e5e56aa002fa5dc6ed0",
+                    "hash" : "0x41030abc2268083d35d279f5af56866707f9de5dac0d0e5e56aa002fa5dc6ed0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "41030abc2268083d35d279f5af56866707f9de5dac0d0e5e56aa002fa5dc6ed0",
+                    "hash" : "0x41030abc2268083d35d279f5af56866707f9de5dac0d0e5e56aa002fa5dc6ed0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "41030abc2268083d35d279f5af56866707f9de5dac0d0e5e56aa002fa5dc6ed0",
+                    "hash" : "0x41030abc2268083d35d279f5af56866707f9de5dac0d0e5e56aa002fa5dc6ed0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "41030abc2268083d35d279f5af56866707f9de5dac0d0e5e56aa002fa5dc6ed0",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x417f0000000000000000000000000000000000000000000000000000000000000001447fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000000035420b417f056699168fa16d8d94113b60005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "12028215"
+                "0xb78937"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest346.json b/GeneralStateTests/stRandom/randomStatetest346.json
index 3d1539aee..ee3816617 100644
--- a/GeneralStateTests/stRandom/randomStatetest346.json
+++ b/GeneralStateTests/stRandom/randomStatetest346.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest346" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "924a5e7f101f3386932c643c3331290422a36abf918ef1b5c0369ed5bfd5e250",
+                    "hash" : "0x924a5e7f101f3386932c643c3331290422a36abf918ef1b5c0369ed5bfd5e250",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "924a5e7f101f3386932c643c3331290422a36abf918ef1b5c0369ed5bfd5e250",
+                    "hash" : "0x924a5e7f101f3386932c643c3331290422a36abf918ef1b5c0369ed5bfd5e250",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "924a5e7f101f3386932c643c3331290422a36abf918ef1b5c0369ed5bfd5e250",
+                    "hash" : "0x924a5e7f101f3386932c643c3331290422a36abf918ef1b5c0369ed5bfd5e250",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "924a5e7f101f3386932c643c3331290422a36abf918ef1b5c0369ed5bfd5e250",
+                    "hash" : "0x924a5e7f101f3386932c643c3331290422a36abf918ef1b5c0369ed5bfd5e250",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "924a5e7f101f3386932c643c3331290422a36abf918ef1b5c0369ed5bfd5e250",
+                    "hash" : "0x924a5e7f101f3386932c643c3331290422a36abf918ef1b5c0369ed5bfd5e250",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "924a5e7f101f3386932c643c3331290422a36abf918ef1b5c0369ed5bfd5e250",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe095560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "87977970"
+                "0x053e6ff2"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest347.json b/GeneralStateTests/stRandom/randomStatetest347.json
index eb738c311..efa62cc31 100644
--- a/GeneralStateTests/stRandom/randomStatetest347.json
+++ b/GeneralStateTests/stRandom/randomStatetest347.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest347" : {
         "env" : {
-            "currentCoinbase" : "a7f7c8ef9bbbcfb0f7e81c1fd46bb732fba60592",
+            "currentCoinbase" : "0xa7f7c8ef9bbbcfb0f7e81c1fd46bb732fba60592",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0b3be1fc",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "f3907ec3d962d22b61d2618054c8252a7fe67b65f652a7b8fcc55cfe905a1caa"
+            "previousHash" : "0xf3907ec3d962d22b61d2618054c8252a7fe67b65f652a7b8fcc55cfe905a1caa"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "5a9d4e3d21fb0dee07e0b52772b46dff8b513f0d4fba4765c43096a97e8b088f",
+                    "hash" : "0x5a9d4e3d21fb0dee07e0b52772b46dff8b513f0d4fba4765c43096a97e8b088f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "5a9d4e3d21fb0dee07e0b52772b46dff8b513f0d4fba4765c43096a97e8b088f",
+                    "hash" : "0x5a9d4e3d21fb0dee07e0b52772b46dff8b513f0d4fba4765c43096a97e8b088f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5a9d4e3d21fb0dee07e0b52772b46dff8b513f0d4fba4765c43096a97e8b088f",
+                    "hash" : "0x5a9d4e3d21fb0dee07e0b52772b46dff8b513f0d4fba4765c43096a97e8b088f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5a9d4e3d21fb0dee07e0b52772b46dff8b513f0d4fba4765c43096a97e8b088f",
+                    "hash" : "0x5a9d4e3d21fb0dee07e0b52772b46dff8b513f0d4fba4765c43096a97e8b088f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "5a9d4e3d21fb0dee07e0b52772b46dff8b513f0d4fba4765c43096a97e8b088f",
+                    "hash" : "0x5a9d4e3d21fb0dee07e0b52772b46dff8b513f0d4fba4765c43096a97e8b088f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "5a9d4e3d21fb0dee07e0b52772b46dff8b513f0d4fba4765c43096a97e8b088f",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x33498455",
                 "code" : "0x64d552603c577e9a3805d8c55157a82b7660ef2a049cfbf79c15fa8e3261f121d213590fa3917d7d442a5e8734af2aaa4c859b452eed7860c2f7e051580427b6c3cc6d7fee617a0d64ef63e192256de5d2ea2689decfd971c7478effb06aa9e792747ce0492abde8c2f270e93d5ed0b213fed7ae59294537d4864c0e68bbe30ec5d1e6b854027862cfcbea15e8367dfaa080ee0da2b0d2ca892f5a764354370466ccddd03115ec8a7ad2e6c62c29425a45ec842fb74c369fb15a42e4b4e48b3eb70be2a0847469987980e6eaa539365a491d2366334f78f03acb177809e7525add39a234d3d2ef1cf8544a52389411ef846d3cd7f36d0d1db7f414860020171f07598cfb620e15a9681c843d60aee9fb8a4e7e37713afbf6ef9d1667513975c76f26ac35ce209b1e0a3bb7c19821368931537b4095ea42b32baf1ba596b9af5cce961ae705f8c9c5465e349633529871f64351169e7fe48ccbb866952fabbfcf40df723c564e109dbd4c9c15ee9ad625e96a5765f6f56ee0601677961da7ebad5f583f6eb6da7c8348425fe784f532f288963ccdbf9de3ac3ebc38b75a806b40e51b895c662d0bcab255a04b723f1e500517d17eb720e02f445cb046bd0fe7d2759438c79aa2dfcaef1cf57e4eb9c832f7ef449a9c32f673728f4b0dccdfa8fb1d447e2f681076ac51a98f76600a66b4692ca7e1e9c89f64cdf879cb0c625514977ebca28f2ec8bb3a092bd0c30849558fe16a4b7070cb05aec329c0286c26fff57795ce4ac7601160ea2d6656c8f2a554b43e263cc3a60e9fd0a26c0a5f7202f02888a731e84ab326610c77771f85025eb8c552943d2da5de48786015f5b8b5921d26c1e277d5a4cda5f1f77ec5f3a83e6ed6821ff025370e2fad05a0f364f58f3705c8761904d63e0f2e5bdbe2b0b1ddf82bb441c547634e8c1864737333e845ffa373c102303f727bfa14f4c445711f6f9695c36f3627df02a1fe2d7eca55faed6984000ab2a99545148bbe7369a47367bc24256acd6a3a22d5fb32434b1998297ae6b2edf08b72dc4598aa600e16707699a84e55ef611ea0e6da482f6c6e9d05d54bbb4ad06cd62622e469fbcd3e637a8f0d2ac9149b7076cce991cb5d4b4de1229e3decbcf46a3c7e46aa1fdc218d936e56f55b5a38bbd798361040e1badb1ab06adc38a723badfa07a95f78553de4df879855274a1904a31276d7938818021e69d8f5b9279478808a236deefd761df6bc151fded80bbe4ba725e7db7b9fc507f0b8121a009384c7bc4443747bd1ac9dc7682b32bec0937c7fb27ba3926acd0d67b41ba6c951788f1bb1b1168229d15cafdc63209c95df646566024013d766a01d6b8051c357243c9f464f423a2ae8efa4f9efd95777099eac9b0825d18018a5afcb6cecd9ab9a9655ae262db08a271d8adedbc3e7eb6acfd2d576ec297c09c4bd47a80dacd2b123e4e4e6232ef6d70acb10f2f44a62bbcef65a72576506ea119b051880b515f4414920badcd6f726c04e821516f6123c9c52f29e19bfe0fb10fab76536535cc0e01115c83369d4083db2d669654c2fe8c00e37bd78f663a2ce2425d2ce358e213d6c601208bb644fa656678de7633147fbd152c2ae682dec269245f07ba3c79f4e6e1978d40f42a494d44eba128b9d0228d637900cbab73455423156417fae331d26494d1ed4d06ecf206736f04292d5470d5091c48a80ba737372c35729c829af30db3625785ba0b3cfc4240d002276760f2770ead609b52db934a53063ec1c05488188fb37ce61059909b6c975c0e9401ef3b71b6d0ddae39867f3f0878bd172851a98a233fcafae289fc634c36c8b3064926d92deda3d8c5074d6a56daa511e7e693aab3d4347cebdd5b63238acdeedc3d8eb8f69ea18cb429ee8f09c26845507ba28eba916c74fd62cd9e587a8f013122d93579b6b7da091527251a4b70051be4f0f96f61e5dc4ab713c473174c7e2ebb463615b03c4787b74e8c204975399439fa553838f186ae028a47f3ccd46c5fcc46c11a36219f3ba1d34def7bee989fa61e60a2abd3652df9f8e5a1b53d9608e3bb04f5e852333d9c7d761836ef5761178bd07fde9a0ded16e1659a6c80281c259ce42e3fdbe23664ce783b58d595",
                 "nonce" : "0xe9",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x4ea91708",
                 "code" : "0x36",
                 "nonce" : "0x59",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x24d289465fa51769",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,8 +96,8 @@
             ],
             "gasPrice" : "0x1d",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x7f3e3a6ac8834e68"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest348.json b/GeneralStateTests/stRandom/randomStatetest348.json
index eb7cd0e02..656e201f2 100644
--- a/GeneralStateTests/stRandom/randomStatetest348.json
+++ b/GeneralStateTests/stRandom/randomStatetest348.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest348" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f03f885cc5015524110b50cab094959d5b36d4fd2b976ea400b11147203d4ca5",
+                    "hash" : "0xf03f885cc5015524110b50cab094959d5b36d4fd2b976ea400b11147203d4ca5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f03f885cc5015524110b50cab094959d5b36d4fd2b976ea400b11147203d4ca5",
+                    "hash" : "0xf03f885cc5015524110b50cab094959d5b36d4fd2b976ea400b11147203d4ca5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f03f885cc5015524110b50cab094959d5b36d4fd2b976ea400b11147203d4ca5",
+                    "hash" : "0xf03f885cc5015524110b50cab094959d5b36d4fd2b976ea400b11147203d4ca5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f03f885cc5015524110b50cab094959d5b36d4fd2b976ea400b11147203d4ca5",
+                    "hash" : "0xf03f885cc5015524110b50cab094959d5b36d4fd2b976ea400b11147203d4ca5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f03f885cc5015524110b50cab094959d5b36d4fd2b976ea400b11147203d4ca5",
+                    "hash" : "0xf03f885cc5015524110b50cab094959d5b36d4fd2b976ea400b11147203d4ca5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "f03f885cc5015524110b50cab094959d5b36d4fd2b976ea400b11147203d4ca5",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000000142186f18208119191509036365739735608a5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1329276634"
+                "0x4f3b26da"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest349.json b/GeneralStateTests/stRandom/randomStatetest349.json
index 05a804fcd..3b8e30050 100644
--- a/GeneralStateTests/stRandom/randomStatetest349.json
+++ b/GeneralStateTests/stRandom/randomStatetest349.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest349" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d01ed77aa603cb9cfc4891db29cc20911a6744682934708fc7860ab32b08ffb7",
+                    "hash" : "0xd01ed77aa603cb9cfc4891db29cc20911a6744682934708fc7860ab32b08ffb7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d01ed77aa603cb9cfc4891db29cc20911a6744682934708fc7860ab32b08ffb7",
+                    "hash" : "0xd01ed77aa603cb9cfc4891db29cc20911a6744682934708fc7860ab32b08ffb7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "d01ed77aa603cb9cfc4891db29cc20911a6744682934708fc7860ab32b08ffb7",
+                    "hash" : "0xd01ed77aa603cb9cfc4891db29cc20911a6744682934708fc7860ab32b08ffb7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "d01ed77aa603cb9cfc4891db29cc20911a6744682934708fc7860ab32b08ffb7",
+                    "hash" : "0xd01ed77aa603cb9cfc4891db29cc20911a6744682934708fc7860ab32b08ffb7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d01ed77aa603cb9cfc4891db29cc20911a6744682934708fc7860ab32b08ffb7",
+                    "hash" : "0xd01ed77aa603cb9cfc4891db29cc20911a6744682934708fc7860ab32b08ffb7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "30e07e827a096cc8846875dab7eec843f721a20310ce7805b456905d912069e4",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe04425560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "201035010"
+                "0x0bfb8d02"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest35.json b/GeneralStateTests/stRandom/randomStatetest35.json
index 5774f6f05..5e609fd07 100644
--- a/GeneralStateTests/stRandom/randomStatetest35.json
+++ b/GeneralStateTests/stRandom/randomStatetest35.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest35" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "834f026717d1df35e8b8488dcc0b619a535c8259237c063f76accad20c440e65",
+                    "hash" : "0x834f026717d1df35e8b8488dcc0b619a535c8259237c063f76accad20c440e65",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "834f026717d1df35e8b8488dcc0b619a535c8259237c063f76accad20c440e65",
+                    "hash" : "0x834f026717d1df35e8b8488dcc0b619a535c8259237c063f76accad20c440e65",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "29a63d6abfc8563fbd56ccbdc03e1e69740d2f6d49c0fb6e1313d1a37c4607b9",
+                    "hash" : "0x29a63d6abfc8563fbd56ccbdc03e1e69740d2f6d49c0fb6e1313d1a37c4607b9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "29a63d6abfc8563fbd56ccbdc03e1e69740d2f6d49c0fb6e1313d1a37c4607b9",
+                    "hash" : "0x29a63d6abfc8563fbd56ccbdc03e1e69740d2f6d49c0fb6e1313d1a37c4607b9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "834f026717d1df35e8b8488dcc0b619a535c8259237c063f76accad20c440e65",
+                    "hash" : "0x834f026717d1df35e8b8488dcc0b619a535c8259237c063f76accad20c440e65",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "95dc37aa6c9d9530584d4df89fb5cac892380d98bbeeb9bfbca158f06cdc75a0",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x42414040384145413155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest350.json b/GeneralStateTests/stRandom/randomStatetest350.json
index 193c708c4..8df19d675 100644
--- a/GeneralStateTests/stRandom/randomStatetest350.json
+++ b/GeneralStateTests/stRandom/randomStatetest350.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest350" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "ed008f7db4edd4cf23fc05b5e11c37807c4b6a095e8d03e2aba1cfb563d6cb5c",
+                    "hash" : "0xed008f7db4edd4cf23fc05b5e11c37807c4b6a095e8d03e2aba1cfb563d6cb5c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "ed008f7db4edd4cf23fc05b5e11c37807c4b6a095e8d03e2aba1cfb563d6cb5c",
+                    "hash" : "0xed008f7db4edd4cf23fc05b5e11c37807c4b6a095e8d03e2aba1cfb563d6cb5c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "ed008f7db4edd4cf23fc05b5e11c37807c4b6a095e8d03e2aba1cfb563d6cb5c",
+                    "hash" : "0xed008f7db4edd4cf23fc05b5e11c37807c4b6a095e8d03e2aba1cfb563d6cb5c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ed008f7db4edd4cf23fc05b5e11c37807c4b6a095e8d03e2aba1cfb563d6cb5c",
+                    "hash" : "0xed008f7db4edd4cf23fc05b5e11c37807c4b6a095e8d03e2aba1cfb563d6cb5c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "ed008f7db4edd4cf23fc05b5e11c37807c4b6a095e8d03e2aba1cfb563d6cb5c",
+                    "hash" : "0xed008f7db4edd4cf23fc05b5e11c37807c4b6a095e8d03e2aba1cfb563d6cb5c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "2ae422c5b7af24120662cddeb53bc00653f480f67dac0eb9e3884422e628d680",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe447f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff090860005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1634268072"
+                "0x6168f3a8"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest351.json b/GeneralStateTests/stRandom/randomStatetest351.json
index 22b78f750..fd0399905 100644
--- a/GeneralStateTests/stRandom/randomStatetest351.json
+++ b/GeneralStateTests/stRandom/randomStatetest351.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest351" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "0c2e50f8220752943e32a4547b8bbf85fe688df309ec21a7a7118246b8c8b0cc",
+                    "hash" : "0x0c2e50f8220752943e32a4547b8bbf85fe688df309ec21a7a7118246b8c8b0cc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "0c2e50f8220752943e32a4547b8bbf85fe688df309ec21a7a7118246b8c8b0cc",
+                    "hash" : "0x0c2e50f8220752943e32a4547b8bbf85fe688df309ec21a7a7118246b8c8b0cc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "0c2e50f8220752943e32a4547b8bbf85fe688df309ec21a7a7118246b8c8b0cc",
+                    "hash" : "0x0c2e50f8220752943e32a4547b8bbf85fe688df309ec21a7a7118246b8c8b0cc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "0c2e50f8220752943e32a4547b8bbf85fe688df309ec21a7a7118246b8c8b0cc",
+                    "hash" : "0x0c2e50f8220752943e32a4547b8bbf85fe688df309ec21a7a7118246b8c8b0cc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0c2e50f8220752943e32a4547b8bbf85fe688df309ec21a7a7118246b8c8b0cc",
+                    "hash" : "0x0c2e50f8220752943e32a4547b8bbf85fe688df309ec21a7a7118246b8c8b0cc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "0c2e50f8220752943e32a4547b8bbf85fe688df309ec21a7a7118246b8c8b0cc",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0509355534707785320175fca41455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1215186094"
+                "0x486e44ae"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest352.json b/GeneralStateTests/stRandom/randomStatetest352.json
index 3d7c85ba2..37176f2b1 100644
--- a/GeneralStateTests/stRandom/randomStatetest352.json
+++ b/GeneralStateTests/stRandom/randomStatetest352.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest352" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "8c2f569f43a35beb2ec39814565061fa8a58760b6a8cbd8912dd3af6392add3e",
+                    "hash" : "0x8c2f569f43a35beb2ec39814565061fa8a58760b6a8cbd8912dd3af6392add3e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "8c2f569f43a35beb2ec39814565061fa8a58760b6a8cbd8912dd3af6392add3e",
+                    "hash" : "0x8c2f569f43a35beb2ec39814565061fa8a58760b6a8cbd8912dd3af6392add3e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "8c2f569f43a35beb2ec39814565061fa8a58760b6a8cbd8912dd3af6392add3e",
+                    "hash" : "0x8c2f569f43a35beb2ec39814565061fa8a58760b6a8cbd8912dd3af6392add3e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "8c2f569f43a35beb2ec39814565061fa8a58760b6a8cbd8912dd3af6392add3e",
+                    "hash" : "0x8c2f569f43a35beb2ec39814565061fa8a58760b6a8cbd8912dd3af6392add3e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "8c2f569f43a35beb2ec39814565061fa8a58760b6a8cbd8912dd3af6392add3e",
+                    "hash" : "0x8c2f569f43a35beb2ec39814565061fa8a58760b6a8cbd8912dd3af6392add3e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "8c2f569f43a35beb2ec39814565061fa8a58760b6a8cbd8912dd3af6392add3e",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000003a457f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b513428284f28a980b4539a39d1408",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,8 +96,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x014eb9ae"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest353.json b/GeneralStateTests/stRandom/randomStatetest353.json
index db40cbf22..595c13f6e 100644
--- a/GeneralStateTests/stRandom/randomStatetest353.json
+++ b/GeneralStateTests/stRandom/randomStatetest353.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest353" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "ee237a377144cd7fd095bbd85d5f0ae3a12f83ccf41c488a3233504bea606830",
+                    "hash" : "0xee237a377144cd7fd095bbd85d5f0ae3a12f83ccf41c488a3233504bea606830",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "ee237a377144cd7fd095bbd85d5f0ae3a12f83ccf41c488a3233504bea606830",
+                    "hash" : "0xee237a377144cd7fd095bbd85d5f0ae3a12f83ccf41c488a3233504bea606830",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "ee237a377144cd7fd095bbd85d5f0ae3a12f83ccf41c488a3233504bea606830",
+                    "hash" : "0xee237a377144cd7fd095bbd85d5f0ae3a12f83ccf41c488a3233504bea606830",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ee237a377144cd7fd095bbd85d5f0ae3a12f83ccf41c488a3233504bea606830",
+                    "hash" : "0xee237a377144cd7fd095bbd85d5f0ae3a12f83ccf41c488a3233504bea606830",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "ee237a377144cd7fd095bbd85d5f0ae3a12f83ccf41c488a3233504bea606830",
+                    "hash" : "0xee237a377144cd7fd095bbd85d5f0ae3a12f83ccf41c488a3233504bea606830",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "ee237a377144cd7fd095bbd85d5f0ae3a12f83ccf41c488a3233504bea606830",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000120ba49036880f86529655",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1727538107"
+                "0x66f823bb"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest354.json b/GeneralStateTests/stRandom/randomStatetest354.json
index 712d035a0..3648951a8 100644
--- a/GeneralStateTests/stRandom/randomStatetest354.json
+++ b/GeneralStateTests/stRandom/randomStatetest354.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest354" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9418f698c97fb817187a1cffdeeaa09adf507af56704ab55bd5c61c5bf36af74",
+                    "hash" : "0x9418f698c97fb817187a1cffdeeaa09adf507af56704ab55bd5c61c5bf36af74",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b6e1a256d3f62864b4dcde61bc71e59e4e4cc1a4255700e9bffcbecdd252d2d2",
+                    "hash" : "0xb6e1a256d3f62864b4dcde61bc71e59e4e4cc1a4255700e9bffcbecdd252d2d2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9418f698c97fb817187a1cffdeeaa09adf507af56704ab55bd5c61c5bf36af74",
+                    "hash" : "0x9418f698c97fb817187a1cffdeeaa09adf507af56704ab55bd5c61c5bf36af74",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9418f698c97fb817187a1cffdeeaa09adf507af56704ab55bd5c61c5bf36af74",
+                    "hash" : "0x9418f698c97fb817187a1cffdeeaa09adf507af56704ab55bd5c61c5bf36af74",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b6e1a256d3f62864b4dcde61bc71e59e4e4cc1a4255700e9bffcbecdd252d2d2",
+                    "hash" : "0xb6e1a256d3f62864b4dcde61bc71e59e4e4cc1a4255700e9bffcbecdd252d2d2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "3b8727cf51e118d986d166ae64b3178986f88f5c1d505eefb1f6fbd94345f6cf",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c350603b35641a8e739f86980a433760005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "615164662"
+                "0x24aaaaf6"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest355.json b/GeneralStateTests/stRandom/randomStatetest355.json
index c487b5ad9..3bcfc62cf 100644
--- a/GeneralStateTests/stRandom/randomStatetest355.json
+++ b/GeneralStateTests/stRandom/randomStatetest355.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest355" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "2fb3e00745e030bc746636fd0ec453ba1694911050dccf7ed5f469a66aefc9c2",
+                    "hash" : "0x2fb3e00745e030bc746636fd0ec453ba1694911050dccf7ed5f469a66aefc9c2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "2fb3e00745e030bc746636fd0ec453ba1694911050dccf7ed5f469a66aefc9c2",
+                    "hash" : "0x2fb3e00745e030bc746636fd0ec453ba1694911050dccf7ed5f469a66aefc9c2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2fb3e00745e030bc746636fd0ec453ba1694911050dccf7ed5f469a66aefc9c2",
+                    "hash" : "0x2fb3e00745e030bc746636fd0ec453ba1694911050dccf7ed5f469a66aefc9c2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "2fb3e00745e030bc746636fd0ec453ba1694911050dccf7ed5f469a66aefc9c2",
+                    "hash" : "0x2fb3e00745e030bc746636fd0ec453ba1694911050dccf7ed5f469a66aefc9c2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "2fb3e00745e030bc746636fd0ec453ba1694911050dccf7ed5f469a66aefc9c2",
+                    "hash" : "0x2fb3e00745e030bc746636fd0ec453ba1694911050dccf7ed5f469a66aefc9c2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "2fb3e00745e030bc746636fd0ec453ba1694911050dccf7ed5f469a66aefc9c2",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5457f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001666b56e87c5a499d5389306e55",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,8 +96,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x275009c5"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest356.json b/GeneralStateTests/stRandom/randomStatetest356.json
index dad326af3..20af3334b 100644
--- a/GeneralStateTests/stRandom/randomStatetest356.json
+++ b/GeneralStateTests/stRandom/randomStatetest356.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest356" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1e03ab60b025cf4ece45d2ca7f0167775e559a1627c72446c12e994a47045cfc",
+                    "hash" : "0x1e03ab60b025cf4ece45d2ca7f0167775e559a1627c72446c12e994a47045cfc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "1e03ab60b025cf4ece45d2ca7f0167775e559a1627c72446c12e994a47045cfc",
+                    "hash" : "0x1e03ab60b025cf4ece45d2ca7f0167775e559a1627c72446c12e994a47045cfc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "1e03ab60b025cf4ece45d2ca7f0167775e559a1627c72446c12e994a47045cfc",
+                    "hash" : "0x1e03ab60b025cf4ece45d2ca7f0167775e559a1627c72446c12e994a47045cfc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "1e03ab60b025cf4ece45d2ca7f0167775e559a1627c72446c12e994a47045cfc",
+                    "hash" : "0x1e03ab60b025cf4ece45d2ca7f0167775e559a1627c72446c12e994a47045cfc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "1e03ab60b025cf4ece45d2ca7f0167775e559a1627c72446c12e994a47045cfc",
+                    "hash" : "0x1e03ab60b025cf4ece45d2ca7f0167775e559a1627c72446c12e994a47045cfc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "1e03ab60b025cf4ece45d2ca7f0167775e559a1627c72446c12e994a47045cfc",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5827f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0460005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1329095939"
+                "0x4f386503"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest357.json b/GeneralStateTests/stRandom/randomStatetest357.json
index 5eea75f22..8c367da5c 100644
--- a/GeneralStateTests/stRandom/randomStatetest357.json
+++ b/GeneralStateTests/stRandom/randomStatetest357.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest357" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1e6ddf7a13360a0a1ee898d25585424542066e047b385bb5931cbef48a3133ec",
+                    "hash" : "0x1e6ddf7a13360a0a1ee898d25585424542066e047b385bb5931cbef48a3133ec",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "1e6ddf7a13360a0a1ee898d25585424542066e047b385bb5931cbef48a3133ec",
+                    "hash" : "0x1e6ddf7a13360a0a1ee898d25585424542066e047b385bb5931cbef48a3133ec",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "1e6ddf7a13360a0a1ee898d25585424542066e047b385bb5931cbef48a3133ec",
+                    "hash" : "0x1e6ddf7a13360a0a1ee898d25585424542066e047b385bb5931cbef48a3133ec",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "1e6ddf7a13360a0a1ee898d25585424542066e047b385bb5931cbef48a3133ec",
+                    "hash" : "0x1e6ddf7a13360a0a1ee898d25585424542066e047b385bb5931cbef48a3133ec",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "1e6ddf7a13360a0a1ee898d25585424542066e047b385bb5931cbef48a3133ec",
+                    "hash" : "0x1e6ddf7a13360a0a1ee898d25585424542066e047b385bb5931cbef48a3133ec",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "1e6ddf7a13360a0a1ee898d25585424542066e047b385bb5931cbef48a3133ec",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350427fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff09377c5380715560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1516457170"
+                "0x5a634cd2"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest358.json b/GeneralStateTests/stRandom/randomStatetest358.json
index 2917fce24..592939064 100644
--- a/GeneralStateTests/stRandom/randomStatetest358.json
+++ b/GeneralStateTests/stRandom/randomStatetest358.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest358" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "fb5c9fab7bac372b8af05c589bb3d49c4181d86b84ed0cd0cbd42d7b1ca51d37",
+                    "hash" : "0xfb5c9fab7bac372b8af05c589bb3d49c4181d86b84ed0cd0cbd42d7b1ca51d37",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "fb5c9fab7bac372b8af05c589bb3d49c4181d86b84ed0cd0cbd42d7b1ca51d37",
+                    "hash" : "0xfb5c9fab7bac372b8af05c589bb3d49c4181d86b84ed0cd0cbd42d7b1ca51d37",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "fb5c9fab7bac372b8af05c589bb3d49c4181d86b84ed0cd0cbd42d7b1ca51d37",
+                    "hash" : "0xfb5c9fab7bac372b8af05c589bb3d49c4181d86b84ed0cd0cbd42d7b1ca51d37",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "fb5c9fab7bac372b8af05c589bb3d49c4181d86b84ed0cd0cbd42d7b1ca51d37",
+                    "hash" : "0xfb5c9fab7bac372b8af05c589bb3d49c4181d86b84ed0cd0cbd42d7b1ca51d37",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "fb5c9fab7bac372b8af05c589bb3d49c4181d86b84ed0cd0cbd42d7b1ca51d37",
+                    "hash" : "0xfb5c9fab7bac372b8af05c589bb3d49c4181d86b84ed0cd0cbd42d7b1ca51d37",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "fb5c9fab7bac372b8af05c589bb3d49c4181d86b84ed0cd0cbd42d7b1ca51d37",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff437f000000000000000000000000000000000000000000000000000000000000c3506f679b82a092078f136b5541888c057a5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "623856537"
+                "0x252f4b99"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest359.json b/GeneralStateTests/stRandom/randomStatetest359.json
index 7efea6fd9..18274c790 100644
--- a/GeneralStateTests/stRandom/randomStatetest359.json
+++ b/GeneralStateTests/stRandom/randomStatetest359.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest359" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "77c02157a2c1be59d8e59537503c9cff114d187fd4196ad3b4594e827a7c302e",
+                    "hash" : "0x77c02157a2c1be59d8e59537503c9cff114d187fd4196ad3b4594e827a7c302e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "77c02157a2c1be59d8e59537503c9cff114d187fd4196ad3b4594e827a7c302e",
+                    "hash" : "0x77c02157a2c1be59d8e59537503c9cff114d187fd4196ad3b4594e827a7c302e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "77c02157a2c1be59d8e59537503c9cff114d187fd4196ad3b4594e827a7c302e",
+                    "hash" : "0x77c02157a2c1be59d8e59537503c9cff114d187fd4196ad3b4594e827a7c302e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "77c02157a2c1be59d8e59537503c9cff114d187fd4196ad3b4594e827a7c302e",
+                    "hash" : "0x77c02157a2c1be59d8e59537503c9cff114d187fd4196ad3b4594e827a7c302e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "77c02157a2c1be59d8e59537503c9cff114d187fd4196ad3b4594e827a7c302e",
+                    "hash" : "0x77c02157a2c1be59d8e59537503c9cff114d187fd4196ad3b4594e827a7c302e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "77c02157a2c1be59d8e59537503c9cff114d187fd4196ad3b4594e827a7c302e",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff428d06809e75f26764867d853b0555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "801407730"
+                "0x2fc482f2"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest36.json b/GeneralStateTests/stRandom/randomStatetest36.json
index 47f1827fe..a0668bb1d 100644
--- a/GeneralStateTests/stRandom/randomStatetest36.json
+++ b/GeneralStateTests/stRandom/randomStatetest36.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest36" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
             {
@@ -25,7 +25,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "24c926a05cf07d794c1d83f0f60093f1efb7da76d285c21befb885cf561d7b4c",
+                    "hash" : "0x24c926a05cf07d794c1d83f0f60093f1efb7da76d285c21befb885cf561d7b4c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -35,7 +35,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "24c926a05cf07d794c1d83f0f60093f1efb7da76d285c21befb885cf561d7b4c",
+                    "hash" : "0x24c926a05cf07d794c1d83f0f60093f1efb7da76d285c21befb885cf561d7b4c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -45,7 +45,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2c7c47e9cb899ce0782f3a8e0c3acc3b789536efa478ee8e64c11ea1eb1a7e81",
+                    "hash" : "0x2c7c47e9cb899ce0782f3a8e0c3acc3b789536efa478ee8e64c11ea1eb1a7e81",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -55,7 +55,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "2c7c47e9cb899ce0782f3a8e0c3acc3b789536efa478ee8e64c11ea1eb1a7e81",
+                    "hash" : "0x2c7c47e9cb899ce0782f3a8e0c3acc3b789536efa478ee8e64c11ea1eb1a7e81",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,7 +65,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "24c926a05cf07d794c1d83f0f60093f1efb7da76d285c21befb885cf561d7b4c",
+                    "hash" : "0x24c926a05cf07d794c1d83f0f60093f1efb7da76d285c21befb885cf561d7b4c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -76,23 +76,23 @@
         },
         "postStateRoot" : "2c7c47e9cb899ce0782f3a8e0c3acc3b789536efa478ee8e64c11ea1eb1a7e81",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000010000000000000000000000000000000000000000448243628c0970843ba460005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -107,10 +107,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "2098819291"
+                "0x7d1970db"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest360.json b/GeneralStateTests/stRandom/randomStatetest360.json
index 71e652118..0c8a14a7f 100644
--- a/GeneralStateTests/stRandom/randomStatetest360.json
+++ b/GeneralStateTests/stRandom/randomStatetest360.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest360" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c0a1113553a528db6b737350a87ef673023e671eaad143ad5917f3ebe3d3c0be",
+                    "hash" : "0xc0a1113553a528db6b737350a87ef673023e671eaad143ad5917f3ebe3d3c0be",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c0a1113553a528db6b737350a87ef673023e671eaad143ad5917f3ebe3d3c0be",
+                    "hash" : "0xc0a1113553a528db6b737350a87ef673023e671eaad143ad5917f3ebe3d3c0be",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "c0a1113553a528db6b737350a87ef673023e671eaad143ad5917f3ebe3d3c0be",
+                    "hash" : "0xc0a1113553a528db6b737350a87ef673023e671eaad143ad5917f3ebe3d3c0be",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c0a1113553a528db6b737350a87ef673023e671eaad143ad5917f3ebe3d3c0be",
+                    "hash" : "0xc0a1113553a528db6b737350a87ef673023e671eaad143ad5917f3ebe3d3c0be",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c0a1113553a528db6b737350a87ef673023e671eaad143ad5917f3ebe3d3c0be",
+                    "hash" : "0xc0a1113553a528db6b737350a87ef673023e671eaad143ad5917f3ebe3d3c0be",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "c0a1113553a528db6b737350a87ef673023e671eaad143ad5917f3ebe3d3c0be",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000016f0441548af30803135562840563829c5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "991329291"
+                "0x3b167c0b"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest361.json b/GeneralStateTests/stRandom/randomStatetest361.json
index 868d611e7..39af75fa3 100644
--- a/GeneralStateTests/stRandom/randomStatetest361.json
+++ b/GeneralStateTests/stRandom/randomStatetest361.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest361" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "2c988fb474af7ae7265836009e4e3c0ccbfeed0e3a88d3b83a47d33740ab9528",
+                    "hash" : "0x2c988fb474af7ae7265836009e4e3c0ccbfeed0e3a88d3b83a47d33740ab9528",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "2c988fb474af7ae7265836009e4e3c0ccbfeed0e3a88d3b83a47d33740ab9528",
+                    "hash" : "0x2c988fb474af7ae7265836009e4e3c0ccbfeed0e3a88d3b83a47d33740ab9528",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2c988fb474af7ae7265836009e4e3c0ccbfeed0e3a88d3b83a47d33740ab9528",
+                    "hash" : "0x2c988fb474af7ae7265836009e4e3c0ccbfeed0e3a88d3b83a47d33740ab9528",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "2c988fb474af7ae7265836009e4e3c0ccbfeed0e3a88d3b83a47d33740ab9528",
+                    "hash" : "0x2c988fb474af7ae7265836009e4e3c0ccbfeed0e3a88d3b83a47d33740ab9528",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "2c988fb474af7ae7265836009e4e3c0ccbfeed0e3a88d3b83a47d33740ab9528",
+                    "hash" : "0x2c988fb474af7ae7265836009e4e3c0ccbfeed0e3a88d3b83a47d33740ab9528",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "2c988fb474af7ae7265836009e4e3c0ccbfeed0e3a88d3b83a47d33740ab9528",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x41417ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff066f9e9092673a8f430b6ba115209018165560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1958353085"
+                "0x74ba18bd"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest362.json b/GeneralStateTests/stRandom/randomStatetest362.json
index 24d070ca3..972bebd87 100644
--- a/GeneralStateTests/stRandom/randomStatetest362.json
+++ b/GeneralStateTests/stRandom/randomStatetest362.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest362" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "8904a15b1484fce37952dc4914e2a63f003b970261f12f517fd38d9de1ca82f1",
+                    "hash" : "0x8904a15b1484fce37952dc4914e2a63f003b970261f12f517fd38d9de1ca82f1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "8904a15b1484fce37952dc4914e2a63f003b970261f12f517fd38d9de1ca82f1",
+                    "hash" : "0x8904a15b1484fce37952dc4914e2a63f003b970261f12f517fd38d9de1ca82f1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "8904a15b1484fce37952dc4914e2a63f003b970261f12f517fd38d9de1ca82f1",
+                    "hash" : "0x8904a15b1484fce37952dc4914e2a63f003b970261f12f517fd38d9de1ca82f1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "8904a15b1484fce37952dc4914e2a63f003b970261f12f517fd38d9de1ca82f1",
+                    "hash" : "0x8904a15b1484fce37952dc4914e2a63f003b970261f12f517fd38d9de1ca82f1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "8904a15b1484fce37952dc4914e2a63f003b970261f12f517fd38d9de1ca82f1",
+                    "hash" : "0x8904a15b1484fce37952dc4914e2a63f003b970261f12f517fd38d9de1ca82f1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "8904a15b1484fce37952dc4914e2a63f003b970261f12f517fd38d9de1ca82f1",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b50955",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "822238394"
+                "0x31025cba"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest363.json b/GeneralStateTests/stRandom/randomStatetest363.json
index 87f6a434a..4f07a7e78 100644
--- a/GeneralStateTests/stRandom/randomStatetest363.json
+++ b/GeneralStateTests/stRandom/randomStatetest363.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest363" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "004d95838c457f0e838153b6c8c18e123139b406b7395cef4a8d7bdff41f9a42",
+                    "hash" : "0x004d95838c457f0e838153b6c8c18e123139b406b7395cef4a8d7bdff41f9a42",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "004d95838c457f0e838153b6c8c18e123139b406b7395cef4a8d7bdff41f9a42",
+                    "hash" : "0x004d95838c457f0e838153b6c8c18e123139b406b7395cef4a8d7bdff41f9a42",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "004d95838c457f0e838153b6c8c18e123139b406b7395cef4a8d7bdff41f9a42",
+                    "hash" : "0x004d95838c457f0e838153b6c8c18e123139b406b7395cef4a8d7bdff41f9a42",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "004d95838c457f0e838153b6c8c18e123139b406b7395cef4a8d7bdff41f9a42",
+                    "hash" : "0x004d95838c457f0e838153b6c8c18e123139b406b7395cef4a8d7bdff41f9a42",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "004d95838c457f0e838153b6c8c18e123139b406b7395cef4a8d7bdff41f9a42",
+                    "hash" : "0x004d95838c457f0e838153b6c8c18e123139b406b7395cef4a8d7bdff41f9a42",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "004d95838c457f0e838153b6c8c18e123139b406b7395cef4a8d7bdff41f9a42",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350117ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f7b20937d953695f369719f9a4479055560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1276687966"
+                "0x4c18b65e"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest364.json b/GeneralStateTests/stRandom/randomStatetest364.json
index e88da1fc6..241abaee8 100644
--- a/GeneralStateTests/stRandom/randomStatetest364.json
+++ b/GeneralStateTests/stRandom/randomStatetest364.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest364" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "8e49676c75e131c3080b729480b037aa026c5c434e1d3182e3d960882fe2494b",
+                    "hash" : "0x8e49676c75e131c3080b729480b037aa026c5c434e1d3182e3d960882fe2494b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "8e49676c75e131c3080b729480b037aa026c5c434e1d3182e3d960882fe2494b",
+                    "hash" : "0x8e49676c75e131c3080b729480b037aa026c5c434e1d3182e3d960882fe2494b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "8e49676c75e131c3080b729480b037aa026c5c434e1d3182e3d960882fe2494b",
+                    "hash" : "0x8e49676c75e131c3080b729480b037aa026c5c434e1d3182e3d960882fe2494b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "8e49676c75e131c3080b729480b037aa026c5c434e1d3182e3d960882fe2494b",
+                    "hash" : "0x8e49676c75e131c3080b729480b037aa026c5c434e1d3182e3d960882fe2494b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "8e49676c75e131c3080b729480b037aa026c5c434e1d3182e3d960882fe2494b",
+                    "hash" : "0x8e49676c75e131c3080b729480b037aa026c5c434e1d3182e3d960882fe2494b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "8e49676c75e131c3080b729480b037aa026c5c434e1d3182e3d960882fe2494b",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350076f7332988d746694918859185920446d5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "630230945"
+                "0x25908fa1"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest365.json b/GeneralStateTests/stRandom/randomStatetest365.json
index e2c84d72c..b29f0d84c 100644
--- a/GeneralStateTests/stRandom/randomStatetest365.json
+++ b/GeneralStateTests/stRandom/randomStatetest365.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest365" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "ddbb87ecbeab49d4d03155cebba212cf9f4865e1e0e723f2bfbfe2c1e5038cd8",
+                    "hash" : "0xddbb87ecbeab49d4d03155cebba212cf9f4865e1e0e723f2bfbfe2c1e5038cd8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "ddbb87ecbeab49d4d03155cebba212cf9f4865e1e0e723f2bfbfe2c1e5038cd8",
+                    "hash" : "0xddbb87ecbeab49d4d03155cebba212cf9f4865e1e0e723f2bfbfe2c1e5038cd8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "920bfebe4ccfee0bbe17debf1beafb51f0d741bc4f00d08041316037fd634936",
+                    "hash" : "0x920bfebe4ccfee0bbe17debf1beafb51f0d741bc4f00d08041316037fd634936",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "920bfebe4ccfee0bbe17debf1beafb51f0d741bc4f00d08041316037fd634936",
+                    "hash" : "0x920bfebe4ccfee0bbe17debf1beafb51f0d741bc4f00d08041316037fd634936",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "ddbb87ecbeab49d4d03155cebba212cf9f4865e1e0e723f2bfbfe2c1e5038cd8",
+                    "hash" : "0xddbb87ecbeab49d4d03155cebba212cf9f4865e1e0e723f2bfbfe2c1e5038cd8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "d8760d71be2c4fbb0ab38e5d8658189daf82eaa4354839970f9d476bee0f2da6",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff42417f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000000000000000000000000000143b420785375560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1219277154"
+                "0x48acb162"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest366.json b/GeneralStateTests/stRandom/randomStatetest366.json
index 80c652410..67cd688ce 100644
--- a/GeneralStateTests/stRandom/randomStatetest366.json
+++ b/GeneralStateTests/stRandom/randomStatetest366.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest366" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e461dd8d9a3a724fe57f5be4c69b8a2b605a87fdc486e8ec2b173fc82cf196af",
+                    "hash" : "0xe461dd8d9a3a724fe57f5be4c69b8a2b605a87fdc486e8ec2b173fc82cf196af",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e461dd8d9a3a724fe57f5be4c69b8a2b605a87fdc486e8ec2b173fc82cf196af",
+                    "hash" : "0xe461dd8d9a3a724fe57f5be4c69b8a2b605a87fdc486e8ec2b173fc82cf196af",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e461dd8d9a3a724fe57f5be4c69b8a2b605a87fdc486e8ec2b173fc82cf196af",
+                    "hash" : "0xe461dd8d9a3a724fe57f5be4c69b8a2b605a87fdc486e8ec2b173fc82cf196af",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e461dd8d9a3a724fe57f5be4c69b8a2b605a87fdc486e8ec2b173fc82cf196af",
+                    "hash" : "0xe461dd8d9a3a724fe57f5be4c69b8a2b605a87fdc486e8ec2b173fc82cf196af",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e461dd8d9a3a724fe57f5be4c69b8a2b605a87fdc486e8ec2b173fc82cf196af",
+                    "hash" : "0xe461dd8d9a3a724fe57f5be4c69b8a2b605a87fdc486e8ec2b173fc82cf196af",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "e461dd8d9a3a724fe57f5be4c69b8a2b605a87fdc486e8ec2b173fc82cf196af",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff446f516f0395f57433725580758f32f1945560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "2102558524"
+                "0x7d527f3c"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest367.json b/GeneralStateTests/stRandom/randomStatetest367.json
index e25c5811d..88a4ebeea 100644
--- a/GeneralStateTests/stRandom/randomStatetest367.json
+++ b/GeneralStateTests/stRandom/randomStatetest367.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest367" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d0119e2770270be4a87f4e06122fb4af5356d7f972205ca79bd529cf35b9814d",
+                    "hash" : "0xd0119e2770270be4a87f4e06122fb4af5356d7f972205ca79bd529cf35b9814d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "00adc89e5e25c138dad983f92955022ba7a8655655213a00a7a3f6087faa0d42",
+                    "hash" : "0x00adc89e5e25c138dad983f92955022ba7a8655655213a00a7a3f6087faa0d42",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "d0119e2770270be4a87f4e06122fb4af5356d7f972205ca79bd529cf35b9814d",
+                    "hash" : "0xd0119e2770270be4a87f4e06122fb4af5356d7f972205ca79bd529cf35b9814d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "d0119e2770270be4a87f4e06122fb4af5356d7f972205ca79bd529cf35b9814d",
+                    "hash" : "0xd0119e2770270be4a87f4e06122fb4af5356d7f972205ca79bd529cf35b9814d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "00adc89e5e25c138dad983f92955022ba7a8655655213a00a7a3f6087faa0d42",
+                    "hash" : "0x00adc89e5e25c138dad983f92955022ba7a8655655213a00a7a3f6087faa0d42",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "5d26bbe169398eaad707f1e7ff104caf0b0703de89ce92589f866be657619849",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000447f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5447f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b51905810a6c7a5959339f3342838b5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "734254896"
+                "0x2bc3d730"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest368.json b/GeneralStateTests/stRandom/randomStatetest368.json
index 896b8bb19..3031f639a 100644
--- a/GeneralStateTests/stRandom/randomStatetest368.json
+++ b/GeneralStateTests/stRandom/randomStatetest368.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest368" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7e85678cfd2866c57aab7a6b1c085dc2b77f5a123a088aeb7f88b8d49647667e",
+                    "hash" : "0x7e85678cfd2866c57aab7a6b1c085dc2b77f5a123a088aeb7f88b8d49647667e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "8bab9f85dfb0b213e404b6f6155393b0932bf70afab5de1dbc7c566e5e44aad2",
+                    "hash" : "0x8bab9f85dfb0b213e404b6f6155393b0932bf70afab5de1dbc7c566e5e44aad2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "7e85678cfd2866c57aab7a6b1c085dc2b77f5a123a088aeb7f88b8d49647667e",
+                    "hash" : "0x7e85678cfd2866c57aab7a6b1c085dc2b77f5a123a088aeb7f88b8d49647667e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "7e85678cfd2866c57aab7a6b1c085dc2b77f5a123a088aeb7f88b8d49647667e",
+                    "hash" : "0x7e85678cfd2866c57aab7a6b1c085dc2b77f5a123a088aeb7f88b8d49647667e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "8bab9f85dfb0b213e404b6f6155393b0932bf70afab5de1dbc7c566e5e44aad2",
+                    "hash" : "0x8bab9f85dfb0b213e404b6f6155393b0932bf70afab5de1dbc7c566e5e44aad2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "bf2bfa36f3b3191fd44512c863f67aa9eb7623e4d9261607e3b8c211ec772002",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe097f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b54206f06d870339356057907760005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1135359124"
+                "0x43ac3494"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest369.json b/GeneralStateTests/stRandom/randomStatetest369.json
index 7099f12a9..2f89d9289 100644
--- a/GeneralStateTests/stRandom/randomStatetest369.json
+++ b/GeneralStateTests/stRandom/randomStatetest369.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest369" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "35ebe0f6a4286a321843e62f25e42b67bd3f0092db4b2d8edb96d2e1b1501bdd",
+                    "hash" : "0x35ebe0f6a4286a321843e62f25e42b67bd3f0092db4b2d8edb96d2e1b1501bdd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "35ebe0f6a4286a321843e62f25e42b67bd3f0092db4b2d8edb96d2e1b1501bdd",
+                    "hash" : "0x35ebe0f6a4286a321843e62f25e42b67bd3f0092db4b2d8edb96d2e1b1501bdd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "35ebe0f6a4286a321843e62f25e42b67bd3f0092db4b2d8edb96d2e1b1501bdd",
+                    "hash" : "0x35ebe0f6a4286a321843e62f25e42b67bd3f0092db4b2d8edb96d2e1b1501bdd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "35ebe0f6a4286a321843e62f25e42b67bd3f0092db4b2d8edb96d2e1b1501bdd",
+                    "hash" : "0x35ebe0f6a4286a321843e62f25e42b67bd3f0092db4b2d8edb96d2e1b1501bdd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "35ebe0f6a4286a321843e62f25e42b67bd3f0092db4b2d8edb96d2e1b1501bdd",
+                    "hash" : "0x35ebe0f6a4286a321843e62f25e42b67bd3f0092db4b2d8edb96d2e1b1501bdd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "35ebe0f6a4286a321843e62f25e42b67bd3f0092db4b2d8edb96d2e1b1501bdd",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff437f000000000000000000000001000000000000000000000000000000000000000060005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "471893354"
+                "0x1c20856a"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest37.json b/GeneralStateTests/stRandom/randomStatetest37.json
index 7ece57e67..59a708e3c 100644
--- a/GeneralStateTests/stRandom/randomStatetest37.json
+++ b/GeneralStateTests/stRandom/randomStatetest37.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest37" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e4522101de78d84b439669fde27a29fa109b74f16a2c9a1b33c0b524b5a1e636",
+                    "hash" : "0xe4522101de78d84b439669fde27a29fa109b74f16a2c9a1b33c0b524b5a1e636",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e4522101de78d84b439669fde27a29fa109b74f16a2c9a1b33c0b524b5a1e636",
+                    "hash" : "0xe4522101de78d84b439669fde27a29fa109b74f16a2c9a1b33c0b524b5a1e636",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e4522101de78d84b439669fde27a29fa109b74f16a2c9a1b33c0b524b5a1e636",
+                    "hash" : "0xe4522101de78d84b439669fde27a29fa109b74f16a2c9a1b33c0b524b5a1e636",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e4522101de78d84b439669fde27a29fa109b74f16a2c9a1b33c0b524b5a1e636",
+                    "hash" : "0xe4522101de78d84b439669fde27a29fa109b74f16a2c9a1b33c0b524b5a1e636",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e4522101de78d84b439669fde27a29fa109b74f16a2c9a1b33c0b524b5a1e636",
+                    "hash" : "0xe4522101de78d84b439669fde27a29fa109b74f16a2c9a1b33c0b524b5a1e636",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "e4522101de78d84b439669fde27a29fa109b74f16a2c9a1b33c0b524b5a1e636",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000016fa49835863514f0f29b930b97f116935560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1992729901"
+                "0x76c6a52d"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest370.json b/GeneralStateTests/stRandom/randomStatetest370.json
index 3eeaf3641..12031505b 100644
--- a/GeneralStateTests/stRandom/randomStatetest370.json
+++ b/GeneralStateTests/stRandom/randomStatetest370.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest370" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "da70f5af0d1545ec9f0f0e28a55d3f2896bb3d64c71b4908f72ed26c345aafe4",
+                    "hash" : "0xda70f5af0d1545ec9f0f0e28a55d3f2896bb3d64c71b4908f72ed26c345aafe4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "da70f5af0d1545ec9f0f0e28a55d3f2896bb3d64c71b4908f72ed26c345aafe4",
+                    "hash" : "0xda70f5af0d1545ec9f0f0e28a55d3f2896bb3d64c71b4908f72ed26c345aafe4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "da70f5af0d1545ec9f0f0e28a55d3f2896bb3d64c71b4908f72ed26c345aafe4",
+                    "hash" : "0xda70f5af0d1545ec9f0f0e28a55d3f2896bb3d64c71b4908f72ed26c345aafe4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "da70f5af0d1545ec9f0f0e28a55d3f2896bb3d64c71b4908f72ed26c345aafe4",
+                    "hash" : "0xda70f5af0d1545ec9f0f0e28a55d3f2896bb3d64c71b4908f72ed26c345aafe4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "da70f5af0d1545ec9f0f0e28a55d3f2896bb3d64c71b4908f72ed26c345aafe4",
+                    "hash" : "0xda70f5af0d1545ec9f0f0e28a55d3f2896bb3d64c71b4908f72ed26c345aafe4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "da70f5af0d1545ec9f0f0e28a55d3f2896bb3d64c71b4908f72ed26c345aafe4",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x44207ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001145344846604627f5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1561176030"
+                "0x5d0da7de"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest371.json b/GeneralStateTests/stRandom/randomStatetest371.json
index 70c150775..b276d200f 100644
--- a/GeneralStateTests/stRandom/randomStatetest371.json
+++ b/GeneralStateTests/stRandom/randomStatetest371.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest371" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c423d51eaf6dbbd7e5a6b50e586234769b868aee9c57a429ae654fdf380d9679",
+                    "hash" : "0xc423d51eaf6dbbd7e5a6b50e586234769b868aee9c57a429ae654fdf380d9679",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c423d51eaf6dbbd7e5a6b50e586234769b868aee9c57a429ae654fdf380d9679",
+                    "hash" : "0xc423d51eaf6dbbd7e5a6b50e586234769b868aee9c57a429ae654fdf380d9679",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "c423d51eaf6dbbd7e5a6b50e586234769b868aee9c57a429ae654fdf380d9679",
+                    "hash" : "0xc423d51eaf6dbbd7e5a6b50e586234769b868aee9c57a429ae654fdf380d9679",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c423d51eaf6dbbd7e5a6b50e586234769b868aee9c57a429ae654fdf380d9679",
+                    "hash" : "0xc423d51eaf6dbbd7e5a6b50e586234769b868aee9c57a429ae654fdf380d9679",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c423d51eaf6dbbd7e5a6b50e586234769b868aee9c57a429ae654fdf380d9679",
+                    "hash" : "0xc423d51eaf6dbbd7e5a6b50e586234769b868aee9c57a429ae654fdf380d9679",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "c423d51eaf6dbbd7e5a6b50e586234769b868aee9c57a429ae654fdf380d9679",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000010000000000000000000000000000000000000000435a10395560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "2118132562"
+                "0x7e402352"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest372.json b/GeneralStateTests/stRandom/randomStatetest372.json
index e74fcffc9..348e2f96e 100644
--- a/GeneralStateTests/stRandom/randomStatetest372.json
+++ b/GeneralStateTests/stRandom/randomStatetest372.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest372" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "ab8453deeb0a31d5c4490cafdb3d25b180114ddbf82e0c51caac4660f8c6d11c",
+                    "hash" : "0xab8453deeb0a31d5c4490cafdb3d25b180114ddbf82e0c51caac4660f8c6d11c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "ab8453deeb0a31d5c4490cafdb3d25b180114ddbf82e0c51caac4660f8c6d11c",
+                    "hash" : "0xab8453deeb0a31d5c4490cafdb3d25b180114ddbf82e0c51caac4660f8c6d11c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "ab8453deeb0a31d5c4490cafdb3d25b180114ddbf82e0c51caac4660f8c6d11c",
+                    "hash" : "0xab8453deeb0a31d5c4490cafdb3d25b180114ddbf82e0c51caac4660f8c6d11c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ab8453deeb0a31d5c4490cafdb3d25b180114ddbf82e0c51caac4660f8c6d11c",
+                    "hash" : "0xab8453deeb0a31d5c4490cafdb3d25b180114ddbf82e0c51caac4660f8c6d11c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "ab8453deeb0a31d5c4490cafdb3d25b180114ddbf82e0c51caac4660f8c6d11c",
+                    "hash" : "0xab8453deeb0a31d5c4490cafdb3d25b180114ddbf82e0c51caac4660f8c6d11c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "ab8453deeb0a31d5c4490cafdb3d25b180114ddbf82e0c51caac4660f8c6d11c",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f0000000000000000000000000000000000000000000000000000000000000001180860005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1833691657"
+                "0x6d4bea09"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest373.json b/GeneralStateTests/stRandom/randomStatetest373.json
index 6bc2db413..005e54e0e 100644
--- a/GeneralStateTests/stRandom/randomStatetest373.json
+++ b/GeneralStateTests/stRandom/randomStatetest373.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest373" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "ab249ed297c86e8501bd213fe3d50d5481f0a3869ae96254d4fd50fda94d4118",
+                    "hash" : "0xab249ed297c86e8501bd213fe3d50d5481f0a3869ae96254d4fd50fda94d4118",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "ab249ed297c86e8501bd213fe3d50d5481f0a3869ae96254d4fd50fda94d4118",
+                    "hash" : "0xab249ed297c86e8501bd213fe3d50d5481f0a3869ae96254d4fd50fda94d4118",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "ab249ed297c86e8501bd213fe3d50d5481f0a3869ae96254d4fd50fda94d4118",
+                    "hash" : "0xab249ed297c86e8501bd213fe3d50d5481f0a3869ae96254d4fd50fda94d4118",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ab249ed297c86e8501bd213fe3d50d5481f0a3869ae96254d4fd50fda94d4118",
+                    "hash" : "0xab249ed297c86e8501bd213fe3d50d5481f0a3869ae96254d4fd50fda94d4118",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "ab249ed297c86e8501bd213fe3d50d5481f0a3869ae96254d4fd50fda94d4118",
+                    "hash" : "0xab249ed297c86e8501bd213fe3d50d5481f0a3869ae96254d4fd50fda94d4118",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "ab249ed297c86e8501bd213fe3d50d5481f0a3869ae96254d4fd50fda94d4118",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f0000000000000000000000000000000000000000000000000000000000000001407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3506f596355699a095516837a9d6f3a03080460005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "761076938"
+                "0x2d5d1cca"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest374.json b/GeneralStateTests/stRandom/randomStatetest374.json
index 26edcd238..049abdb86 100644
--- a/GeneralStateTests/stRandom/randomStatetest374.json
+++ b/GeneralStateTests/stRandom/randomStatetest374.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest374" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "76ba23ffae84433579040d7802941b5fe0025b9fd357cbb696cb88bbbf9bd2f9",
+                    "hash" : "0x76ba23ffae84433579040d7802941b5fe0025b9fd357cbb696cb88bbbf9bd2f9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "76ba23ffae84433579040d7802941b5fe0025b9fd357cbb696cb88bbbf9bd2f9",
+                    "hash" : "0x76ba23ffae84433579040d7802941b5fe0025b9fd357cbb696cb88bbbf9bd2f9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "76ba23ffae84433579040d7802941b5fe0025b9fd357cbb696cb88bbbf9bd2f9",
+                    "hash" : "0x76ba23ffae84433579040d7802941b5fe0025b9fd357cbb696cb88bbbf9bd2f9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "76ba23ffae84433579040d7802941b5fe0025b9fd357cbb696cb88bbbf9bd2f9",
+                    "hash" : "0x76ba23ffae84433579040d7802941b5fe0025b9fd357cbb696cb88bbbf9bd2f9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "76ba23ffae84433579040d7802941b5fe0025b9fd357cbb696cb88bbbf9bd2f9",
+                    "hash" : "0x76ba23ffae84433579040d7802941b5fe0025b9fd357cbb696cb88bbbf9bd2f9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "76ba23ffae84433579040d7802941b5fe0025b9fd357cbb696cb88bbbf9bd2f9",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff437f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c35041406fa33a526031796e8c18836f61367c885560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "362352739"
+                "0x15991063"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest375.json b/GeneralStateTests/stRandom/randomStatetest375.json
index fed6a73e0..ea64efdd8 100644
--- a/GeneralStateTests/stRandom/randomStatetest375.json
+++ b/GeneralStateTests/stRandom/randomStatetest375.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest375" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1bc18d528abd934d9eee8477dfb2e3b23e3975e7eb150c071b90777023e9165f",
+                    "hash" : "0x1bc18d528abd934d9eee8477dfb2e3b23e3975e7eb150c071b90777023e9165f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "1bc18d528abd934d9eee8477dfb2e3b23e3975e7eb150c071b90777023e9165f",
+                    "hash" : "0x1bc18d528abd934d9eee8477dfb2e3b23e3975e7eb150c071b90777023e9165f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "1bc18d528abd934d9eee8477dfb2e3b23e3975e7eb150c071b90777023e9165f",
+                    "hash" : "0x1bc18d528abd934d9eee8477dfb2e3b23e3975e7eb150c071b90777023e9165f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "1bc18d528abd934d9eee8477dfb2e3b23e3975e7eb150c071b90777023e9165f",
+                    "hash" : "0x1bc18d528abd934d9eee8477dfb2e3b23e3975e7eb150c071b90777023e9165f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "1bc18d528abd934d9eee8477dfb2e3b23e3975e7eb150c071b90777023e9165f",
+                    "hash" : "0x1bc18d528abd934d9eee8477dfb2e3b23e3975e7eb150c071b90777023e9165f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "b2dc128feea95fa987aa090c16f5a0f50722601942c9861e790a8c242c5d8fb7",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x414542084255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest376.json b/GeneralStateTests/stRandom/randomStatetest376.json
index 2e8ac03d2..714b9e51e 100644
--- a/GeneralStateTests/stRandom/randomStatetest376.json
+++ b/GeneralStateTests/stRandom/randomStatetest376.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest376" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "531eb702868260d0ddc021b91e86d132954570a5c091a96e52d883565eab84e8",
+                    "hash" : "0x531eb702868260d0ddc021b91e86d132954570a5c091a96e52d883565eab84e8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "531eb702868260d0ddc021b91e86d132954570a5c091a96e52d883565eab84e8",
+                    "hash" : "0x531eb702868260d0ddc021b91e86d132954570a5c091a96e52d883565eab84e8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "71053be3181792ffce020f8f415fe7fd229df945834fa51c5845265a1a369d5a",
+                    "hash" : "0x71053be3181792ffce020f8f415fe7fd229df945834fa51c5845265a1a369d5a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "71053be3181792ffce020f8f415fe7fd229df945834fa51c5845265a1a369d5a",
+                    "hash" : "0x71053be3181792ffce020f8f415fe7fd229df945834fa51c5845265a1a369d5a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "531eb702868260d0ddc021b91e86d132954570a5c091a96e52d883565eab84e8",
+                    "hash" : "0x531eb702868260d0ddc021b91e86d132954570a5c091a96e52d883565eab84e8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "71053be3181792ffce020f8f415fe7fd229df945834fa51c5845265a1a369d5a",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff427fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09ff8c316460005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1872596219"
+                "0x6f9d8cfb"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest377.json b/GeneralStateTests/stRandom/randomStatetest377.json
index 1f37254b2..20870832e 100644
--- a/GeneralStateTests/stRandom/randomStatetest377.json
+++ b/GeneralStateTests/stRandom/randomStatetest377.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest377" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "aed5fc495bd33cc7ecb786bb4d004e28cbf4f276ac0394dea48736e6e099de38",
+                    "hash" : "0xaed5fc495bd33cc7ecb786bb4d004e28cbf4f276ac0394dea48736e6e099de38",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "aed5fc495bd33cc7ecb786bb4d004e28cbf4f276ac0394dea48736e6e099de38",
+                    "hash" : "0xaed5fc495bd33cc7ecb786bb4d004e28cbf4f276ac0394dea48736e6e099de38",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "aed5fc495bd33cc7ecb786bb4d004e28cbf4f276ac0394dea48736e6e099de38",
+                    "hash" : "0xaed5fc495bd33cc7ecb786bb4d004e28cbf4f276ac0394dea48736e6e099de38",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "aed5fc495bd33cc7ecb786bb4d004e28cbf4f276ac0394dea48736e6e099de38",
+                    "hash" : "0xaed5fc495bd33cc7ecb786bb4d004e28cbf4f276ac0394dea48736e6e099de38",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "aed5fc495bd33cc7ecb786bb4d004e28cbf4f276ac0394dea48736e6e099de38",
+                    "hash" : "0xaed5fc495bd33cc7ecb786bb4d004e28cbf4f276ac0394dea48736e6e099de38",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "ee8e6e8cac9bc090f6dfc61dd8f81a849a5a71a997e2cbe6ad7c85025370a888",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x41444442444441450855",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest378.json b/GeneralStateTests/stRandom/randomStatetest378.json
index dc3b91732..dc35af7c7 100644
--- a/GeneralStateTests/stRandom/randomStatetest378.json
+++ b/GeneralStateTests/stRandom/randomStatetest378.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest378" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "20ed7b84b9e0866013555dcd212ac64eab72c87dabc69043db886c8a6e46276d",
+                    "hash" : "0x20ed7b84b9e0866013555dcd212ac64eab72c87dabc69043db886c8a6e46276d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "20ed7b84b9e0866013555dcd212ac64eab72c87dabc69043db886c8a6e46276d",
+                    "hash" : "0x20ed7b84b9e0866013555dcd212ac64eab72c87dabc69043db886c8a6e46276d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "651c0d574da652663c71b469cc52abfced88bb841aa6f3eb11ce76a80dc56a27",
+                    "hash" : "0x651c0d574da652663c71b469cc52abfced88bb841aa6f3eb11ce76a80dc56a27",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "651c0d574da652663c71b469cc52abfced88bb841aa6f3eb11ce76a80dc56a27",
+                    "hash" : "0x651c0d574da652663c71b469cc52abfced88bb841aa6f3eb11ce76a80dc56a27",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "20ed7b84b9e0866013555dcd212ac64eab72c87dabc69043db886c8a6e46276d",
+                    "hash" : "0x20ed7b84b9e0866013555dcd212ac64eab72c87dabc69043db886c8a6e46276d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "651c0d574da652663c71b469cc52abfced88bb841aa6f3eb11ce76a80dc56a27",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff547f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000005a7f00000000000000000000000000000000000000000000000000000000000000016f855b445834721a5706f2891711f0025560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1675637682"
+                "0x63e033b2"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest379.json b/GeneralStateTests/stRandom/randomStatetest379.json
index 8dd90da8a..fe0f38aa4 100644
--- a/GeneralStateTests/stRandom/randomStatetest379.json
+++ b/GeneralStateTests/stRandom/randomStatetest379.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest379" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e29519e833ce786cbc42ddb84c659e91d2a059502ec40a8f6c142edba121282f",
+                    "hash" : "0xe29519e833ce786cbc42ddb84c659e91d2a059502ec40a8f6c142edba121282f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e29519e833ce786cbc42ddb84c659e91d2a059502ec40a8f6c142edba121282f",
+                    "hash" : "0xe29519e833ce786cbc42ddb84c659e91d2a059502ec40a8f6c142edba121282f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e29519e833ce786cbc42ddb84c659e91d2a059502ec40a8f6c142edba121282f",
+                    "hash" : "0xe29519e833ce786cbc42ddb84c659e91d2a059502ec40a8f6c142edba121282f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e29519e833ce786cbc42ddb84c659e91d2a059502ec40a8f6c142edba121282f",
+                    "hash" : "0xe29519e833ce786cbc42ddb84c659e91d2a059502ec40a8f6c142edba121282f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e29519e833ce786cbc42ddb84c659e91d2a059502ec40a8f6c142edba121282f",
+                    "hash" : "0xe29519e833ce786cbc42ddb84c659e91d2a059502ec40a8f6c142edba121282f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "6072885a90efa3040ae08ac771d96b6ba10a975d5c2ed271cf675b268392d93a",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x424255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest38.json b/GeneralStateTests/stRandom/randomStatetest38.json
index 180c7054a..9923e0809 100644
--- a/GeneralStateTests/stRandom/randomStatetest38.json
+++ b/GeneralStateTests/stRandom/randomStatetest38.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest38" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "403bcf9194306ccf769d84ca9b8b2d8cf6d97270c2a042c684463e5566e1028d",
+                    "hash" : "0x403bcf9194306ccf769d84ca9b8b2d8cf6d97270c2a042c684463e5566e1028d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "403bcf9194306ccf769d84ca9b8b2d8cf6d97270c2a042c684463e5566e1028d",
+                    "hash" : "0x403bcf9194306ccf769d84ca9b8b2d8cf6d97270c2a042c684463e5566e1028d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5cfd94217aa79e52dc7e8adc06d3125c65c5bcf3ae3dd46da6e742992318476b",
+                    "hash" : "0x5cfd94217aa79e52dc7e8adc06d3125c65c5bcf3ae3dd46da6e742992318476b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5cfd94217aa79e52dc7e8adc06d3125c65c5bcf3ae3dd46da6e742992318476b",
+                    "hash" : "0x5cfd94217aa79e52dc7e8adc06d3125c65c5bcf3ae3dd46da6e742992318476b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "403bcf9194306ccf769d84ca9b8b2d8cf6d97270c2a042c684463e5566e1028d",
+                    "hash" : "0x403bcf9194306ccf769d84ca9b8b2d8cf6d97270c2a042c684463e5566e1028d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "b053b0835b8da7f3a105910186ea3646d2f4b87a4f742e4950f6748a2cf8b4ae",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x41314555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest380.json b/GeneralStateTests/stRandom/randomStatetest380.json
index acc2aa15c..501e18da3 100644
--- a/GeneralStateTests/stRandom/randomStatetest380.json
+++ b/GeneralStateTests/stRandom/randomStatetest380.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest380" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "5c6350e9e52816b1c58daf0e731a61e38d380c18598fb7d89f41f1cb0a84bec4",
+                    "hash" : "0x5c6350e9e52816b1c58daf0e731a61e38d380c18598fb7d89f41f1cb0a84bec4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "5c6350e9e52816b1c58daf0e731a61e38d380c18598fb7d89f41f1cb0a84bec4",
+                    "hash" : "0x5c6350e9e52816b1c58daf0e731a61e38d380c18598fb7d89f41f1cb0a84bec4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5c6350e9e52816b1c58daf0e731a61e38d380c18598fb7d89f41f1cb0a84bec4",
+                    "hash" : "0x5c6350e9e52816b1c58daf0e731a61e38d380c18598fb7d89f41f1cb0a84bec4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5c6350e9e52816b1c58daf0e731a61e38d380c18598fb7d89f41f1cb0a84bec4",
+                    "hash" : "0x5c6350e9e52816b1c58daf0e731a61e38d380c18598fb7d89f41f1cb0a84bec4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "5c6350e9e52816b1c58daf0e731a61e38d380c18598fb7d89f41f1cb0a84bec4",
+                    "hash" : "0x5c6350e9e52816b1c58daf0e731a61e38d380c18598fb7d89f41f1cb0a84bec4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "5c6350e9e52816b1c58daf0e731a61e38d380c18598fb7d89f41f1cb0a84bec4",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f967737653485593c63408b399439755560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "628563350"
+                "0x25771d96"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest381.json b/GeneralStateTests/stRandom/randomStatetest381.json
index 1ee468824..e8516b928 100644
--- a/GeneralStateTests/stRandom/randomStatetest381.json
+++ b/GeneralStateTests/stRandom/randomStatetest381.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest381" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "3a0e81d25c3fc7fcba17f4ba07b92c9ce0ed3a025c9e3e0b9bcc77b784b5e377",
+                    "hash" : "0x3a0e81d25c3fc7fcba17f4ba07b92c9ce0ed3a025c9e3e0b9bcc77b784b5e377",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "3a0e81d25c3fc7fcba17f4ba07b92c9ce0ed3a025c9e3e0b9bcc77b784b5e377",
+                    "hash" : "0x3a0e81d25c3fc7fcba17f4ba07b92c9ce0ed3a025c9e3e0b9bcc77b784b5e377",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3a0e81d25c3fc7fcba17f4ba07b92c9ce0ed3a025c9e3e0b9bcc77b784b5e377",
+                    "hash" : "0x3a0e81d25c3fc7fcba17f4ba07b92c9ce0ed3a025c9e3e0b9bcc77b784b5e377",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3a0e81d25c3fc7fcba17f4ba07b92c9ce0ed3a025c9e3e0b9bcc77b784b5e377",
+                    "hash" : "0x3a0e81d25c3fc7fcba17f4ba07b92c9ce0ed3a025c9e3e0b9bcc77b784b5e377",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "3a0e81d25c3fc7fcba17f4ba07b92c9ce0ed3a025c9e3e0b9bcc77b784b5e377",
+                    "hash" : "0x3a0e81d25c3fc7fcba17f4ba07b92c9ce0ed3a025c9e3e0b9bcc77b784b5e377",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "3a0e81d25c3fc7fcba17f4ba07b92c9ce0ed3a025c9e3e0b9bcc77b784b5e377",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff417f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f098ba088881a64904570927a8618355560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "756682627"
+                "0x2d1a0f83"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest382.json b/GeneralStateTests/stRandom/randomStatetest382.json
index 4ffb06069..f0f8fd874 100644
--- a/GeneralStateTests/stRandom/randomStatetest382.json
+++ b/GeneralStateTests/stRandom/randomStatetest382.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest382" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "0fce8a4d998d02b8ba87e92ab5e5ab32192552eca0c477899b47c09a4c6bc3e9",
+                    "hash" : "0x0fce8a4d998d02b8ba87e92ab5e5ab32192552eca0c477899b47c09a4c6bc3e9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "0fce8a4d998d02b8ba87e92ab5e5ab32192552eca0c477899b47c09a4c6bc3e9",
+                    "hash" : "0x0fce8a4d998d02b8ba87e92ab5e5ab32192552eca0c477899b47c09a4c6bc3e9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "0fce8a4d998d02b8ba87e92ab5e5ab32192552eca0c477899b47c09a4c6bc3e9",
+                    "hash" : "0x0fce8a4d998d02b8ba87e92ab5e5ab32192552eca0c477899b47c09a4c6bc3e9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "0fce8a4d998d02b8ba87e92ab5e5ab32192552eca0c477899b47c09a4c6bc3e9",
+                    "hash" : "0x0fce8a4d998d02b8ba87e92ab5e5ab32192552eca0c477899b47c09a4c6bc3e9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0fce8a4d998d02b8ba87e92ab5e5ab32192552eca0c477899b47c09a4c6bc3e9",
+                    "hash" : "0x0fce8a4d998d02b8ba87e92ab5e5ab32192552eca0c477899b47c09a4c6bc3e9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "0fce8a4d998d02b8ba87e92ab5e5ab32192552eca0c477899b47c09a4c6bc3e9",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0855",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "883821556"
+                "0x34ae0bf4"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest383.json b/GeneralStateTests/stRandom/randomStatetest383.json
index 028e86a0d..bba60e2e6 100644
--- a/GeneralStateTests/stRandom/randomStatetest383.json
+++ b/GeneralStateTests/stRandom/randomStatetest383.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest383" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d3e870b4b6e45a9fed4ba0a886ca28c2cc0eb89ecdeb3e595918bd726002cf73",
+                    "hash" : "0xd3e870b4b6e45a9fed4ba0a886ca28c2cc0eb89ecdeb3e595918bd726002cf73",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d3e870b4b6e45a9fed4ba0a886ca28c2cc0eb89ecdeb3e595918bd726002cf73",
+                    "hash" : "0xd3e870b4b6e45a9fed4ba0a886ca28c2cc0eb89ecdeb3e595918bd726002cf73",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "d3e870b4b6e45a9fed4ba0a886ca28c2cc0eb89ecdeb3e595918bd726002cf73",
+                    "hash" : "0xd3e870b4b6e45a9fed4ba0a886ca28c2cc0eb89ecdeb3e595918bd726002cf73",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "d3e870b4b6e45a9fed4ba0a886ca28c2cc0eb89ecdeb3e595918bd726002cf73",
+                    "hash" : "0xd3e870b4b6e45a9fed4ba0a886ca28c2cc0eb89ecdeb3e595918bd726002cf73",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d3e870b4b6e45a9fed4ba0a886ca28c2cc0eb89ecdeb3e595918bd726002cf73",
+                    "hash" : "0xd3e870b4b6e45a9fed4ba0a886ca28c2cc0eb89ecdeb3e595918bd726002cf73",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "d3e870b4b6e45a9fed4ba0a886ca28c2cc0eb89ecdeb3e595918bd726002cf73",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09150255436c75107e",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1668923511"
+                "0x6379c077"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest384.json b/GeneralStateTests/stRandom/randomStatetest384.json
index 6f8acf518..18643bbab 100644
--- a/GeneralStateTests/stRandom/randomStatetest384.json
+++ b/GeneralStateTests/stRandom/randomStatetest384.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest384" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c72668f3c45d35c29f24c2874907ef438b16e2954c414a08325e412cd199a526",
+                    "hash" : "0xc72668f3c45d35c29f24c2874907ef438b16e2954c414a08325e412cd199a526",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c72668f3c45d35c29f24c2874907ef438b16e2954c414a08325e412cd199a526",
+                    "hash" : "0xc72668f3c45d35c29f24c2874907ef438b16e2954c414a08325e412cd199a526",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "c72668f3c45d35c29f24c2874907ef438b16e2954c414a08325e412cd199a526",
+                    "hash" : "0xc72668f3c45d35c29f24c2874907ef438b16e2954c414a08325e412cd199a526",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c72668f3c45d35c29f24c2874907ef438b16e2954c414a08325e412cd199a526",
+                    "hash" : "0xc72668f3c45d35c29f24c2874907ef438b16e2954c414a08325e412cd199a526",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c72668f3c45d35c29f24c2874907ef438b16e2954c414a08325e412cd199a526",
+                    "hash" : "0xc72668f3c45d35c29f24c2874907ef438b16e2954c414a08325e412cd199a526",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "c72668f3c45d35c29f24c2874907ef438b16e2954c414a08325e412cd199a526",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f16133502727c0a7f679b456df093576360005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "2066470732"
+                "0x7b2bd74c"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest385.json b/GeneralStateTests/stRandom/randomStatetest385.json
index 8d4696a3a..ef1af77f3 100644
--- a/GeneralStateTests/stRandom/randomStatetest385.json
+++ b/GeneralStateTests/stRandom/randomStatetest385.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest385" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c099377e52707e76b36c71d391f0e4d47de090e038aaec2ae73c5cd584a15e95",
+                    "hash" : "0xc099377e52707e76b36c71d391f0e4d47de090e038aaec2ae73c5cd584a15e95",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c099377e52707e76b36c71d391f0e4d47de090e038aaec2ae73c5cd584a15e95",
+                    "hash" : "0xc099377e52707e76b36c71d391f0e4d47de090e038aaec2ae73c5cd584a15e95",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "1b0a532a118d830d15b218ecca2266ab8d46ea478f52c757acaf547167043e00",
+                    "hash" : "0x1b0a532a118d830d15b218ecca2266ab8d46ea478f52c757acaf547167043e00",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "1b0a532a118d830d15b218ecca2266ab8d46ea478f52c757acaf547167043e00",
+                    "hash" : "0x1b0a532a118d830d15b218ecca2266ab8d46ea478f52c757acaf547167043e00",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c099377e52707e76b36c71d391f0e4d47de090e038aaec2ae73c5cd584a15e95",
+                    "hash" : "0xc099377e52707e76b36c71d391f0e4d47de090e038aaec2ae73c5cd584a15e95",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "1b0a532a118d830d15b218ecca2266ab8d46ea478f52c757acaf547167043e00",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5547f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f785188182063156955631a7a85093a5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "768381138"
+                "0x2dcc90d2"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest386.json b/GeneralStateTests/stRandom/randomStatetest386.json
index 409fd8c86..5add1df93 100644
--- a/GeneralStateTests/stRandom/randomStatetest386.json
+++ b/GeneralStateTests/stRandom/randomStatetest386.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest386" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "50e2af1155fb85652e8831e0bee5ad482a4d4ca1e5eb37320c4e9ed5dacb6ba1",
+                    "hash" : "0x50e2af1155fb85652e8831e0bee5ad482a4d4ca1e5eb37320c4e9ed5dacb6ba1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "50e2af1155fb85652e8831e0bee5ad482a4d4ca1e5eb37320c4e9ed5dacb6ba1",
+                    "hash" : "0x50e2af1155fb85652e8831e0bee5ad482a4d4ca1e5eb37320c4e9ed5dacb6ba1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "50e2af1155fb85652e8831e0bee5ad482a4d4ca1e5eb37320c4e9ed5dacb6ba1",
+                    "hash" : "0x50e2af1155fb85652e8831e0bee5ad482a4d4ca1e5eb37320c4e9ed5dacb6ba1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "50e2af1155fb85652e8831e0bee5ad482a4d4ca1e5eb37320c4e9ed5dacb6ba1",
+                    "hash" : "0x50e2af1155fb85652e8831e0bee5ad482a4d4ca1e5eb37320c4e9ed5dacb6ba1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "50e2af1155fb85652e8831e0bee5ad482a4d4ca1e5eb37320c4e9ed5dacb6ba1",
+                    "hash" : "0x50e2af1155fb85652e8831e0bee5ad482a4d4ca1e5eb37320c4e9ed5dacb6ba1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "50e2af1155fb85652e8831e0bee5ad482a4d4ca1e5eb37320c4e9ed5dacb6ba1",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff047f000000000000000000000000000000000000000000000000000000000000000105133641010b811160005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "433564740"
+                "0x19d7ac44"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest387.json b/GeneralStateTests/stRandom/randomStatetest387.json
index 05b2e1d68..23c8bfe06 100644
--- a/GeneralStateTests/stRandom/randomStatetest387.json
+++ b/GeneralStateTests/stRandom/randomStatetest387.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest387" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7a8213cd835a09716c205b55f6e6246197ac00db46791920e570f4c45d9fd804",
+                    "hash" : "0x7a8213cd835a09716c205b55f6e6246197ac00db46791920e570f4c45d9fd804",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7a8213cd835a09716c205b55f6e6246197ac00db46791920e570f4c45d9fd804",
+                    "hash" : "0x7a8213cd835a09716c205b55f6e6246197ac00db46791920e570f4c45d9fd804",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "7a8213cd835a09716c205b55f6e6246197ac00db46791920e570f4c45d9fd804",
+                    "hash" : "0x7a8213cd835a09716c205b55f6e6246197ac00db46791920e570f4c45d9fd804",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "7a8213cd835a09716c205b55f6e6246197ac00db46791920e570f4c45d9fd804",
+                    "hash" : "0x7a8213cd835a09716c205b55f6e6246197ac00db46791920e570f4c45d9fd804",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7a8213cd835a09716c205b55f6e6246197ac00db46791920e570f4c45d9fd804",
+                    "hash" : "0x7a8213cd835a09716c205b55f6e6246197ac00db46791920e570f4c45d9fd804",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "7a8213cd835a09716c205b55f6e6246197ac00db46791920e570f4c45d9fd804",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350617e7608617c95f3ff584076e07b5a4460005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1650737351"
+                "0x626440c7"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest388.json b/GeneralStateTests/stRandom/randomStatetest388.json
index 2a8e4efd5..673798ec3 100644
--- a/GeneralStateTests/stRandom/randomStatetest388.json
+++ b/GeneralStateTests/stRandom/randomStatetest388.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest388" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9cf51b1502d3a80607dc5c79398d264dde12159a880da85ecdac1e5c4b0f262a",
+                    "hash" : "0x9cf51b1502d3a80607dc5c79398d264dde12159a880da85ecdac1e5c4b0f262a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9cf51b1502d3a80607dc5c79398d264dde12159a880da85ecdac1e5c4b0f262a",
+                    "hash" : "0x9cf51b1502d3a80607dc5c79398d264dde12159a880da85ecdac1e5c4b0f262a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9cf51b1502d3a80607dc5c79398d264dde12159a880da85ecdac1e5c4b0f262a",
+                    "hash" : "0x9cf51b1502d3a80607dc5c79398d264dde12159a880da85ecdac1e5c4b0f262a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9cf51b1502d3a80607dc5c79398d264dde12159a880da85ecdac1e5c4b0f262a",
+                    "hash" : "0x9cf51b1502d3a80607dc5c79398d264dde12159a880da85ecdac1e5c4b0f262a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9cf51b1502d3a80607dc5c79398d264dde12159a880da85ecdac1e5c4b0f262a",
+                    "hash" : "0x9cf51b1502d3a80607dc5c79398d264dde12159a880da85ecdac1e5c4b0f262a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "9cf51b1502d3a80607dc5c79398d264dde12159a880da85ecdac1e5c4b0f262a",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5765b8f743b9979a0905b6a18916560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1175166777"
+                "0x460b9f39"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest389.json b/GeneralStateTests/stRandom/randomStatetest389.json
index a153d374e..a7d5cef14 100644
--- a/GeneralStateTests/stRandom/randomStatetest389.json
+++ b/GeneralStateTests/stRandom/randomStatetest389.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest389" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7f7c85b99d5319aa5f495d3b41a18bc4b7f37ada40511f3beb65b3513d8c964c",
+                    "hash" : "0x7f7c85b99d5319aa5f495d3b41a18bc4b7f37ada40511f3beb65b3513d8c964c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7f7c85b99d5319aa5f495d3b41a18bc4b7f37ada40511f3beb65b3513d8c964c",
+                    "hash" : "0x7f7c85b99d5319aa5f495d3b41a18bc4b7f37ada40511f3beb65b3513d8c964c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "d4ec65fdf642a75563b30e489ef2c55da2c2e7363d5a720bd8db57557025187e",
+                    "hash" : "0xd4ec65fdf642a75563b30e489ef2c55da2c2e7363d5a720bd8db57557025187e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "d4ec65fdf642a75563b30e489ef2c55da2c2e7363d5a720bd8db57557025187e",
+                    "hash" : "0xd4ec65fdf642a75563b30e489ef2c55da2c2e7363d5a720bd8db57557025187e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7f7c85b99d5319aa5f495d3b41a18bc4b7f37ada40511f3beb65b3513d8c964c",
+                    "hash" : "0x7f7c85b99d5319aa5f495d3b41a18bc4b7f37ada40511f3beb65b3513d8c964c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "d4ec65fdf642a75563b30e489ef2c55da2c2e7363d5a720bd8db57557025187e",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000427f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3503a86385458123760005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1542544795"
+                "0x5bf15d9b"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest39.json b/GeneralStateTests/stRandom/randomStatetest39.json
index 0d868c27d..fa9aa104c 100644
--- a/GeneralStateTests/stRandom/randomStatetest39.json
+++ b/GeneralStateTests/stRandom/randomStatetest39.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest39" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "5383b0c9ccf1a4e7b1ce537f127270d8a197322e8891282f07232591b0c885c3",
+                    "hash" : "0x5383b0c9ccf1a4e7b1ce537f127270d8a197322e8891282f07232591b0c885c3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "5383b0c9ccf1a4e7b1ce537f127270d8a197322e8891282f07232591b0c885c3",
+                    "hash" : "0x5383b0c9ccf1a4e7b1ce537f127270d8a197322e8891282f07232591b0c885c3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5383b0c9ccf1a4e7b1ce537f127270d8a197322e8891282f07232591b0c885c3",
+                    "hash" : "0x5383b0c9ccf1a4e7b1ce537f127270d8a197322e8891282f07232591b0c885c3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5383b0c9ccf1a4e7b1ce537f127270d8a197322e8891282f07232591b0c885c3",
+                    "hash" : "0x5383b0c9ccf1a4e7b1ce537f127270d8a197322e8891282f07232591b0c885c3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "5383b0c9ccf1a4e7b1ce537f127270d8a197322e8891282f07232591b0c885c3",
+                    "hash" : "0x5383b0c9ccf1a4e7b1ce537f127270d8a197322e8891282f07232591b0c885c3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "5383b0c9ccf1a4e7b1ce537f127270d8a197322e8891282f07232591b0c885c3",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff427f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe9604638ea2179a58035560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "272686139"
+                "0x1040dc3b"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest390.json b/GeneralStateTests/stRandom/randomStatetest390.json
index 5e1e82484..aac5b506d 100644
--- a/GeneralStateTests/stRandom/randomStatetest390.json
+++ b/GeneralStateTests/stRandom/randomStatetest390.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest390" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "3be74a20faaa1a94604e82b3fd9809372befde27ffa1ad3202e3734924d6cde2",
+                    "hash" : "0x3be74a20faaa1a94604e82b3fd9809372befde27ffa1ad3202e3734924d6cde2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "3be74a20faaa1a94604e82b3fd9809372befde27ffa1ad3202e3734924d6cde2",
+                    "hash" : "0x3be74a20faaa1a94604e82b3fd9809372befde27ffa1ad3202e3734924d6cde2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3be74a20faaa1a94604e82b3fd9809372befde27ffa1ad3202e3734924d6cde2",
+                    "hash" : "0x3be74a20faaa1a94604e82b3fd9809372befde27ffa1ad3202e3734924d6cde2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3be74a20faaa1a94604e82b3fd9809372befde27ffa1ad3202e3734924d6cde2",
+                    "hash" : "0x3be74a20faaa1a94604e82b3fd9809372befde27ffa1ad3202e3734924d6cde2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "3be74a20faaa1a94604e82b3fd9809372befde27ffa1ad3202e3734924d6cde2",
+                    "hash" : "0x3be74a20faaa1a94604e82b3fd9809372befde27ffa1ad3202e3734924d6cde2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "3be74a20faaa1a94604e82b3fd9809372befde27ffa1ad3202e3734924d6cde2",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000000000000000000000000000000000000000427fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff406f6c6b30816c7a0412415a0414179b635560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1541666665"
+                "0x5be3f769"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest391.json b/GeneralStateTests/stRandom/randomStatetest391.json
index 27f95e56a..573d53d19 100644
--- a/GeneralStateTests/stRandom/randomStatetest391.json
+++ b/GeneralStateTests/stRandom/randomStatetest391.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest391" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
             {
@@ -25,7 +25,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d41932342e522a55d398ef0188d456f78e0b58d0bf0312df291cf59941c19c13",
+                    "hash" : "0xd41932342e522a55d398ef0188d456f78e0b58d0bf0312df291cf59941c19c13",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -35,7 +35,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d41932342e522a55d398ef0188d456f78e0b58d0bf0312df291cf59941c19c13",
+                    "hash" : "0xd41932342e522a55d398ef0188d456f78e0b58d0bf0312df291cf59941c19c13",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -45,7 +45,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "686bc20702951e42d9d0269a9bb816679d0539ec598e3041af3fa815acb90d2c",
+                    "hash" : "0x686bc20702951e42d9d0269a9bb816679d0539ec598e3041af3fa815acb90d2c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -55,7 +55,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "686bc20702951e42d9d0269a9bb816679d0539ec598e3041af3fa815acb90d2c",
+                    "hash" : "0x686bc20702951e42d9d0269a9bb816679d0539ec598e3041af3fa815acb90d2c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,7 +65,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d41932342e522a55d398ef0188d456f78e0b58d0bf0312df291cf59941c19c13",
+                    "hash" : "0xd41932342e522a55d398ef0188d456f78e0b58d0bf0312df291cf59941c19c13",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -76,23 +76,23 @@
         },
         "postStateRoot" : "ebc5109105b629b75811290112a64b8e4748887e82af62ab3bdf88e33b4834d4",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x454143414543424131a4",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -103,14 +103,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest392.json b/GeneralStateTests/stRandom/randomStatetest392.json
index 955fcd03a..2aae645ef 100644
--- a/GeneralStateTests/stRandom/randomStatetest392.json
+++ b/GeneralStateTests/stRandom/randomStatetest392.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest392" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "fb1a602dd4eb1c7fdd7be4fb06c3a2a8c463f4983eeb58a45b3db23ee0feeb29",
+                    "hash" : "0xfb1a602dd4eb1c7fdd7be4fb06c3a2a8c463f4983eeb58a45b3db23ee0feeb29",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "fb1a602dd4eb1c7fdd7be4fb06c3a2a8c463f4983eeb58a45b3db23ee0feeb29",
+                    "hash" : "0xfb1a602dd4eb1c7fdd7be4fb06c3a2a8c463f4983eeb58a45b3db23ee0feeb29",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "25dd29f88a7ef16e94d304826fde5bbaa86a7fbf6677df2b0555d63c5563289d",
+                    "hash" : "0x25dd29f88a7ef16e94d304826fde5bbaa86a7fbf6677df2b0555d63c5563289d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "25dd29f88a7ef16e94d304826fde5bbaa86a7fbf6677df2b0555d63c5563289d",
+                    "hash" : "0x25dd29f88a7ef16e94d304826fde5bbaa86a7fbf6677df2b0555d63c5563289d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "fb1a602dd4eb1c7fdd7be4fb06c3a2a8c463f4983eeb58a45b3db23ee0feeb29",
+                    "hash" : "0xfb1a602dd4eb1c7fdd7be4fb06c3a2a8c463f4983eeb58a45b3db23ee0feeb29",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "591a753382903db2ec4acf2c749c6f473da62a988025c16d2bc2e90981f83e23",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x424061434444413155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest393.json b/GeneralStateTests/stRandom/randomStatetest393.json
index c07f3e0d6..2a6a6feb0 100644
--- a/GeneralStateTests/stRandom/randomStatetest393.json
+++ b/GeneralStateTests/stRandom/randomStatetest393.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest393" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "913792f777fb1b2537eef57d043131df032838d246b94ade5b4b33e8cb140412",
+                    "hash" : "0x913792f777fb1b2537eef57d043131df032838d246b94ade5b4b33e8cb140412",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "913792f777fb1b2537eef57d043131df032838d246b94ade5b4b33e8cb140412",
+                    "hash" : "0x913792f777fb1b2537eef57d043131df032838d246b94ade5b4b33e8cb140412",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "913792f777fb1b2537eef57d043131df032838d246b94ade5b4b33e8cb140412",
+                    "hash" : "0x913792f777fb1b2537eef57d043131df032838d246b94ade5b4b33e8cb140412",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "913792f777fb1b2537eef57d043131df032838d246b94ade5b4b33e8cb140412",
+                    "hash" : "0x913792f777fb1b2537eef57d043131df032838d246b94ade5b4b33e8cb140412",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "913792f777fb1b2537eef57d043131df032838d246b94ade5b4b33e8cb140412",
+                    "hash" : "0x913792f777fb1b2537eef57d043131df032838d246b94ade5b4b33e8cb140412",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "913792f777fb1b2537eef57d043131df032838d246b94ade5b4b33e8cb140412",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff20b39838f628b96846cff0455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "490453529"
+                "0x1d3bba19"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest394.json b/GeneralStateTests/stRandom/randomStatetest394.json
index c3dad1e35..3cf9ea4f5 100644
--- a/GeneralStateTests/stRandom/randomStatetest394.json
+++ b/GeneralStateTests/stRandom/randomStatetest394.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest394" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1d26a7ab5313803e81f6245501dc2c43f16d210d148a053d5f65cace9b941221",
+                    "hash" : "0x1d26a7ab5313803e81f6245501dc2c43f16d210d148a053d5f65cace9b941221",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "1d26a7ab5313803e81f6245501dc2c43f16d210d148a053d5f65cace9b941221",
+                    "hash" : "0x1d26a7ab5313803e81f6245501dc2c43f16d210d148a053d5f65cace9b941221",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "1d26a7ab5313803e81f6245501dc2c43f16d210d148a053d5f65cace9b941221",
+                    "hash" : "0x1d26a7ab5313803e81f6245501dc2c43f16d210d148a053d5f65cace9b941221",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "1d26a7ab5313803e81f6245501dc2c43f16d210d148a053d5f65cace9b941221",
+                    "hash" : "0x1d26a7ab5313803e81f6245501dc2c43f16d210d148a053d5f65cace9b941221",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "1d26a7ab5313803e81f6245501dc2c43f16d210d148a053d5f65cace9b941221",
+                    "hash" : "0x1d26a7ab5313803e81f6245501dc2c43f16d210d148a053d5f65cace9b941221",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "1d26a7ab5313803e81f6245501dc2c43f16d210d148a053d5f65cace9b941221",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x45415a42409140435a53821af355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest395.json b/GeneralStateTests/stRandom/randomStatetest395.json
index c647d29c3..85f1a720f 100644
--- a/GeneralStateTests/stRandom/randomStatetest395.json
+++ b/GeneralStateTests/stRandom/randomStatetest395.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest395" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "5db29c0affb30afc4d2d717cbaa2fc41b44793765b71a37a8c97c738ee9431c1",
+                    "hash" : "0x5db29c0affb30afc4d2d717cbaa2fc41b44793765b71a37a8c97c738ee9431c1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "5db29c0affb30afc4d2d717cbaa2fc41b44793765b71a37a8c97c738ee9431c1",
+                    "hash" : "0x5db29c0affb30afc4d2d717cbaa2fc41b44793765b71a37a8c97c738ee9431c1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5db29c0affb30afc4d2d717cbaa2fc41b44793765b71a37a8c97c738ee9431c1",
+                    "hash" : "0x5db29c0affb30afc4d2d717cbaa2fc41b44793765b71a37a8c97c738ee9431c1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5db29c0affb30afc4d2d717cbaa2fc41b44793765b71a37a8c97c738ee9431c1",
+                    "hash" : "0x5db29c0affb30afc4d2d717cbaa2fc41b44793765b71a37a8c97c738ee9431c1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "5db29c0affb30afc4d2d717cbaa2fc41b44793765b71a37a8c97c738ee9431c1",
+                    "hash" : "0x5db29c0affb30afc4d2d717cbaa2fc41b44793765b71a37a8c97c738ee9431c1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "5db29c0affb30afc4d2d717cbaa2fc41b44793765b71a37a8c97c738ee9431c1",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x447f0000000000000000000000000000000000000000000000000000000000000001417f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f823140710bf13990e4500136726d8b5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1520198127"
+                "0x5a9c61ef"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest396.json b/GeneralStateTests/stRandom/randomStatetest396.json
index 502a4834b..0f9d28447 100644
--- a/GeneralStateTests/stRandom/randomStatetest396.json
+++ b/GeneralStateTests/stRandom/randomStatetest396.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest396" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "03d2799b460b160c9f55e5b7e817535b133363d8eb548afffc359d8beeff6d41",
+                    "hash" : "0x03d2799b460b160c9f55e5b7e817535b133363d8eb548afffc359d8beeff6d41",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "03d2799b460b160c9f55e5b7e817535b133363d8eb548afffc359d8beeff6d41",
+                    "hash" : "0x03d2799b460b160c9f55e5b7e817535b133363d8eb548afffc359d8beeff6d41",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "03d2799b460b160c9f55e5b7e817535b133363d8eb548afffc359d8beeff6d41",
+                    "hash" : "0x03d2799b460b160c9f55e5b7e817535b133363d8eb548afffc359d8beeff6d41",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "03d2799b460b160c9f55e5b7e817535b133363d8eb548afffc359d8beeff6d41",
+                    "hash" : "0x03d2799b460b160c9f55e5b7e817535b133363d8eb548afffc359d8beeff6d41",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "03d2799b460b160c9f55e5b7e817535b133363d8eb548afffc359d8beeff6d41",
+                    "hash" : "0x03d2799b460b160c9f55e5b7e817535b133363d8eb548afffc359d8beeff6d41",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "03d2799b460b160c9f55e5b7e817535b133363d8eb548afffc359d8beeff6d41",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001719f197c5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,8 +96,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x4ca4d183"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest397.json b/GeneralStateTests/stRandom/randomStatetest397.json
index f4cbc7011..7a9c95a37 100644
--- a/GeneralStateTests/stRandom/randomStatetest397.json
+++ b/GeneralStateTests/stRandom/randomStatetest397.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest397" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "48c91e076cd24e5f58e55f430004dcf79c3edbcc1f65b79d990ffce5182bc572",
+                    "hash" : "0x48c91e076cd24e5f58e55f430004dcf79c3edbcc1f65b79d990ffce5182bc572",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "48c91e076cd24e5f58e55f430004dcf79c3edbcc1f65b79d990ffce5182bc572",
+                    "hash" : "0x48c91e076cd24e5f58e55f430004dcf79c3edbcc1f65b79d990ffce5182bc572",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "48c91e076cd24e5f58e55f430004dcf79c3edbcc1f65b79d990ffce5182bc572",
+                    "hash" : "0x48c91e076cd24e5f58e55f430004dcf79c3edbcc1f65b79d990ffce5182bc572",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "48c91e076cd24e5f58e55f430004dcf79c3edbcc1f65b79d990ffce5182bc572",
+                    "hash" : "0x48c91e076cd24e5f58e55f430004dcf79c3edbcc1f65b79d990ffce5182bc572",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "48c91e076cd24e5f58e55f430004dcf79c3edbcc1f65b79d990ffce5182bc572",
+                    "hash" : "0x48c91e076cd24e5f58e55f430004dcf79c3edbcc1f65b79d990ffce5182bc572",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "921517cc33b5f4267a76b110e54b0578754d4ffb748085d8b4ed4195ad2d0af9",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x413443f3404242433389ff723810",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest398.json b/GeneralStateTests/stRandom/randomStatetest398.json
index 5b2341b15..554b4e21f 100644
--- a/GeneralStateTests/stRandom/randomStatetest398.json
+++ b/GeneralStateTests/stRandom/randomStatetest398.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest398" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "dc86a470e1deaa6f5d319ee7c1016da9f8192a192c71b19c2a01c33a82751d1d",
+                    "hash" : "0xdc86a470e1deaa6f5d319ee7c1016da9f8192a192c71b19c2a01c33a82751d1d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "dc86a470e1deaa6f5d319ee7c1016da9f8192a192c71b19c2a01c33a82751d1d",
+                    "hash" : "0xdc86a470e1deaa6f5d319ee7c1016da9f8192a192c71b19c2a01c33a82751d1d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "dc86a470e1deaa6f5d319ee7c1016da9f8192a192c71b19c2a01c33a82751d1d",
+                    "hash" : "0xdc86a470e1deaa6f5d319ee7c1016da9f8192a192c71b19c2a01c33a82751d1d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "dc86a470e1deaa6f5d319ee7c1016da9f8192a192c71b19c2a01c33a82751d1d",
+                    "hash" : "0xdc86a470e1deaa6f5d319ee7c1016da9f8192a192c71b19c2a01c33a82751d1d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "dc86a470e1deaa6f5d319ee7c1016da9f8192a192c71b19c2a01c33a82751d1d",
+                    "hash" : "0xdc86a470e1deaa6f5d319ee7c1016da9f8192a192c71b19c2a01c33a82751d1d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "dc86a470e1deaa6f5d319ee7c1016da9f8192a192c71b19c2a01c33a82751d1d",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b56f3781413b695a69079d7f51058292075560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "110765790"
+                "0x069a26de"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest399.json b/GeneralStateTests/stRandom/randomStatetest399.json
index edc16fa16..30347aa68 100644
--- a/GeneralStateTests/stRandom/randomStatetest399.json
+++ b/GeneralStateTests/stRandom/randomStatetest399.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest399" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d40e134865236b60c77d5ee5d4a8ca45e30e9fbc4eaad3b0be0d9de0b1dc711c",
+                    "hash" : "0xd40e134865236b60c77d5ee5d4a8ca45e30e9fbc4eaad3b0be0d9de0b1dc711c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d40e134865236b60c77d5ee5d4a8ca45e30e9fbc4eaad3b0be0d9de0b1dc711c",
+                    "hash" : "0xd40e134865236b60c77d5ee5d4a8ca45e30e9fbc4eaad3b0be0d9de0b1dc711c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "d40e134865236b60c77d5ee5d4a8ca45e30e9fbc4eaad3b0be0d9de0b1dc711c",
+                    "hash" : "0xd40e134865236b60c77d5ee5d4a8ca45e30e9fbc4eaad3b0be0d9de0b1dc711c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "d40e134865236b60c77d5ee5d4a8ca45e30e9fbc4eaad3b0be0d9de0b1dc711c",
+                    "hash" : "0xd40e134865236b60c77d5ee5d4a8ca45e30e9fbc4eaad3b0be0d9de0b1dc711c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d40e134865236b60c77d5ee5d4a8ca45e30e9fbc4eaad3b0be0d9de0b1dc711c",
+                    "hash" : "0xd40e134865236b60c77d5ee5d4a8ca45e30e9fbc4eaad3b0be0d9de0b1dc711c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "d40e134865236b60c77d5ee5d4a8ca45e30e9fbc4eaad3b0be0d9de0b1dc711c",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe4544437f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f98324016076d428a9898129b16849a5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "546942842"
+                "0x2099af7a"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest4.json b/GeneralStateTests/stRandom/randomStatetest4.json
index 2be73eca1..852871dc7 100644
--- a/GeneralStateTests/stRandom/randomStatetest4.json
+++ b/GeneralStateTests/stRandom/randomStatetest4.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest4" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7a8213cd835a09716c205b55f6e6246197ac00db46791920e570f4c45d9fd804",
+                    "hash" : "0x7a8213cd835a09716c205b55f6e6246197ac00db46791920e570f4c45d9fd804",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7a8213cd835a09716c205b55f6e6246197ac00db46791920e570f4c45d9fd804",
+                    "hash" : "0x7a8213cd835a09716c205b55f6e6246197ac00db46791920e570f4c45d9fd804",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "7a8213cd835a09716c205b55f6e6246197ac00db46791920e570f4c45d9fd804",
+                    "hash" : "0x7a8213cd835a09716c205b55f6e6246197ac00db46791920e570f4c45d9fd804",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "7a8213cd835a09716c205b55f6e6246197ac00db46791920e570f4c45d9fd804",
+                    "hash" : "0x7a8213cd835a09716c205b55f6e6246197ac00db46791920e570f4c45d9fd804",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7a8213cd835a09716c205b55f6e6246197ac00db46791920e570f4c45d9fd804",
+                    "hash" : "0x7a8213cd835a09716c205b55f6e6246197ac00db46791920e570f4c45d9fd804",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "7a8213cd835a09716c205b55f6e6246197ac00db46791920e570f4c45d9fd804",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350617e7608617c95f3ff584076e07b5a4460005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1650737351"
+                "0x626440c7"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest40.json b/GeneralStateTests/stRandom/randomStatetest40.json
index 789169734..b9d6ae313 100644
--- a/GeneralStateTests/stRandom/randomStatetest40.json
+++ b/GeneralStateTests/stRandom/randomStatetest40.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest40" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "19537590f62fd528e95e743f90c4d892e02e0ff0795b9bcf83120b9f5fcd481f",
+                    "hash" : "0x19537590f62fd528e95e743f90c4d892e02e0ff0795b9bcf83120b9f5fcd481f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "19537590f62fd528e95e743f90c4d892e02e0ff0795b9bcf83120b9f5fcd481f",
+                    "hash" : "0x19537590f62fd528e95e743f90c4d892e02e0ff0795b9bcf83120b9f5fcd481f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "19537590f62fd528e95e743f90c4d892e02e0ff0795b9bcf83120b9f5fcd481f",
+                    "hash" : "0x19537590f62fd528e95e743f90c4d892e02e0ff0795b9bcf83120b9f5fcd481f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "19537590f62fd528e95e743f90c4d892e02e0ff0795b9bcf83120b9f5fcd481f",
+                    "hash" : "0x19537590f62fd528e95e743f90c4d892e02e0ff0795b9bcf83120b9f5fcd481f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "19537590f62fd528e95e743f90c4d892e02e0ff0795b9bcf83120b9f5fcd481f",
+                    "hash" : "0x19537590f62fd528e95e743f90c4d892e02e0ff0795b9bcf83120b9f5fcd481f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "19537590f62fd528e95e743f90c4d892e02e0ff0795b9bcf83120b9f5fcd481f",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff403760005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "899818597"
+                "0x35a22465"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest400.json b/GeneralStateTests/stRandom/randomStatetest400.json
index 926eb50cf..d8858d167 100644
--- a/GeneralStateTests/stRandom/randomStatetest400.json
+++ b/GeneralStateTests/stRandom/randomStatetest400.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest400" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "3391e3f5a321b277b2a0342090f48c8137ed1a304fe1d97ec66e115796b02020",
+                    "hash" : "0x3391e3f5a321b277b2a0342090f48c8137ed1a304fe1d97ec66e115796b02020",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "3391e3f5a321b277b2a0342090f48c8137ed1a304fe1d97ec66e115796b02020",
+                    "hash" : "0x3391e3f5a321b277b2a0342090f48c8137ed1a304fe1d97ec66e115796b02020",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3391e3f5a321b277b2a0342090f48c8137ed1a304fe1d97ec66e115796b02020",
+                    "hash" : "0x3391e3f5a321b277b2a0342090f48c8137ed1a304fe1d97ec66e115796b02020",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3391e3f5a321b277b2a0342090f48c8137ed1a304fe1d97ec66e115796b02020",
+                    "hash" : "0x3391e3f5a321b277b2a0342090f48c8137ed1a304fe1d97ec66e115796b02020",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "3391e3f5a321b277b2a0342090f48c8137ed1a304fe1d97ec66e115796b02020",
+                    "hash" : "0x3391e3f5a321b277b2a0342090f48c8137ed1a304fe1d97ec66e115796b02020",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "3391e3f5a321b277b2a0342090f48c8137ed1a304fe1d97ec66e115796b02020",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe407f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000006f945442a01208626f86ad8f8b1701605560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1165692042"
+                "0x457b0c8a"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest401.json b/GeneralStateTests/stRandom/randomStatetest401.json
index 3f12dbbbc..89b19c986 100644
--- a/GeneralStateTests/stRandom/randomStatetest401.json
+++ b/GeneralStateTests/stRandom/randomStatetest401.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest401" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "4e4defc8cf2721933e6cfe6a9caf3e245d6bef80f17d0dcc7c4de5a5ecfe905f",
+                    "hash" : "0x4e4defc8cf2721933e6cfe6a9caf3e245d6bef80f17d0dcc7c4de5a5ecfe905f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "4e4defc8cf2721933e6cfe6a9caf3e245d6bef80f17d0dcc7c4de5a5ecfe905f",
+                    "hash" : "0x4e4defc8cf2721933e6cfe6a9caf3e245d6bef80f17d0dcc7c4de5a5ecfe905f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5c9b979f87462dd87963b4ffd16aea0840b81ea4cc6b6d7f19a7241d1c4b54e8",
+                    "hash" : "0x5c9b979f87462dd87963b4ffd16aea0840b81ea4cc6b6d7f19a7241d1c4b54e8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5c9b979f87462dd87963b4ffd16aea0840b81ea4cc6b6d7f19a7241d1c4b54e8",
+                    "hash" : "0x5c9b979f87462dd87963b4ffd16aea0840b81ea4cc6b6d7f19a7241d1c4b54e8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "4e4defc8cf2721933e6cfe6a9caf3e245d6bef80f17d0dcc7c4de5a5ecfe905f",
+                    "hash" : "0x4e4defc8cf2721933e6cfe6a9caf3e245d6bef80f17d0dcc7c4de5a5ecfe905f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "5c9b979f87462dd87963b4ffd16aea0840b81ea4cc6b6d7f19a7241d1c4b54e8",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c35044427f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5ff60005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "588192910"
+                "0x230f1c8e"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest402.json b/GeneralStateTests/stRandom/randomStatetest402.json
index 42b85f953..1df6a7710 100644
--- a/GeneralStateTests/stRandom/randomStatetest402.json
+++ b/GeneralStateTests/stRandom/randomStatetest402.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest402" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "0cf75cab1dfb6832b8df06726838748e766e31824d2487a08dd87360905fd990",
+                    "hash" : "0x0cf75cab1dfb6832b8df06726838748e766e31824d2487a08dd87360905fd990",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "0cf75cab1dfb6832b8df06726838748e766e31824d2487a08dd87360905fd990",
+                    "hash" : "0x0cf75cab1dfb6832b8df06726838748e766e31824d2487a08dd87360905fd990",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "0cf75cab1dfb6832b8df06726838748e766e31824d2487a08dd87360905fd990",
+                    "hash" : "0x0cf75cab1dfb6832b8df06726838748e766e31824d2487a08dd87360905fd990",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "0cf75cab1dfb6832b8df06726838748e766e31824d2487a08dd87360905fd990",
+                    "hash" : "0x0cf75cab1dfb6832b8df06726838748e766e31824d2487a08dd87360905fd990",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0cf75cab1dfb6832b8df06726838748e766e31824d2487a08dd87360905fd990",
+                    "hash" : "0x0cf75cab1dfb6832b8df06726838748e766e31824d2487a08dd87360905fd990",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "0cf75cab1dfb6832b8df06726838748e766e31824d2487a08dd87360905fd990",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff437f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000006f62138c87028162ea32a2db7e3010045560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "938198850"
+                "0x37ebc742"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest403.json b/GeneralStateTests/stRandom/randomStatetest403.json
index 5e2fb587a..d4c171cb5 100644
--- a/GeneralStateTests/stRandom/randomStatetest403.json
+++ b/GeneralStateTests/stRandom/randomStatetest403.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest403" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c4fa934b948011a08e4149d5e881716419f46edb0292246c95cde0a21ad626a8",
+                    "hash" : "0xc4fa934b948011a08e4149d5e881716419f46edb0292246c95cde0a21ad626a8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "ff5b28242cf7f16a5ebf279c2e8c4e3f7ed7c15c62d58333d9c1a7943b885c00",
+                    "hash" : "0xff5b28242cf7f16a5ebf279c2e8c4e3f7ed7c15c62d58333d9c1a7943b885c00",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "c4fa934b948011a08e4149d5e881716419f46edb0292246c95cde0a21ad626a8",
+                    "hash" : "0xc4fa934b948011a08e4149d5e881716419f46edb0292246c95cde0a21ad626a8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c4fa934b948011a08e4149d5e881716419f46edb0292246c95cde0a21ad626a8",
+                    "hash" : "0xc4fa934b948011a08e4149d5e881716419f46edb0292246c95cde0a21ad626a8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "ff5b28242cf7f16a5ebf279c2e8c4e3f7ed7c15c62d58333d9c1a7943b885c00",
+                    "hash" : "0xff5b28242cf7f16a5ebf279c2e8c4e3f7ed7c15c62d58333d9c1a7943b885c00",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "d6f1cabd73ae571074e9b2f5afb893192abf14a41694b2df2c27e545604d1623",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x36416045454040410a922055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest404.json b/GeneralStateTests/stRandom/randomStatetest404.json
index 63cf18bc0..a70c25804 100644
--- a/GeneralStateTests/stRandom/randomStatetest404.json
+++ b/GeneralStateTests/stRandom/randomStatetest404.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest404" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e8dbd20c0ca9c7daab8dc415e43f312f4fcd38b250500f7b66ba86ae5b7270a6",
+                    "hash" : "0xe8dbd20c0ca9c7daab8dc415e43f312f4fcd38b250500f7b66ba86ae5b7270a6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e8dbd20c0ca9c7daab8dc415e43f312f4fcd38b250500f7b66ba86ae5b7270a6",
+                    "hash" : "0xe8dbd20c0ca9c7daab8dc415e43f312f4fcd38b250500f7b66ba86ae5b7270a6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e8dbd20c0ca9c7daab8dc415e43f312f4fcd38b250500f7b66ba86ae5b7270a6",
+                    "hash" : "0xe8dbd20c0ca9c7daab8dc415e43f312f4fcd38b250500f7b66ba86ae5b7270a6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e8dbd20c0ca9c7daab8dc415e43f312f4fcd38b250500f7b66ba86ae5b7270a6",
+                    "hash" : "0xe8dbd20c0ca9c7daab8dc415e43f312f4fcd38b250500f7b66ba86ae5b7270a6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e8dbd20c0ca9c7daab8dc415e43f312f4fcd38b250500f7b66ba86ae5b7270a6",
+                    "hash" : "0xe8dbd20c0ca9c7daab8dc415e43f312f4fcd38b250500f7b66ba86ae5b7270a6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "e8dbd20c0ca9c7daab8dc415e43f312f4fcd38b250500f7b66ba86ae5b7270a6",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6a7f0000000000000000000000000000000000000000000000000000000000000000907f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff906606425655",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "108687806"
+                "0x067a71be"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest405.json b/GeneralStateTests/stRandom/randomStatetest405.json
index 1be2b69f7..2003f8638 100644
--- a/GeneralStateTests/stRandom/randomStatetest405.json
+++ b/GeneralStateTests/stRandom/randomStatetest405.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest405" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "13669b049ed0e7ef122e0d8df02524728ffbcdb5d19608036f6e9b76316490ec",
+                    "hash" : "0x13669b049ed0e7ef122e0d8df02524728ffbcdb5d19608036f6e9b76316490ec",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "13669b049ed0e7ef122e0d8df02524728ffbcdb5d19608036f6e9b76316490ec",
+                    "hash" : "0x13669b049ed0e7ef122e0d8df02524728ffbcdb5d19608036f6e9b76316490ec",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "13669b049ed0e7ef122e0d8df02524728ffbcdb5d19608036f6e9b76316490ec",
+                    "hash" : "0x13669b049ed0e7ef122e0d8df02524728ffbcdb5d19608036f6e9b76316490ec",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "13669b049ed0e7ef122e0d8df02524728ffbcdb5d19608036f6e9b76316490ec",
+                    "hash" : "0x13669b049ed0e7ef122e0d8df02524728ffbcdb5d19608036f6e9b76316490ec",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "13669b049ed0e7ef122e0d8df02524728ffbcdb5d19608036f6e9b76316490ec",
+                    "hash" : "0x13669b049ed0e7ef122e0d8df02524728ffbcdb5d19608036f6e9b76316490ec",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "13669b049ed0e7ef122e0d8df02524728ffbcdb5d19608036f6e9b76316490ec",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff44457f0000000000000000000000010000000000000000000000000000000000000000037ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f318d0707977199361171756f6d458e5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "274296751"
+                "0x10596faf"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest406.json b/GeneralStateTests/stRandom/randomStatetest406.json
index f98c6cae9..d8311ece9 100644
--- a/GeneralStateTests/stRandom/randomStatetest406.json
+++ b/GeneralStateTests/stRandom/randomStatetest406.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest406" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "5b3d7a170b017a92657d047bc8559cd1320bea23fa11f91bfbec6aa130baa51e",
+                    "hash" : "0x5b3d7a170b017a92657d047bc8559cd1320bea23fa11f91bfbec6aa130baa51e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "5b3d7a170b017a92657d047bc8559cd1320bea23fa11f91bfbec6aa130baa51e",
+                    "hash" : "0x5b3d7a170b017a92657d047bc8559cd1320bea23fa11f91bfbec6aa130baa51e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5b3d7a170b017a92657d047bc8559cd1320bea23fa11f91bfbec6aa130baa51e",
+                    "hash" : "0x5b3d7a170b017a92657d047bc8559cd1320bea23fa11f91bfbec6aa130baa51e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5b3d7a170b017a92657d047bc8559cd1320bea23fa11f91bfbec6aa130baa51e",
+                    "hash" : "0x5b3d7a170b017a92657d047bc8559cd1320bea23fa11f91bfbec6aa130baa51e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "5b3d7a170b017a92657d047bc8559cd1320bea23fa11f91bfbec6aa130baa51e",
+                    "hash" : "0x5b3d7a170b017a92657d047bc8559cd1320bea23fa11f91bfbec6aa130baa51e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "5b3d7a170b017a92657d047bc8559cd1320bea23fa11f91bfbec6aa130baa51e",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b58b8e99f33c647165337e389f7b9c909cba5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1160230573"
+                "0x4527b6ad"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest407.json b/GeneralStateTests/stRandom/randomStatetest407.json
index 6f773a3bd..2747f5b9f 100644
--- a/GeneralStateTests/stRandom/randomStatetest407.json
+++ b/GeneralStateTests/stRandom/randomStatetest407.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest407" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "5fd926e9068346eed68c4931137dc6f50b367e3d97c0ba0b73303d2ec858dc93",
+                    "hash" : "0x5fd926e9068346eed68c4931137dc6f50b367e3d97c0ba0b73303d2ec858dc93",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "5fd926e9068346eed68c4931137dc6f50b367e3d97c0ba0b73303d2ec858dc93",
+                    "hash" : "0x5fd926e9068346eed68c4931137dc6f50b367e3d97c0ba0b73303d2ec858dc93",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5fd926e9068346eed68c4931137dc6f50b367e3d97c0ba0b73303d2ec858dc93",
+                    "hash" : "0x5fd926e9068346eed68c4931137dc6f50b367e3d97c0ba0b73303d2ec858dc93",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5fd926e9068346eed68c4931137dc6f50b367e3d97c0ba0b73303d2ec858dc93",
+                    "hash" : "0x5fd926e9068346eed68c4931137dc6f50b367e3d97c0ba0b73303d2ec858dc93",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "5fd926e9068346eed68c4931137dc6f50b367e3d97c0ba0b73303d2ec858dc93",
+                    "hash" : "0x5fd926e9068346eed68c4931137dc6f50b367e3d97c0ba0b73303d2ec858dc93",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "5fd926e9068346eed68c4931137dc6f50b367e3d97c0ba0b73303d2ec858dc93",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff437ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c350437f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b56f6d71656f054471181163037902615b5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "825575416"
+                "0x313547f8"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest408.json b/GeneralStateTests/stRandom/randomStatetest408.json
index 1bb496ebb..ff21de6dc 100644
--- a/GeneralStateTests/stRandom/randomStatetest408.json
+++ b/GeneralStateTests/stRandom/randomStatetest408.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest408" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c79d6c35a7ac2f985201476e6fc4eb6df6e97d04afaeeca553433e2240b18541",
+                    "hash" : "0xc79d6c35a7ac2f985201476e6fc4eb6df6e97d04afaeeca553433e2240b18541",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c79d6c35a7ac2f985201476e6fc4eb6df6e97d04afaeeca553433e2240b18541",
+                    "hash" : "0xc79d6c35a7ac2f985201476e6fc4eb6df6e97d04afaeeca553433e2240b18541",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "c79d6c35a7ac2f985201476e6fc4eb6df6e97d04afaeeca553433e2240b18541",
+                    "hash" : "0xc79d6c35a7ac2f985201476e6fc4eb6df6e97d04afaeeca553433e2240b18541",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c79d6c35a7ac2f985201476e6fc4eb6df6e97d04afaeeca553433e2240b18541",
+                    "hash" : "0xc79d6c35a7ac2f985201476e6fc4eb6df6e97d04afaeeca553433e2240b18541",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c79d6c35a7ac2f985201476e6fc4eb6df6e97d04afaeeca553433e2240b18541",
+                    "hash" : "0xc79d6c35a7ac2f985201476e6fc4eb6df6e97d04afaeeca553433e2240b18541",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "c79d6c35a7ac2f985201476e6fc4eb6df6e97d04afaeeca553433e2240b18541",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe447f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f80656e8e6478946a323482135a8bf75560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1672298879"
+                "0x63ad417f"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest409.json b/GeneralStateTests/stRandom/randomStatetest409.json
index be81517dd..455643836 100644
--- a/GeneralStateTests/stRandom/randomStatetest409.json
+++ b/GeneralStateTests/stRandom/randomStatetest409.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest409" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "48054fd1e6d8d82022d7db5efa05905a8cb4d73a47d702980f6d99875b90561f",
+                    "hash" : "0x48054fd1e6d8d82022d7db5efa05905a8cb4d73a47d702980f6d99875b90561f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "48054fd1e6d8d82022d7db5efa05905a8cb4d73a47d702980f6d99875b90561f",
+                    "hash" : "0x48054fd1e6d8d82022d7db5efa05905a8cb4d73a47d702980f6d99875b90561f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a3642c82242785b6ad9f88ff2420270c180517642c440708af090ac159cc0178",
+                    "hash" : "0xa3642c82242785b6ad9f88ff2420270c180517642c440708af090ac159cc0178",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a3642c82242785b6ad9f88ff2420270c180517642c440708af090ac159cc0178",
+                    "hash" : "0xa3642c82242785b6ad9f88ff2420270c180517642c440708af090ac159cc0178",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "48054fd1e6d8d82022d7db5efa05905a8cb4d73a47d702980f6d99875b90561f",
+                    "hash" : "0x48054fd1e6d8d82022d7db5efa05905a8cb4d73a47d702980f6d99875b90561f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "a3642c82242785b6ad9f88ff2420270c180517642c440708af090ac159cc0178",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x5b7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000001000000000000000000000000000000000000000009ff511287868833063aa3579d8e585560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1090686083"
+                "0x41028c83"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest41.json b/GeneralStateTests/stRandom/randomStatetest41.json
index 29d515121..474d7fabe 100644
--- a/GeneralStateTests/stRandom/randomStatetest41.json
+++ b/GeneralStateTests/stRandom/randomStatetest41.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest41" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9dbd196eaab53d90b7c8d17bac0fd4dfcaa2876ceddf29cd5aae323305058730",
+                    "hash" : "0x9dbd196eaab53d90b7c8d17bac0fd4dfcaa2876ceddf29cd5aae323305058730",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9dbd196eaab53d90b7c8d17bac0fd4dfcaa2876ceddf29cd5aae323305058730",
+                    "hash" : "0x9dbd196eaab53d90b7c8d17bac0fd4dfcaa2876ceddf29cd5aae323305058730",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9dbd196eaab53d90b7c8d17bac0fd4dfcaa2876ceddf29cd5aae323305058730",
+                    "hash" : "0x9dbd196eaab53d90b7c8d17bac0fd4dfcaa2876ceddf29cd5aae323305058730",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9dbd196eaab53d90b7c8d17bac0fd4dfcaa2876ceddf29cd5aae323305058730",
+                    "hash" : "0x9dbd196eaab53d90b7c8d17bac0fd4dfcaa2876ceddf29cd5aae323305058730",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9dbd196eaab53d90b7c8d17bac0fd4dfcaa2876ceddf29cd5aae323305058730",
+                    "hash" : "0x9dbd196eaab53d90b7c8d17bac0fd4dfcaa2876ceddf29cd5aae323305058730",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "9dbd196eaab53d90b7c8d17bac0fd4dfcaa2876ceddf29cd5aae323305058730",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350517f0000000000000000000000010000000000000000000000000000000000000000417f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b56a84a10719a1786a6510349b028255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "78505988"
+                "0x04ade804"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest410.json b/GeneralStateTests/stRandom/randomStatetest410.json
index 128128327..6d44c4250 100644
--- a/GeneralStateTests/stRandom/randomStatetest410.json
+++ b/GeneralStateTests/stRandom/randomStatetest410.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest410" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "cb0b378007773f83910fc6d961638b346e88bd701d4bb53909f668245000c803",
+                    "hash" : "0xcb0b378007773f83910fc6d961638b346e88bd701d4bb53909f668245000c803",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "cb0b378007773f83910fc6d961638b346e88bd701d4bb53909f668245000c803",
+                    "hash" : "0xcb0b378007773f83910fc6d961638b346e88bd701d4bb53909f668245000c803",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "cb0b378007773f83910fc6d961638b346e88bd701d4bb53909f668245000c803",
+                    "hash" : "0xcb0b378007773f83910fc6d961638b346e88bd701d4bb53909f668245000c803",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "cb0b378007773f83910fc6d961638b346e88bd701d4bb53909f668245000c803",
+                    "hash" : "0xcb0b378007773f83910fc6d961638b346e88bd701d4bb53909f668245000c803",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "cb0b378007773f83910fc6d961638b346e88bd701d4bb53909f668245000c803",
+                    "hash" : "0xcb0b378007773f83910fc6d961638b346e88bd701d4bb53909f668245000c803",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "cb0b378007773f83910fc6d961638b346e88bd701d4bb53909f668245000c803",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5417f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000045086201771880f35560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1969973721"
+                "0x756b69d9"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest411.json b/GeneralStateTests/stRandom/randomStatetest411.json
index f59ab8ba7..af4c7bb62 100644
--- a/GeneralStateTests/stRandom/randomStatetest411.json
+++ b/GeneralStateTests/stRandom/randomStatetest411.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest411" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "adc5c1d004f4e4bbe97cc81d123cc14a13a8dc9976cae32cbe141d22371485a8",
+                    "hash" : "0xadc5c1d004f4e4bbe97cc81d123cc14a13a8dc9976cae32cbe141d22371485a8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "adc5c1d004f4e4bbe97cc81d123cc14a13a8dc9976cae32cbe141d22371485a8",
+                    "hash" : "0xadc5c1d004f4e4bbe97cc81d123cc14a13a8dc9976cae32cbe141d22371485a8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "adc5c1d004f4e4bbe97cc81d123cc14a13a8dc9976cae32cbe141d22371485a8",
+                    "hash" : "0xadc5c1d004f4e4bbe97cc81d123cc14a13a8dc9976cae32cbe141d22371485a8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "adc5c1d004f4e4bbe97cc81d123cc14a13a8dc9976cae32cbe141d22371485a8",
+                    "hash" : "0xadc5c1d004f4e4bbe97cc81d123cc14a13a8dc9976cae32cbe141d22371485a8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "adc5c1d004f4e4bbe97cc81d123cc14a13a8dc9976cae32cbe141d22371485a8",
+                    "hash" : "0xadc5c1d004f4e4bbe97cc81d123cc14a13a8dc9976cae32cbe141d22371485a8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "adc5c1d004f4e4bbe97cc81d123cc14a13a8dc9976cae32cbe141d22371485a8",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f44a17892738b6895619d7a93507d649d60005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "2119897718"
+                "0x7e5b1276"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest412.json b/GeneralStateTests/stRandom/randomStatetest412.json
index 1c61eecf2..3e0fe6ccb 100644
--- a/GeneralStateTests/stRandom/randomStatetest412.json
+++ b/GeneralStateTests/stRandom/randomStatetest412.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest412" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b6f2b83d7d011223530fd68eca045c15f14695912c333d9b527f57691baf9933",
+                    "hash" : "0xb6f2b83d7d011223530fd68eca045c15f14695912c333d9b527f57691baf9933",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b6f2b83d7d011223530fd68eca045c15f14695912c333d9b527f57691baf9933",
+                    "hash" : "0xb6f2b83d7d011223530fd68eca045c15f14695912c333d9b527f57691baf9933",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b6f2b83d7d011223530fd68eca045c15f14695912c333d9b527f57691baf9933",
+                    "hash" : "0xb6f2b83d7d011223530fd68eca045c15f14695912c333d9b527f57691baf9933",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b6f2b83d7d011223530fd68eca045c15f14695912c333d9b527f57691baf9933",
+                    "hash" : "0xb6f2b83d7d011223530fd68eca045c15f14695912c333d9b527f57691baf9933",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b6f2b83d7d011223530fd68eca045c15f14695912c333d9b527f57691baf9933",
+                    "hash" : "0xb6f2b83d7d011223530fd68eca045c15f14695912c333d9b527f57691baf9933",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "b6f2b83d7d011223530fd68eca045c15f14695912c333d9b527f57691baf9933",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6fa46ef06a5a858b9742198a37e1153c5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "123532973"
+                "0x075cf6ad"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest413.json b/GeneralStateTests/stRandom/randomStatetest413.json
index 7f78dca2a..2365e9aed 100644
--- a/GeneralStateTests/stRandom/randomStatetest413.json
+++ b/GeneralStateTests/stRandom/randomStatetest413.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest413" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "8595f9353b25b446f86f9d81ad2174b1382b25f87c185e792377d2e7119a8ddf",
+                    "hash" : "0x8595f9353b25b446f86f9d81ad2174b1382b25f87c185e792377d2e7119a8ddf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "8595f9353b25b446f86f9d81ad2174b1382b25f87c185e792377d2e7119a8ddf",
+                    "hash" : "0x8595f9353b25b446f86f9d81ad2174b1382b25f87c185e792377d2e7119a8ddf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "8595f9353b25b446f86f9d81ad2174b1382b25f87c185e792377d2e7119a8ddf",
+                    "hash" : "0x8595f9353b25b446f86f9d81ad2174b1382b25f87c185e792377d2e7119a8ddf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "8595f9353b25b446f86f9d81ad2174b1382b25f87c185e792377d2e7119a8ddf",
+                    "hash" : "0x8595f9353b25b446f86f9d81ad2174b1382b25f87c185e792377d2e7119a8ddf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "8595f9353b25b446f86f9d81ad2174b1382b25f87c185e792377d2e7119a8ddf",
+                    "hash" : "0x8595f9353b25b446f86f9d81ad2174b1382b25f87c185e792377d2e7119a8ddf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "8595f9353b25b446f86f9d81ad2174b1382b25f87c185e792377d2e7119a8ddf",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000010000000000000000000000000000000000000000817ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe037f00000000000000000000000000000000000000000000000000000000000000016f086e2055149345ad1a018b063708145560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1206033425"
+                "0x47e29c11"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest414.json b/GeneralStateTests/stRandom/randomStatetest414.json
index e632a8b4c..096141d5b 100644
--- a/GeneralStateTests/stRandom/randomStatetest414.json
+++ b/GeneralStateTests/stRandom/randomStatetest414.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest414" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "dab455db73ff719b0c2c947098879612bd577d7d600a849526ef17dde23bbfc8",
+                    "hash" : "0xdab455db73ff719b0c2c947098879612bd577d7d600a849526ef17dde23bbfc8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "dab455db73ff719b0c2c947098879612bd577d7d600a849526ef17dde23bbfc8",
+                    "hash" : "0xdab455db73ff719b0c2c947098879612bd577d7d600a849526ef17dde23bbfc8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "dab455db73ff719b0c2c947098879612bd577d7d600a849526ef17dde23bbfc8",
+                    "hash" : "0xdab455db73ff719b0c2c947098879612bd577d7d600a849526ef17dde23bbfc8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "dab455db73ff719b0c2c947098879612bd577d7d600a849526ef17dde23bbfc8",
+                    "hash" : "0xdab455db73ff719b0c2c947098879612bd577d7d600a849526ef17dde23bbfc8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "dab455db73ff719b0c2c947098879612bd577d7d600a849526ef17dde23bbfc8",
+                    "hash" : "0xdab455db73ff719b0c2c947098879612bd577d7d600a849526ef17dde23bbfc8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "dab455db73ff719b0c2c947098879612bd577d7d600a849526ef17dde23bbfc8",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6251437f0000000000000000000000010000000000000000000000000000000000000000437f000000000000000000000000fffffffffffffffffffffffffffffffffffffffff11460005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1088932905"
+                "0x40e7cc29"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest415.json b/GeneralStateTests/stRandom/randomStatetest415.json
index 3c0b93967..847ae5301 100644
--- a/GeneralStateTests/stRandom/randomStatetest415.json
+++ b/GeneralStateTests/stRandom/randomStatetest415.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest415" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
             {
@@ -22,7 +22,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b4103f09ed47439c77307b21a1b21550d775c3dcd381cbfeb71f85bd4c4f1048",
+                    "hash" : "0xb4103f09ed47439c77307b21a1b21550d775c3dcd381cbfeb71f85bd4c4f1048",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -32,7 +32,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b4103f09ed47439c77307b21a1b21550d775c3dcd381cbfeb71f85bd4c4f1048",
+                    "hash" : "0xb4103f09ed47439c77307b21a1b21550d775c3dcd381cbfeb71f85bd4c4f1048",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -42,7 +42,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b4103f09ed47439c77307b21a1b21550d775c3dcd381cbfeb71f85bd4c4f1048",
+                    "hash" : "0xb4103f09ed47439c77307b21a1b21550d775c3dcd381cbfeb71f85bd4c4f1048",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -52,7 +52,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b4103f09ed47439c77307b21a1b21550d775c3dcd381cbfeb71f85bd4c4f1048",
+                    "hash" : "0xb4103f09ed47439c77307b21a1b21550d775c3dcd381cbfeb71f85bd4c4f1048",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,7 +62,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b4103f09ed47439c77307b21a1b21550d775c3dcd381cbfeb71f85bd4c4f1048",
+                    "hash" : "0xb4103f09ed47439c77307b21a1b21550d775c3dcd381cbfeb71f85bd4c4f1048",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -73,23 +73,23 @@
         },
         "postStateRoot" : "2c1ff790547fa37f7369315b21c9788de315fc95b6ed13b58dc3c80d8d7c02f6",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff437f000000000000000000000000000000000000000000000000000000000000000142427f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5357f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff62010a8c8794a17e8ea4f260005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -104,10 +104,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1235296517"
+                "0x49a12105"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest416.json b/GeneralStateTests/stRandom/randomStatetest416.json
index fce834c19..2b4c9064f 100644
--- a/GeneralStateTests/stRandom/randomStatetest416.json
+++ b/GeneralStateTests/stRandom/randomStatetest416.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest416" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "2f5a2905bbd8e54a714d6849c656ab09ee9917d929e7e7fe87a313665f5483eb",
+                    "hash" : "0x2f5a2905bbd8e54a714d6849c656ab09ee9917d929e7e7fe87a313665f5483eb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "2f5a2905bbd8e54a714d6849c656ab09ee9917d929e7e7fe87a313665f5483eb",
+                    "hash" : "0x2f5a2905bbd8e54a714d6849c656ab09ee9917d929e7e7fe87a313665f5483eb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2f5a2905bbd8e54a714d6849c656ab09ee9917d929e7e7fe87a313665f5483eb",
+                    "hash" : "0x2f5a2905bbd8e54a714d6849c656ab09ee9917d929e7e7fe87a313665f5483eb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "2f5a2905bbd8e54a714d6849c656ab09ee9917d929e7e7fe87a313665f5483eb",
+                    "hash" : "0x2f5a2905bbd8e54a714d6849c656ab09ee9917d929e7e7fe87a313665f5483eb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "2f5a2905bbd8e54a714d6849c656ab09ee9917d929e7e7fe87a313665f5483eb",
+                    "hash" : "0x2f5a2905bbd8e54a714d6849c656ab09ee9917d929e7e7fe87a313665f5483eb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "6e8bad0fac19f0195ab782f8969aaea38cb092e5dc7574de8d317acdb90cf79f",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff427f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b54355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,8 +96,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x4f622410"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest417.json b/GeneralStateTests/stRandom/randomStatetest417.json
index 5af28645c..6ba159312 100644
--- a/GeneralStateTests/stRandom/randomStatetest417.json
+++ b/GeneralStateTests/stRandom/randomStatetest417.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest417" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7c8efe4ca8898d8531d0dfb23135b5c8827ee34321688b7748550acc66b97a40",
+                    "hash" : "0x7c8efe4ca8898d8531d0dfb23135b5c8827ee34321688b7748550acc66b97a40",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7c8efe4ca8898d8531d0dfb23135b5c8827ee34321688b7748550acc66b97a40",
+                    "hash" : "0x7c8efe4ca8898d8531d0dfb23135b5c8827ee34321688b7748550acc66b97a40",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "ea18638f9d90b0cc3fe974064782903bb0e290ffc672d91684f102738e749638",
+                    "hash" : "0xea18638f9d90b0cc3fe974064782903bb0e290ffc672d91684f102738e749638",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ea18638f9d90b0cc3fe974064782903bb0e290ffc672d91684f102738e749638",
+                    "hash" : "0xea18638f9d90b0cc3fe974064782903bb0e290ffc672d91684f102738e749638",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7c8efe4ca8898d8531d0dfb23135b5c8827ee34321688b7748550acc66b97a40",
+                    "hash" : "0x7c8efe4ca8898d8531d0dfb23135b5c8827ee34321688b7748550acc66b97a40",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "a14193c10ce146ed737b1038c1daf6e757946725a6ec488bee774aa62eaa7d24",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x4343424344444242f26d69",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest418.json b/GeneralStateTests/stRandom/randomStatetest418.json
index 126b6eaab..eb483f38f 100644
--- a/GeneralStateTests/stRandom/randomStatetest418.json
+++ b/GeneralStateTests/stRandom/randomStatetest418.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest418" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
             {
@@ -31,7 +31,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "94c51fccdca1d5b5cb949824330b4f18d4fcd4b75fe31a0769474e2403d0cd8f",
+                    "hash" : "0x94c51fccdca1d5b5cb949824330b4f18d4fcd4b75fe31a0769474e2403d0cd8f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "94c51fccdca1d5b5cb949824330b4f18d4fcd4b75fe31a0769474e2403d0cd8f",
+                    "hash" : "0x94c51fccdca1d5b5cb949824330b4f18d4fcd4b75fe31a0769474e2403d0cd8f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "552f81f63e712021da7631080c003cced772894ea4db65a6d24f888bb319e7f7",
+                    "hash" : "0x552f81f63e712021da7631080c003cced772894ea4db65a6d24f888bb319e7f7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,7 +61,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "552f81f63e712021da7631080c003cced772894ea4db65a6d24f888bb319e7f7",
+                    "hash" : "0x552f81f63e712021da7631080c003cced772894ea4db65a6d24f888bb319e7f7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -71,7 +71,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "94c51fccdca1d5b5cb949824330b4f18d4fcd4b75fe31a0769474e2403d0cd8f",
+                    "hash" : "0x94c51fccdca1d5b5cb949824330b4f18d4fcd4b75fe31a0769474e2403d0cd8f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -82,23 +82,23 @@
         },
         "postStateRoot" : "552f81f63e712021da7631080c003cced772894ea4db65a6d24f888bb319e7f7",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f0000000000000000000000000000000000000000000000000000000000000000437f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000000417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff12a36234970658a03160005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -113,10 +113,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1705540168"
+                "0x65a87a48"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest419.json b/GeneralStateTests/stRandom/randomStatetest419.json
index 7321754c3..112901844 100644
--- a/GeneralStateTests/stRandom/randomStatetest419.json
+++ b/GeneralStateTests/stRandom/randomStatetest419.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest419" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "91cda3ae1f533e5ca9cc2f45b1ad45f7006fbc285ba63b6dede22127d032f398",
+                    "hash" : "0x91cda3ae1f533e5ca9cc2f45b1ad45f7006fbc285ba63b6dede22127d032f398",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "91cda3ae1f533e5ca9cc2f45b1ad45f7006fbc285ba63b6dede22127d032f398",
+                    "hash" : "0x91cda3ae1f533e5ca9cc2f45b1ad45f7006fbc285ba63b6dede22127d032f398",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "91cda3ae1f533e5ca9cc2f45b1ad45f7006fbc285ba63b6dede22127d032f398",
+                    "hash" : "0x91cda3ae1f533e5ca9cc2f45b1ad45f7006fbc285ba63b6dede22127d032f398",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "91cda3ae1f533e5ca9cc2f45b1ad45f7006fbc285ba63b6dede22127d032f398",
+                    "hash" : "0x91cda3ae1f533e5ca9cc2f45b1ad45f7006fbc285ba63b6dede22127d032f398",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "91cda3ae1f533e5ca9cc2f45b1ad45f7006fbc285ba63b6dede22127d032f398",
+                    "hash" : "0x91cda3ae1f533e5ca9cc2f45b1ad45f7006fbc285ba63b6dede22127d032f398",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "91cda3ae1f533e5ca9cc2f45b1ad45f7006fbc285ba63b6dede22127d032f398",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x437ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001417ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f73095b7ee211595a6b80a311900a785560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1783425972"
+                "0x6a4cebb4"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest42.json b/GeneralStateTests/stRandom/randomStatetest42.json
index ea10bfd04..7557541d9 100644
--- a/GeneralStateTests/stRandom/randomStatetest42.json
+++ b/GeneralStateTests/stRandom/randomStatetest42.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest42" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e51ce43e7e084ded8ccf5e2c26035e90477a23c285f88bc552f521cfa200a101",
+                    "hash" : "0xe51ce43e7e084ded8ccf5e2c26035e90477a23c285f88bc552f521cfa200a101",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e51ce43e7e084ded8ccf5e2c26035e90477a23c285f88bc552f521cfa200a101",
+                    "hash" : "0xe51ce43e7e084ded8ccf5e2c26035e90477a23c285f88bc552f521cfa200a101",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e51ce43e7e084ded8ccf5e2c26035e90477a23c285f88bc552f521cfa200a101",
+                    "hash" : "0xe51ce43e7e084ded8ccf5e2c26035e90477a23c285f88bc552f521cfa200a101",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e51ce43e7e084ded8ccf5e2c26035e90477a23c285f88bc552f521cfa200a101",
+                    "hash" : "0xe51ce43e7e084ded8ccf5e2c26035e90477a23c285f88bc552f521cfa200a101",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e51ce43e7e084ded8ccf5e2c26035e90477a23c285f88bc552f521cfa200a101",
+                    "hash" : "0xe51ce43e7e084ded8ccf5e2c26035e90477a23c285f88bc552f521cfa200a101",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "e51ce43e7e084ded8ccf5e2c26035e90477a23c285f88bc552f521cfa200a101",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3505a7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350356436f0f119011a5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,8 +96,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x61b9caa3"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest420.json b/GeneralStateTests/stRandom/randomStatetest420.json
index 72508660e..675352d25 100644
--- a/GeneralStateTests/stRandom/randomStatetest420.json
+++ b/GeneralStateTests/stRandom/randomStatetest420.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest420" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9cbbf1891be48f82515a092cddb48a37eb456c8a5eb3d9c3ea463fb3adfda444",
+                    "hash" : "0x9cbbf1891be48f82515a092cddb48a37eb456c8a5eb3d9c3ea463fb3adfda444",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9cbbf1891be48f82515a092cddb48a37eb456c8a5eb3d9c3ea463fb3adfda444",
+                    "hash" : "0x9cbbf1891be48f82515a092cddb48a37eb456c8a5eb3d9c3ea463fb3adfda444",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9cbbf1891be48f82515a092cddb48a37eb456c8a5eb3d9c3ea463fb3adfda444",
+                    "hash" : "0x9cbbf1891be48f82515a092cddb48a37eb456c8a5eb3d9c3ea463fb3adfda444",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9cbbf1891be48f82515a092cddb48a37eb456c8a5eb3d9c3ea463fb3adfda444",
+                    "hash" : "0x9cbbf1891be48f82515a092cddb48a37eb456c8a5eb3d9c3ea463fb3adfda444",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9cbbf1891be48f82515a092cddb48a37eb456c8a5eb3d9c3ea463fb3adfda444",
+                    "hash" : "0x9cbbf1891be48f82515a092cddb48a37eb456c8a5eb3d9c3ea463fb3adfda444",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "9cbbf1891be48f82515a092cddb48a37eb456c8a5eb3d9c3ea463fb3adfda444",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b53a7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000000000000000000000000000000000000000000001817d7b8956970660129f5015fe0a355560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1657754250"
+                "0x62cf528a"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest421.json b/GeneralStateTests/stRandom/randomStatetest421.json
index 5cacbed84..622c70201 100644
--- a/GeneralStateTests/stRandom/randomStatetest421.json
+++ b/GeneralStateTests/stRandom/randomStatetest421.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest421" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "476de1862ee5e64de2eeb92edf2cf87701ec5188e11890838ea3b55f8cab7b7e",
+                    "hash" : "0x476de1862ee5e64de2eeb92edf2cf87701ec5188e11890838ea3b55f8cab7b7e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "476de1862ee5e64de2eeb92edf2cf87701ec5188e11890838ea3b55f8cab7b7e",
+                    "hash" : "0x476de1862ee5e64de2eeb92edf2cf87701ec5188e11890838ea3b55f8cab7b7e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "476de1862ee5e64de2eeb92edf2cf87701ec5188e11890838ea3b55f8cab7b7e",
+                    "hash" : "0x476de1862ee5e64de2eeb92edf2cf87701ec5188e11890838ea3b55f8cab7b7e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "476de1862ee5e64de2eeb92edf2cf87701ec5188e11890838ea3b55f8cab7b7e",
+                    "hash" : "0x476de1862ee5e64de2eeb92edf2cf87701ec5188e11890838ea3b55f8cab7b7e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "476de1862ee5e64de2eeb92edf2cf87701ec5188e11890838ea3b55f8cab7b7e",
+                    "hash" : "0x476de1862ee5e64de2eeb92edf2cf87701ec5188e11890838ea3b55f8cab7b7e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "476de1862ee5e64de2eeb92edf2cf87701ec5188e11890838ea3b55f8cab7b7e",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x437f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f38454051968ff184a47d50091231971760005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1389450591"
+                "0x52d1555f"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest422.json b/GeneralStateTests/stRandom/randomStatetest422.json
index fe78becf7..a50e59855 100644
--- a/GeneralStateTests/stRandom/randomStatetest422.json
+++ b/GeneralStateTests/stRandom/randomStatetest422.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest422" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "16d58f4edca99e12b53543966af5ef6159af7dbf93ef4f085bce2972ecb413ad",
+                    "hash" : "0x16d58f4edca99e12b53543966af5ef6159af7dbf93ef4f085bce2972ecb413ad",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "16d58f4edca99e12b53543966af5ef6159af7dbf93ef4f085bce2972ecb413ad",
+                    "hash" : "0x16d58f4edca99e12b53543966af5ef6159af7dbf93ef4f085bce2972ecb413ad",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "16d58f4edca99e12b53543966af5ef6159af7dbf93ef4f085bce2972ecb413ad",
+                    "hash" : "0x16d58f4edca99e12b53543966af5ef6159af7dbf93ef4f085bce2972ecb413ad",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "16d58f4edca99e12b53543966af5ef6159af7dbf93ef4f085bce2972ecb413ad",
+                    "hash" : "0x16d58f4edca99e12b53543966af5ef6159af7dbf93ef4f085bce2972ecb413ad",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "16d58f4edca99e12b53543966af5ef6159af7dbf93ef4f085bce2972ecb413ad",
+                    "hash" : "0x16d58f4edca99e12b53543966af5ef6159af7dbf93ef4f085bce2972ecb413ad",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "16d58f4edca99e12b53543966af5ef6159af7dbf93ef4f085bce2972ecb413ad",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe527f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1285310456"
+                "0x4c9c47f8"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest423.json b/GeneralStateTests/stRandom/randomStatetest423.json
index 843c4d0fa..0a15f4175 100644
--- a/GeneralStateTests/stRandom/randomStatetest423.json
+++ b/GeneralStateTests/stRandom/randomStatetest423.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest423" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9138d769f5c41c39e892f6fc18d67f4d38ae452a71cfa966a39a274af70da846",
+                    "hash" : "0x9138d769f5c41c39e892f6fc18d67f4d38ae452a71cfa966a39a274af70da846",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9138d769f5c41c39e892f6fc18d67f4d38ae452a71cfa966a39a274af70da846",
+                    "hash" : "0x9138d769f5c41c39e892f6fc18d67f4d38ae452a71cfa966a39a274af70da846",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9138d769f5c41c39e892f6fc18d67f4d38ae452a71cfa966a39a274af70da846",
+                    "hash" : "0x9138d769f5c41c39e892f6fc18d67f4d38ae452a71cfa966a39a274af70da846",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9138d769f5c41c39e892f6fc18d67f4d38ae452a71cfa966a39a274af70da846",
+                    "hash" : "0x9138d769f5c41c39e892f6fc18d67f4d38ae452a71cfa966a39a274af70da846",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9138d769f5c41c39e892f6fc18d67f4d38ae452a71cfa966a39a274af70da846",
+                    "hash" : "0x9138d769f5c41c39e892f6fc18d67f4d38ae452a71cfa966a39a274af70da846",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "9138d769f5c41c39e892f6fc18d67f4d38ae452a71cfa966a39a274af70da846",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x407f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350057ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000000085f98f3c3c9d0345f2155a9a7d0b131555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "122762203"
+                "0x075133db"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest424.json b/GeneralStateTests/stRandom/randomStatetest424.json
index 495f5b35f..991f6d1c9 100644
--- a/GeneralStateTests/stRandom/randomStatetest424.json
+++ b/GeneralStateTests/stRandom/randomStatetest424.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest424" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "8337bbc7ad3a6588c398265de3ae25c6ab2ae9003ac3fc19e6bdbdebc6f99e5e",
+                    "hash" : "0x8337bbc7ad3a6588c398265de3ae25c6ab2ae9003ac3fc19e6bdbdebc6f99e5e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "8337bbc7ad3a6588c398265de3ae25c6ab2ae9003ac3fc19e6bdbdebc6f99e5e",
+                    "hash" : "0x8337bbc7ad3a6588c398265de3ae25c6ab2ae9003ac3fc19e6bdbdebc6f99e5e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "8337bbc7ad3a6588c398265de3ae25c6ab2ae9003ac3fc19e6bdbdebc6f99e5e",
+                    "hash" : "0x8337bbc7ad3a6588c398265de3ae25c6ab2ae9003ac3fc19e6bdbdebc6f99e5e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "8337bbc7ad3a6588c398265de3ae25c6ab2ae9003ac3fc19e6bdbdebc6f99e5e",
+                    "hash" : "0x8337bbc7ad3a6588c398265de3ae25c6ab2ae9003ac3fc19e6bdbdebc6f99e5e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "8337bbc7ad3a6588c398265de3ae25c6ab2ae9003ac3fc19e6bdbdebc6f99e5e",
+                    "hash" : "0x8337bbc7ad3a6588c398265de3ae25c6ab2ae9003ac3fc19e6bdbdebc6f99e5e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "8337bbc7ad3a6588c398265de3ae25c6ab2ae9003ac3fc19e6bdbdebc6f99e5e",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5437f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000000000000000000000000000436f18116552626186825096665471140a5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1271738191"
+                "0x4bcd2f4f"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest425.json b/GeneralStateTests/stRandom/randomStatetest425.json
index c4f303404..f02aea88d 100644
--- a/GeneralStateTests/stRandom/randomStatetest425.json
+++ b/GeneralStateTests/stRandom/randomStatetest425.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest425" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "3aedad31bf0511cb9e66b56e63c9d4fdeb5e3bd48f5cd7e5bcd0dc638d8e5f9b",
+                    "hash" : "0x3aedad31bf0511cb9e66b56e63c9d4fdeb5e3bd48f5cd7e5bcd0dc638d8e5f9b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "3aedad31bf0511cb9e66b56e63c9d4fdeb5e3bd48f5cd7e5bcd0dc638d8e5f9b",
+                    "hash" : "0x3aedad31bf0511cb9e66b56e63c9d4fdeb5e3bd48f5cd7e5bcd0dc638d8e5f9b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3aedad31bf0511cb9e66b56e63c9d4fdeb5e3bd48f5cd7e5bcd0dc638d8e5f9b",
+                    "hash" : "0x3aedad31bf0511cb9e66b56e63c9d4fdeb5e3bd48f5cd7e5bcd0dc638d8e5f9b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3aedad31bf0511cb9e66b56e63c9d4fdeb5e3bd48f5cd7e5bcd0dc638d8e5f9b",
+                    "hash" : "0x3aedad31bf0511cb9e66b56e63c9d4fdeb5e3bd48f5cd7e5bcd0dc638d8e5f9b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "3aedad31bf0511cb9e66b56e63c9d4fdeb5e3bd48f5cd7e5bcd0dc638d8e5f9b",
+                    "hash" : "0x3aedad31bf0511cb9e66b56e63c9d4fdeb5e3bd48f5cd7e5bcd0dc638d8e5f9b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "3aedad31bf0511cb9e66b56e63c9d4fdeb5e3bd48f5cd7e5bcd0dc638d8e5f9b",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f0000000000000000000000010000000000000000000000000000000000000000417f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f885707818b889a89975552f01284425560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "574036597"
+                "0x22371a75"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest426.json b/GeneralStateTests/stRandom/randomStatetest426.json
index e5d9ecb27..a15f3554e 100644
--- a/GeneralStateTests/stRandom/randomStatetest426.json
+++ b/GeneralStateTests/stRandom/randomStatetest426.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest426" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "8781684eaade11345038e3d98012636fa36c6a4e0af40d5669393296748cd093",
+                    "hash" : "0x8781684eaade11345038e3d98012636fa36c6a4e0af40d5669393296748cd093",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "8781684eaade11345038e3d98012636fa36c6a4e0af40d5669393296748cd093",
+                    "hash" : "0x8781684eaade11345038e3d98012636fa36c6a4e0af40d5669393296748cd093",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "8781684eaade11345038e3d98012636fa36c6a4e0af40d5669393296748cd093",
+                    "hash" : "0x8781684eaade11345038e3d98012636fa36c6a4e0af40d5669393296748cd093",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "8781684eaade11345038e3d98012636fa36c6a4e0af40d5669393296748cd093",
+                    "hash" : "0x8781684eaade11345038e3d98012636fa36c6a4e0af40d5669393296748cd093",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "8781684eaade11345038e3d98012636fa36c6a4e0af40d5669393296748cd093",
+                    "hash" : "0x8781684eaade11345038e3d98012636fa36c6a4e0af40d5669393296748cd093",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "8781684eaade11345038e3d98012636fa36c6a4e0af40d5669393296748cd093",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5417ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000006f456d1687795a95938b0139976099f05560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1631269834"
+                "0x613b33ca"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest427.json b/GeneralStateTests/stRandom/randomStatetest427.json
index ae0241dfd..17fdd8e07 100644
--- a/GeneralStateTests/stRandom/randomStatetest427.json
+++ b/GeneralStateTests/stRandom/randomStatetest427.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest427" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6d38e831c668646f03942f18800f75fc1833e5010ce8bd130443537a42909ca3",
+                    "hash" : "0x6d38e831c668646f03942f18800f75fc1833e5010ce8bd130443537a42909ca3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6d38e831c668646f03942f18800f75fc1833e5010ce8bd130443537a42909ca3",
+                    "hash" : "0x6d38e831c668646f03942f18800f75fc1833e5010ce8bd130443537a42909ca3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6d38e831c668646f03942f18800f75fc1833e5010ce8bd130443537a42909ca3",
+                    "hash" : "0x6d38e831c668646f03942f18800f75fc1833e5010ce8bd130443537a42909ca3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6d38e831c668646f03942f18800f75fc1833e5010ce8bd130443537a42909ca3",
+                    "hash" : "0x6d38e831c668646f03942f18800f75fc1833e5010ce8bd130443537a42909ca3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6d38e831c668646f03942f18800f75fc1833e5010ce8bd130443537a42909ca3",
+                    "hash" : "0x6d38e831c668646f03942f18800f75fc1833e5010ce8bd130443537a42909ca3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "6d38e831c668646f03942f18800f75fc1833e5010ce8bd130443537a42909ca3",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff457f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff72785560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "530365208"
+                "0x1f9cbb18"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest428.json b/GeneralStateTests/stRandom/randomStatetest428.json
index 221ab5045..72be59255 100644
--- a/GeneralStateTests/stRandom/randomStatetest428.json
+++ b/GeneralStateTests/stRandom/randomStatetest428.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest428" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "884d15e4b4d8602751e004c0c74ab8ad5806b85add454653b57cf43739998e09",
+                    "hash" : "0x884d15e4b4d8602751e004c0c74ab8ad5806b85add454653b57cf43739998e09",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "884d15e4b4d8602751e004c0c74ab8ad5806b85add454653b57cf43739998e09",
+                    "hash" : "0x884d15e4b4d8602751e004c0c74ab8ad5806b85add454653b57cf43739998e09",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "884d15e4b4d8602751e004c0c74ab8ad5806b85add454653b57cf43739998e09",
+                    "hash" : "0x884d15e4b4d8602751e004c0c74ab8ad5806b85add454653b57cf43739998e09",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "884d15e4b4d8602751e004c0c74ab8ad5806b85add454653b57cf43739998e09",
+                    "hash" : "0x884d15e4b4d8602751e004c0c74ab8ad5806b85add454653b57cf43739998e09",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "884d15e4b4d8602751e004c0c74ab8ad5806b85add454653b57cf43739998e09",
+                    "hash" : "0x884d15e4b4d8602751e004c0c74ab8ad5806b85add454653b57cf43739998e09",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "884d15e4b4d8602751e004c0c74ab8ad5806b85add454653b57cf43739998e09",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x4244417b4542404409523b200283",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest429.json b/GeneralStateTests/stRandom/randomStatetest429.json
index aebb81728..f791cb8ba 100644
--- a/GeneralStateTests/stRandom/randomStatetest429.json
+++ b/GeneralStateTests/stRandom/randomStatetest429.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest429" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "4ad8ec3967c187cf53ccc37c9d0c9b825648899976ad794feb2c89140193b078",
+                    "hash" : "0x4ad8ec3967c187cf53ccc37c9d0c9b825648899976ad794feb2c89140193b078",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "4ad8ec3967c187cf53ccc37c9d0c9b825648899976ad794feb2c89140193b078",
+                    "hash" : "0x4ad8ec3967c187cf53ccc37c9d0c9b825648899976ad794feb2c89140193b078",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4ad8ec3967c187cf53ccc37c9d0c9b825648899976ad794feb2c89140193b078",
+                    "hash" : "0x4ad8ec3967c187cf53ccc37c9d0c9b825648899976ad794feb2c89140193b078",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4ad8ec3967c187cf53ccc37c9d0c9b825648899976ad794feb2c89140193b078",
+                    "hash" : "0x4ad8ec3967c187cf53ccc37c9d0c9b825648899976ad794feb2c89140193b078",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "4ad8ec3967c187cf53ccc37c9d0c9b825648899976ad794feb2c89140193b078",
+                    "hash" : "0x4ad8ec3967c187cf53ccc37c9d0c9b825648899976ad794feb2c89140193b078",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "4ad8ec3967c187cf53ccc37c9d0c9b825648899976ad794feb2c89140193b078",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5417ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f98121f3887867290877734763313665560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1412476335"
+                "0x5430adaf"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest43.json b/GeneralStateTests/stRandom/randomStatetest43.json
index 021b7c81f..55ffaa6b9 100644
--- a/GeneralStateTests/stRandom/randomStatetest43.json
+++ b/GeneralStateTests/stRandom/randomStatetest43.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest43" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "87fda285fdd0520dfd2214fd33414199602cfc86f13f6e08da3692fcc67c00bc",
+                    "hash" : "0x87fda285fdd0520dfd2214fd33414199602cfc86f13f6e08da3692fcc67c00bc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "667159eba14a4551b733e54f6c7383795c2be59ee48c6527985f853b4b7086a2",
+                    "hash" : "0x667159eba14a4551b733e54f6c7383795c2be59ee48c6527985f853b4b7086a2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "278941e17298c3be14c198aad402381104c1aeae6451f18e07fb9cc80e4a482f",
+                    "hash" : "0x278941e17298c3be14c198aad402381104c1aeae6451f18e07fb9cc80e4a482f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "278941e17298c3be14c198aad402381104c1aeae6451f18e07fb9cc80e4a482f",
+                    "hash" : "0x278941e17298c3be14c198aad402381104c1aeae6451f18e07fb9cc80e4a482f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "667159eba14a4551b733e54f6c7383795c2be59ee48c6527985f853b4b7086a2",
+                    "hash" : "0x667159eba14a4551b733e54f6c7383795c2be59ee48c6527985f853b4b7086a2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "278941e17298c3be14c198aad402381104c1aeae6451f18e07fb9cc80e4a482f",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff3b0a55096941861a3755a196f259a155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "580684794"
+                "0x229c8bfa"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest430.json b/GeneralStateTests/stRandom/randomStatetest430.json
index 7acf7ad59..c3994ac40 100644
--- a/GeneralStateTests/stRandom/randomStatetest430.json
+++ b/GeneralStateTests/stRandom/randomStatetest430.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest430" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "49808120b60f2a2e9c0b3b90dd509f877f8582c764d88e8984c307a502667ad3",
+                    "hash" : "0x49808120b60f2a2e9c0b3b90dd509f877f8582c764d88e8984c307a502667ad3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "49808120b60f2a2e9c0b3b90dd509f877f8582c764d88e8984c307a502667ad3",
+                    "hash" : "0x49808120b60f2a2e9c0b3b90dd509f877f8582c764d88e8984c307a502667ad3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "49808120b60f2a2e9c0b3b90dd509f877f8582c764d88e8984c307a502667ad3",
+                    "hash" : "0x49808120b60f2a2e9c0b3b90dd509f877f8582c764d88e8984c307a502667ad3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "49808120b60f2a2e9c0b3b90dd509f877f8582c764d88e8984c307a502667ad3",
+                    "hash" : "0x49808120b60f2a2e9c0b3b90dd509f877f8582c764d88e8984c307a502667ad3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "49808120b60f2a2e9c0b3b90dd509f877f8582c764d88e8984c307a502667ad3",
+                    "hash" : "0x49808120b60f2a2e9c0b3b90dd509f877f8582c764d88e8984c307a502667ad3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "49808120b60f2a2e9c0b3b90dd509f877f8582c764d88e8984c307a502667ad3",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe427f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000006f7d41a29934035b748e96a3135b69645560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1811277343"
+                "0x6bf5e61f"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest431.json b/GeneralStateTests/stRandom/randomStatetest431.json
index fa8f972e3..543f03eb7 100644
--- a/GeneralStateTests/stRandom/randomStatetest431.json
+++ b/GeneralStateTests/stRandom/randomStatetest431.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest431" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7a8f8cfd967a73ccf5d6b736e11605f66050dc4560b519fe42a407829977c431",
+                    "hash" : "0x7a8f8cfd967a73ccf5d6b736e11605f66050dc4560b519fe42a407829977c431",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7a8f8cfd967a73ccf5d6b736e11605f66050dc4560b519fe42a407829977c431",
+                    "hash" : "0x7a8f8cfd967a73ccf5d6b736e11605f66050dc4560b519fe42a407829977c431",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "7bb4b6968ce315ca53ad62095946f163c67c2a566529e1f493fdfe51cf8d860f",
+                    "hash" : "0x7bb4b6968ce315ca53ad62095946f163c67c2a566529e1f493fdfe51cf8d860f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "7bb4b6968ce315ca53ad62095946f163c67c2a566529e1f493fdfe51cf8d860f",
+                    "hash" : "0x7bb4b6968ce315ca53ad62095946f163c67c2a566529e1f493fdfe51cf8d860f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7a8f8cfd967a73ccf5d6b736e11605f66050dc4560b519fe42a407829977c431",
+                    "hash" : "0x7a8f8cfd967a73ccf5d6b736e11605f66050dc4560b519fe42a407829977c431",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "7bb4b6968ce315ca53ad62095946f163c67c2a566529e1f493fdfe51cf8d860f",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000000040313715608f60005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1111345290"
+                "0x423dc88a"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest432.json b/GeneralStateTests/stRandom/randomStatetest432.json
index eb39056fb..21cb292e5 100644
--- a/GeneralStateTests/stRandom/randomStatetest432.json
+++ b/GeneralStateTests/stRandom/randomStatetest432.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest432" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e3c1060e5b54e18ecdc610a7338ea994bdc5e4211bdb7c7c94bd7853324428ef",
+                    "hash" : "0xe3c1060e5b54e18ecdc610a7338ea994bdc5e4211bdb7c7c94bd7853324428ef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e3c1060e5b54e18ecdc610a7338ea994bdc5e4211bdb7c7c94bd7853324428ef",
+                    "hash" : "0xe3c1060e5b54e18ecdc610a7338ea994bdc5e4211bdb7c7c94bd7853324428ef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e3c1060e5b54e18ecdc610a7338ea994bdc5e4211bdb7c7c94bd7853324428ef",
+                    "hash" : "0xe3c1060e5b54e18ecdc610a7338ea994bdc5e4211bdb7c7c94bd7853324428ef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e3c1060e5b54e18ecdc610a7338ea994bdc5e4211bdb7c7c94bd7853324428ef",
+                    "hash" : "0xe3c1060e5b54e18ecdc610a7338ea994bdc5e4211bdb7c7c94bd7853324428ef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e3c1060e5b54e18ecdc610a7338ea994bdc5e4211bdb7c7c94bd7853324428ef",
+                    "hash" : "0xe3c1060e5b54e18ecdc610a7338ea994bdc5e4211bdb7c7c94bd7853324428ef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "e3c1060e5b54e18ecdc610a7338ea994bdc5e4211bdb7c7c94bd7853324428ef",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f0000000000000000000000000000000000000000000000000000000000000000407f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0904517241a27307",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "264513777"
+                "0x0fc428f1"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest433.json b/GeneralStateTests/stRandom/randomStatetest433.json
index bf4c1f30f..e01b5c36b 100644
--- a/GeneralStateTests/stRandom/randomStatetest433.json
+++ b/GeneralStateTests/stRandom/randomStatetest433.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest433" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
             {
@@ -24,7 +24,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "5cbe2d4811cc7a3e1474e637cbafc3b2f7fa1a93f3cdb4fa977d58224e795fb5",
+                    "hash" : "0x5cbe2d4811cc7a3e1474e637cbafc3b2f7fa1a93f3cdb4fa977d58224e795fb5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "5cbe2d4811cc7a3e1474e637cbafc3b2f7fa1a93f3cdb4fa977d58224e795fb5",
+                    "hash" : "0x5cbe2d4811cc7a3e1474e637cbafc3b2f7fa1a93f3cdb4fa977d58224e795fb5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5cbe2d4811cc7a3e1474e637cbafc3b2f7fa1a93f3cdb4fa977d58224e795fb5",
+                    "hash" : "0x5cbe2d4811cc7a3e1474e637cbafc3b2f7fa1a93f3cdb4fa977d58224e795fb5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5cbe2d4811cc7a3e1474e637cbafc3b2f7fa1a93f3cdb4fa977d58224e795fb5",
+                    "hash" : "0x5cbe2d4811cc7a3e1474e637cbafc3b2f7fa1a93f3cdb4fa977d58224e795fb5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -64,7 +64,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "5cbe2d4811cc7a3e1474e637cbafc3b2f7fa1a93f3cdb4fa977d58224e795fb5",
+                    "hash" : "0x5cbe2d4811cc7a3e1474e637cbafc3b2f7fa1a93f3cdb4fa977d58224e795fb5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -75,23 +75,23 @@
         },
         "postStateRoot" : "5cbe2d4811cc7a3e1474e637cbafc3b2f7fa1a93f3cdb4fa977d58224e795fb5",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350a3f305205bf156207259573055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -106,10 +106,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "630948579"
+                "0x259b82e3"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest434.json b/GeneralStateTests/stRandom/randomStatetest434.json
index 9a6ce026d..9bedae009 100644
--- a/GeneralStateTests/stRandom/randomStatetest434.json
+++ b/GeneralStateTests/stRandom/randomStatetest434.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest434" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "327a6620b2d296eef1ce9c27a62aa4bf1feabc0f195fd0c18d06666deff43eef",
+                    "hash" : "0x327a6620b2d296eef1ce9c27a62aa4bf1feabc0f195fd0c18d06666deff43eef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "327a6620b2d296eef1ce9c27a62aa4bf1feabc0f195fd0c18d06666deff43eef",
+                    "hash" : "0x327a6620b2d296eef1ce9c27a62aa4bf1feabc0f195fd0c18d06666deff43eef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "327a6620b2d296eef1ce9c27a62aa4bf1feabc0f195fd0c18d06666deff43eef",
+                    "hash" : "0x327a6620b2d296eef1ce9c27a62aa4bf1feabc0f195fd0c18d06666deff43eef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "327a6620b2d296eef1ce9c27a62aa4bf1feabc0f195fd0c18d06666deff43eef",
+                    "hash" : "0x327a6620b2d296eef1ce9c27a62aa4bf1feabc0f195fd0c18d06666deff43eef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "327a6620b2d296eef1ce9c27a62aa4bf1feabc0f195fd0c18d06666deff43eef",
+                    "hash" : "0x327a6620b2d296eef1ce9c27a62aa4bf1feabc0f195fd0c18d06666deff43eef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "327a6620b2d296eef1ce9c27a62aa4bf1feabc0f195fd0c18d06666deff43eef",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5f30264613617a2975a6857606f5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "914665277"
+                "0x3684af3d"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest435.json b/GeneralStateTests/stRandom/randomStatetest435.json
index c0f7599ee..229b61fd1 100644
--- a/GeneralStateTests/stRandom/randomStatetest435.json
+++ b/GeneralStateTests/stRandom/randomStatetest435.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest435" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "8bf90155bfbd3bef955c620d790777a74201b8c8ce1dba26b379fb9bbb85d8c6",
+                    "hash" : "0x8bf90155bfbd3bef955c620d790777a74201b8c8ce1dba26b379fb9bbb85d8c6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "8bf90155bfbd3bef955c620d790777a74201b8c8ce1dba26b379fb9bbb85d8c6",
+                    "hash" : "0x8bf90155bfbd3bef955c620d790777a74201b8c8ce1dba26b379fb9bbb85d8c6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "8bf90155bfbd3bef955c620d790777a74201b8c8ce1dba26b379fb9bbb85d8c6",
+                    "hash" : "0x8bf90155bfbd3bef955c620d790777a74201b8c8ce1dba26b379fb9bbb85d8c6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "8bf90155bfbd3bef955c620d790777a74201b8c8ce1dba26b379fb9bbb85d8c6",
+                    "hash" : "0x8bf90155bfbd3bef955c620d790777a74201b8c8ce1dba26b379fb9bbb85d8c6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "8bf90155bfbd3bef955c620d790777a74201b8c8ce1dba26b379fb9bbb85d8c6",
+                    "hash" : "0x8bf90155bfbd3bef955c620d790777a74201b8c8ce1dba26b379fb9bbb85d8c6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "5e5373df5eb140c658174efad770006d28c47ef8a7c13a9b150f427826bf120d",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000000000000000000000000000000000000000000000447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000042613488076233797f553960005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1256168470"
+                "0x4adf9c16"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest436.json b/GeneralStateTests/stRandom/randomStatetest436.json
index 204799a63..d2487b9a2 100644
--- a/GeneralStateTests/stRandom/randomStatetest436.json
+++ b/GeneralStateTests/stRandom/randomStatetest436.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest436" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a67595e8fa11956ea31b70c6c2c6b765e6f6d7c2ab6ebeac138369ba15799eda",
+                    "hash" : "0xa67595e8fa11956ea31b70c6c2c6b765e6f6d7c2ab6ebeac138369ba15799eda",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a67595e8fa11956ea31b70c6c2c6b765e6f6d7c2ab6ebeac138369ba15799eda",
+                    "hash" : "0xa67595e8fa11956ea31b70c6c2c6b765e6f6d7c2ab6ebeac138369ba15799eda",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a67595e8fa11956ea31b70c6c2c6b765e6f6d7c2ab6ebeac138369ba15799eda",
+                    "hash" : "0xa67595e8fa11956ea31b70c6c2c6b765e6f6d7c2ab6ebeac138369ba15799eda",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a67595e8fa11956ea31b70c6c2c6b765e6f6d7c2ab6ebeac138369ba15799eda",
+                    "hash" : "0xa67595e8fa11956ea31b70c6c2c6b765e6f6d7c2ab6ebeac138369ba15799eda",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a67595e8fa11956ea31b70c6c2c6b765e6f6d7c2ab6ebeac138369ba15799eda",
+                    "hash" : "0xa67595e8fa11956ea31b70c6c2c6b765e6f6d7c2ab6ebeac138369ba15799eda",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "a67595e8fa11956ea31b70c6c2c6b765e6f6d7c2ab6ebeac138369ba15799eda",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x367f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5456f8108067a345b7a76a20a835a0a0b6c1060005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1464160030"
+                "0x57454f1e"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest437.json b/GeneralStateTests/stRandom/randomStatetest437.json
index 5b20deaa4..02f5a9cfc 100644
--- a/GeneralStateTests/stRandom/randomStatetest437.json
+++ b/GeneralStateTests/stRandom/randomStatetest437.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest437" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f9bb80a7897b48cbb6018fe30c04923289b6d2425a8befd55ec958b181f2e5a2",
+                    "hash" : "0xf9bb80a7897b48cbb6018fe30c04923289b6d2425a8befd55ec958b181f2e5a2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f9bb80a7897b48cbb6018fe30c04923289b6d2425a8befd55ec958b181f2e5a2",
+                    "hash" : "0xf9bb80a7897b48cbb6018fe30c04923289b6d2425a8befd55ec958b181f2e5a2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f9bb80a7897b48cbb6018fe30c04923289b6d2425a8befd55ec958b181f2e5a2",
+                    "hash" : "0xf9bb80a7897b48cbb6018fe30c04923289b6d2425a8befd55ec958b181f2e5a2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f9bb80a7897b48cbb6018fe30c04923289b6d2425a8befd55ec958b181f2e5a2",
+                    "hash" : "0xf9bb80a7897b48cbb6018fe30c04923289b6d2425a8befd55ec958b181f2e5a2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f9bb80a7897b48cbb6018fe30c04923289b6d2425a8befd55ec958b181f2e5a2",
+                    "hash" : "0xf9bb80a7897b48cbb6018fe30c04923289b6d2425a8befd55ec958b181f2e5a2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "861a89c47a29170dfeda70fd35fca80b690c8102793b93c5ed63547f8e23ad98",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe437f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000013a1339085560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1752414467"
+                "0x6873b903"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest438.json b/GeneralStateTests/stRandom/randomStatetest438.json
index 7d817b135..0010c508b 100644
--- a/GeneralStateTests/stRandom/randomStatetest438.json
+++ b/GeneralStateTests/stRandom/randomStatetest438.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest438" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f3412aab1fae5f611d704f6e47238ac6337e7fa21bc4a16dd716f6fa2f4ff721",
+                    "hash" : "0xf3412aab1fae5f611d704f6e47238ac6337e7fa21bc4a16dd716f6fa2f4ff721",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f3412aab1fae5f611d704f6e47238ac6337e7fa21bc4a16dd716f6fa2f4ff721",
+                    "hash" : "0xf3412aab1fae5f611d704f6e47238ac6337e7fa21bc4a16dd716f6fa2f4ff721",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f3412aab1fae5f611d704f6e47238ac6337e7fa21bc4a16dd716f6fa2f4ff721",
+                    "hash" : "0xf3412aab1fae5f611d704f6e47238ac6337e7fa21bc4a16dd716f6fa2f4ff721",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f3412aab1fae5f611d704f6e47238ac6337e7fa21bc4a16dd716f6fa2f4ff721",
+                    "hash" : "0xf3412aab1fae5f611d704f6e47238ac6337e7fa21bc4a16dd716f6fa2f4ff721",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f3412aab1fae5f611d704f6e47238ac6337e7fa21bc4a16dd716f6fa2f4ff721",
+                    "hash" : "0xf3412aab1fae5f611d704f6e47238ac6337e7fa21bc4a16dd716f6fa2f4ff721",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "f3412aab1fae5f611d704f6e47238ac6337e7fa21bc4a16dd716f6fa2f4ff721",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff097fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1071528892"
+                "0x3fde3bbc"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest439.json b/GeneralStateTests/stRandom/randomStatetest439.json
index 23ed54aff..13be70040 100644
--- a/GeneralStateTests/stRandom/randomStatetest439.json
+++ b/GeneralStateTests/stRandom/randomStatetest439.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest439" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b4a88b9712c8b0833e1214037c12c247e071561ea9696a91406d611d4759fc38",
+                    "hash" : "0xb4a88b9712c8b0833e1214037c12c247e071561ea9696a91406d611d4759fc38",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b4a88b9712c8b0833e1214037c12c247e071561ea9696a91406d611d4759fc38",
+                    "hash" : "0xb4a88b9712c8b0833e1214037c12c247e071561ea9696a91406d611d4759fc38",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b4a88b9712c8b0833e1214037c12c247e071561ea9696a91406d611d4759fc38",
+                    "hash" : "0xb4a88b9712c8b0833e1214037c12c247e071561ea9696a91406d611d4759fc38",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b4a88b9712c8b0833e1214037c12c247e071561ea9696a91406d611d4759fc38",
+                    "hash" : "0xb4a88b9712c8b0833e1214037c12c247e071561ea9696a91406d611d4759fc38",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b4a88b9712c8b0833e1214037c12c247e071561ea9696a91406d611d4759fc38",
+                    "hash" : "0xb4a88b9712c8b0833e1214037c12c247e071561ea9696a91406d611d4759fc38",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "b4a88b9712c8b0833e1214037c12c247e071561ea9696a91406d611d4759fc38",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f5b1609653438813340097c53a493165560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "398066515"
+                "0x17ba0353"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest44.json b/GeneralStateTests/stRandom/randomStatetest44.json
index 4338984e2..d6876156d 100644
--- a/GeneralStateTests/stRandom/randomStatetest44.json
+++ b/GeneralStateTests/stRandom/randomStatetest44.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest44" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e04c386bad9476b49f5a5b01c71f967aad5aa75ff3000d9c006c01322c62a077",
+                    "hash" : "0xe04c386bad9476b49f5a5b01c71f967aad5aa75ff3000d9c006c01322c62a077",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e04c386bad9476b49f5a5b01c71f967aad5aa75ff3000d9c006c01322c62a077",
+                    "hash" : "0xe04c386bad9476b49f5a5b01c71f967aad5aa75ff3000d9c006c01322c62a077",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e04c386bad9476b49f5a5b01c71f967aad5aa75ff3000d9c006c01322c62a077",
+                    "hash" : "0xe04c386bad9476b49f5a5b01c71f967aad5aa75ff3000d9c006c01322c62a077",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e04c386bad9476b49f5a5b01c71f967aad5aa75ff3000d9c006c01322c62a077",
+                    "hash" : "0xe04c386bad9476b49f5a5b01c71f967aad5aa75ff3000d9c006c01322c62a077",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e04c386bad9476b49f5a5b01c71f967aad5aa75ff3000d9c006c01322c62a077",
+                    "hash" : "0xe04c386bad9476b49f5a5b01c71f967aad5aa75ff3000d9c006c01322c62a077",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "6352dbf5277b52b7b21075dab123fb4ca306c7c65102d4f90e80be9db115229b",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x4240444141454542530855",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest440.json b/GeneralStateTests/stRandom/randomStatetest440.json
index b24792e05..816cc0b72 100644
--- a/GeneralStateTests/stRandom/randomStatetest440.json
+++ b/GeneralStateTests/stRandom/randomStatetest440.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest440" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f0474d54b13438523191833ead3e093749103afefde5ea8875bc7e56a9644c22",
+                    "hash" : "0xf0474d54b13438523191833ead3e093749103afefde5ea8875bc7e56a9644c22",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f0474d54b13438523191833ead3e093749103afefde5ea8875bc7e56a9644c22",
+                    "hash" : "0xf0474d54b13438523191833ead3e093749103afefde5ea8875bc7e56a9644c22",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f0474d54b13438523191833ead3e093749103afefde5ea8875bc7e56a9644c22",
+                    "hash" : "0xf0474d54b13438523191833ead3e093749103afefde5ea8875bc7e56a9644c22",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f0474d54b13438523191833ead3e093749103afefde5ea8875bc7e56a9644c22",
+                    "hash" : "0xf0474d54b13438523191833ead3e093749103afefde5ea8875bc7e56a9644c22",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f0474d54b13438523191833ead3e093749103afefde5ea8875bc7e56a9644c22",
+                    "hash" : "0xf0474d54b13438523191833ead3e093749103afefde5ea8875bc7e56a9644c22",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "f0474d54b13438523191833ead3e093749103afefde5ea8875bc7e56a9644c22",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b545457f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff416f01513a9b8216816f74f3676e9ea2615560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1245697846"
+                "0x4a3fd736"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest441.json b/GeneralStateTests/stRandom/randomStatetest441.json
index 2c1d9c6fa..ed2e1847b 100644
--- a/GeneralStateTests/stRandom/randomStatetest441.json
+++ b/GeneralStateTests/stRandom/randomStatetest441.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest441" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "904a99508429458cd8f4f891184f4257c84db36835239ddfe0d2e53770d67ca2",
+                    "hash" : "0x904a99508429458cd8f4f891184f4257c84db36835239ddfe0d2e53770d67ca2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "904a99508429458cd8f4f891184f4257c84db36835239ddfe0d2e53770d67ca2",
+                    "hash" : "0x904a99508429458cd8f4f891184f4257c84db36835239ddfe0d2e53770d67ca2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "904a99508429458cd8f4f891184f4257c84db36835239ddfe0d2e53770d67ca2",
+                    "hash" : "0x904a99508429458cd8f4f891184f4257c84db36835239ddfe0d2e53770d67ca2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "904a99508429458cd8f4f891184f4257c84db36835239ddfe0d2e53770d67ca2",
+                    "hash" : "0x904a99508429458cd8f4f891184f4257c84db36835239ddfe0d2e53770d67ca2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "904a99508429458cd8f4f891184f4257c84db36835239ddfe0d2e53770d67ca2",
+                    "hash" : "0x904a99508429458cd8f4f891184f4257c84db36835239ddfe0d2e53770d67ca2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "316dc9590738860b47526464d83665e2589f72be3bcc59b6b7c754ba42ebbe44",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x444241414545444555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest442.json b/GeneralStateTests/stRandom/randomStatetest442.json
index 062d07da7..4aeeca282 100644
--- a/GeneralStateTests/stRandom/randomStatetest442.json
+++ b/GeneralStateTests/stRandom/randomStatetest442.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest442" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f98ac46d7c5ea5b279ef41988e03f25a094ad6b99b0e99247cb79151f936945e",
+                    "hash" : "0xf98ac46d7c5ea5b279ef41988e03f25a094ad6b99b0e99247cb79151f936945e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f98ac46d7c5ea5b279ef41988e03f25a094ad6b99b0e99247cb79151f936945e",
+                    "hash" : "0xf98ac46d7c5ea5b279ef41988e03f25a094ad6b99b0e99247cb79151f936945e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f98ac46d7c5ea5b279ef41988e03f25a094ad6b99b0e99247cb79151f936945e",
+                    "hash" : "0xf98ac46d7c5ea5b279ef41988e03f25a094ad6b99b0e99247cb79151f936945e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f98ac46d7c5ea5b279ef41988e03f25a094ad6b99b0e99247cb79151f936945e",
+                    "hash" : "0xf98ac46d7c5ea5b279ef41988e03f25a094ad6b99b0e99247cb79151f936945e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f98ac46d7c5ea5b279ef41988e03f25a094ad6b99b0e99247cb79151f936945e",
+                    "hash" : "0xf98ac46d7c5ea5b279ef41988e03f25a094ad6b99b0e99247cb79151f936945e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "f98ac46d7c5ea5b279ef41988e03f25a094ad6b99b0e99247cb79151f936945e",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff917f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3501833815560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "794450594"
+                "0x2f5a5aa2"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest443.json b/GeneralStateTests/stRandom/randomStatetest443.json
index 0ffd6435b..0ae57d360 100644
--- a/GeneralStateTests/stRandom/randomStatetest443.json
+++ b/GeneralStateTests/stRandom/randomStatetest443.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest443" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "3c9d47fb3ada07b78c2e6470ed8b4107db21e513979a71c270d97da5a20186bc",
+                    "hash" : "0x3c9d47fb3ada07b78c2e6470ed8b4107db21e513979a71c270d97da5a20186bc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "3c9d47fb3ada07b78c2e6470ed8b4107db21e513979a71c270d97da5a20186bc",
+                    "hash" : "0x3c9d47fb3ada07b78c2e6470ed8b4107db21e513979a71c270d97da5a20186bc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3c9d47fb3ada07b78c2e6470ed8b4107db21e513979a71c270d97da5a20186bc",
+                    "hash" : "0x3c9d47fb3ada07b78c2e6470ed8b4107db21e513979a71c270d97da5a20186bc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3c9d47fb3ada07b78c2e6470ed8b4107db21e513979a71c270d97da5a20186bc",
+                    "hash" : "0x3c9d47fb3ada07b78c2e6470ed8b4107db21e513979a71c270d97da5a20186bc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "3c9d47fb3ada07b78c2e6470ed8b4107db21e513979a71c270d97da5a20186bc",
+                    "hash" : "0x3c9d47fb3ada07b78c2e6470ed8b4107db21e513979a71c270d97da5a20186bc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "3c9d47fb3ada07b78c2e6470ed8b4107db21e513979a71c270d97da5a20186bc",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000001155933704",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1499936335"
+                "0x5967364f"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest444.json b/GeneralStateTests/stRandom/randomStatetest444.json
index 0dce7ad2f..d29c1f418 100644
--- a/GeneralStateTests/stRandom/randomStatetest444.json
+++ b/GeneralStateTests/stRandom/randomStatetest444.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest444" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "45177b244bb3e9f7471b3ee95a26cbe5f5dc9df94534729f429ce395f1d3a6cf",
+                    "hash" : "0x45177b244bb3e9f7471b3ee95a26cbe5f5dc9df94534729f429ce395f1d3a6cf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "45177b244bb3e9f7471b3ee95a26cbe5f5dc9df94534729f429ce395f1d3a6cf",
+                    "hash" : "0x45177b244bb3e9f7471b3ee95a26cbe5f5dc9df94534729f429ce395f1d3a6cf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "45177b244bb3e9f7471b3ee95a26cbe5f5dc9df94534729f429ce395f1d3a6cf",
+                    "hash" : "0x45177b244bb3e9f7471b3ee95a26cbe5f5dc9df94534729f429ce395f1d3a6cf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "45177b244bb3e9f7471b3ee95a26cbe5f5dc9df94534729f429ce395f1d3a6cf",
+                    "hash" : "0x45177b244bb3e9f7471b3ee95a26cbe5f5dc9df94534729f429ce395f1d3a6cf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "45177b244bb3e9f7471b3ee95a26cbe5f5dc9df94534729f429ce395f1d3a6cf",
+                    "hash" : "0x45177b244bb3e9f7471b3ee95a26cbe5f5dc9df94534729f429ce395f1d3a6cf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "45177b244bb3e9f7471b3ee95a26cbe5f5dc9df94534729f429ce395f1d3a6cf",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f0000000000000000000000010000000000000000000000000000000000000000607f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff661392843555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1481275721"
+                "0x584a7949"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest445.json b/GeneralStateTests/stRandom/randomStatetest445.json
index b6a28fb67..dc89d1188 100644
--- a/GeneralStateTests/stRandom/randomStatetest445.json
+++ b/GeneralStateTests/stRandom/randomStatetest445.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest445" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "248865514189f3f7c8d2f00511eb7259e5c3b97df45d9d980126c5e9425063d9",
+                    "hash" : "0x248865514189f3f7c8d2f00511eb7259e5c3b97df45d9d980126c5e9425063d9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "248865514189f3f7c8d2f00511eb7259e5c3b97df45d9d980126c5e9425063d9",
+                    "hash" : "0x248865514189f3f7c8d2f00511eb7259e5c3b97df45d9d980126c5e9425063d9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "248865514189f3f7c8d2f00511eb7259e5c3b97df45d9d980126c5e9425063d9",
+                    "hash" : "0x248865514189f3f7c8d2f00511eb7259e5c3b97df45d9d980126c5e9425063d9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "248865514189f3f7c8d2f00511eb7259e5c3b97df45d9d980126c5e9425063d9",
+                    "hash" : "0x248865514189f3f7c8d2f00511eb7259e5c3b97df45d9d980126c5e9425063d9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "248865514189f3f7c8d2f00511eb7259e5c3b97df45d9d980126c5e9425063d9",
+                    "hash" : "0x248865514189f3f7c8d2f00511eb7259e5c3b97df45d9d980126c5e9425063d9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "248865514189f3f7c8d2f00511eb7259e5c3b97df45d9d980126c5e9425063d9",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000008756993365a1376155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "340638033"
+                "0x144db951"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest446.json b/GeneralStateTests/stRandom/randomStatetest446.json
index aa9f033ad..69a0132a8 100644
--- a/GeneralStateTests/stRandom/randomStatetest446.json
+++ b/GeneralStateTests/stRandom/randomStatetest446.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest446" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "3eb278091ceba2963d49ffe11644fb2140639ee9a1a17fe23cfacd55de40d4c2",
+                    "hash" : "0x3eb278091ceba2963d49ffe11644fb2140639ee9a1a17fe23cfacd55de40d4c2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "3eb278091ceba2963d49ffe11644fb2140639ee9a1a17fe23cfacd55de40d4c2",
+                    "hash" : "0x3eb278091ceba2963d49ffe11644fb2140639ee9a1a17fe23cfacd55de40d4c2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3eb278091ceba2963d49ffe11644fb2140639ee9a1a17fe23cfacd55de40d4c2",
+                    "hash" : "0x3eb278091ceba2963d49ffe11644fb2140639ee9a1a17fe23cfacd55de40d4c2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3eb278091ceba2963d49ffe11644fb2140639ee9a1a17fe23cfacd55de40d4c2",
+                    "hash" : "0x3eb278091ceba2963d49ffe11644fb2140639ee9a1a17fe23cfacd55de40d4c2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "3eb278091ceba2963d49ffe11644fb2140639ee9a1a17fe23cfacd55de40d4c2",
+                    "hash" : "0x3eb278091ceba2963d49ffe11644fb2140639ee9a1a17fe23cfacd55de40d4c2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "3eb278091ceba2963d49ffe11644fb2140639ee9a1a17fe23cfacd55de40d4c2",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0955",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "141749433"
+                "0x0872ecb9"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest447.json b/GeneralStateTests/stRandom/randomStatetest447.json
index 020edc7d9..7e04e2415 100644
--- a/GeneralStateTests/stRandom/randomStatetest447.json
+++ b/GeneralStateTests/stRandom/randomStatetest447.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest447" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7cdbaeca641a4910d86fc89e8897ce522d64c7efff9af8821b6d9b21e6f6ae16",
+                    "hash" : "0x7cdbaeca641a4910d86fc89e8897ce522d64c7efff9af8821b6d9b21e6f6ae16",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7cdbaeca641a4910d86fc89e8897ce522d64c7efff9af8821b6d9b21e6f6ae16",
+                    "hash" : "0x7cdbaeca641a4910d86fc89e8897ce522d64c7efff9af8821b6d9b21e6f6ae16",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "7cdbaeca641a4910d86fc89e8897ce522d64c7efff9af8821b6d9b21e6f6ae16",
+                    "hash" : "0x7cdbaeca641a4910d86fc89e8897ce522d64c7efff9af8821b6d9b21e6f6ae16",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "7cdbaeca641a4910d86fc89e8897ce522d64c7efff9af8821b6d9b21e6f6ae16",
+                    "hash" : "0x7cdbaeca641a4910d86fc89e8897ce522d64c7efff9af8821b6d9b21e6f6ae16",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7cdbaeca641a4910d86fc89e8897ce522d64c7efff9af8821b6d9b21e6f6ae16",
+                    "hash" : "0x7cdbaeca641a4910d86fc89e8897ce522d64c7efff9af8821b6d9b21e6f6ae16",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "7cdbaeca641a4910d86fc89e8897ce522d64c7efff9af8821b6d9b21e6f6ae16",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe437f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff085560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,8 +96,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x1569eba8"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest448.json b/GeneralStateTests/stRandom/randomStatetest448.json
index 2f698ae9c..38576845d 100644
--- a/GeneralStateTests/stRandom/randomStatetest448.json
+++ b/GeneralStateTests/stRandom/randomStatetest448.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest448" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "23bb4bd52c3e5cc3fee02d368f964f87b150387d4ef54939fa02bb001dd359d1",
+                    "hash" : "0x23bb4bd52c3e5cc3fee02d368f964f87b150387d4ef54939fa02bb001dd359d1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "23bb4bd52c3e5cc3fee02d368f964f87b150387d4ef54939fa02bb001dd359d1",
+                    "hash" : "0x23bb4bd52c3e5cc3fee02d368f964f87b150387d4ef54939fa02bb001dd359d1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "23bb4bd52c3e5cc3fee02d368f964f87b150387d4ef54939fa02bb001dd359d1",
+                    "hash" : "0x23bb4bd52c3e5cc3fee02d368f964f87b150387d4ef54939fa02bb001dd359d1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "23bb4bd52c3e5cc3fee02d368f964f87b150387d4ef54939fa02bb001dd359d1",
+                    "hash" : "0x23bb4bd52c3e5cc3fee02d368f964f87b150387d4ef54939fa02bb001dd359d1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "23bb4bd52c3e5cc3fee02d368f964f87b150387d4ef54939fa02bb001dd359d1",
+                    "hash" : "0x23bb4bd52c3e5cc3fee02d368f964f87b150387d4ef54939fa02bb001dd359d1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "23bb4bd52c3e5cc3fee02d368f964f87b150387d4ef54939fa02bb001dd359d1",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x427f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff583481f36a85646d53671639175b940860005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1485632"
+                "0x16ab40"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest449.json b/GeneralStateTests/stRandom/randomStatetest449.json
index 3c015e66a..4eacbcb60 100644
--- a/GeneralStateTests/stRandom/randomStatetest449.json
+++ b/GeneralStateTests/stRandom/randomStatetest449.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest449" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "4464263a97ca34956c33f5ee1f832cc031a381af5cc62c2a840616df19945719",
+                    "hash" : "0x4464263a97ca34956c33f5ee1f832cc031a381af5cc62c2a840616df19945719",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "4464263a97ca34956c33f5ee1f832cc031a381af5cc62c2a840616df19945719",
+                    "hash" : "0x4464263a97ca34956c33f5ee1f832cc031a381af5cc62c2a840616df19945719",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4464263a97ca34956c33f5ee1f832cc031a381af5cc62c2a840616df19945719",
+                    "hash" : "0x4464263a97ca34956c33f5ee1f832cc031a381af5cc62c2a840616df19945719",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4464263a97ca34956c33f5ee1f832cc031a381af5cc62c2a840616df19945719",
+                    "hash" : "0x4464263a97ca34956c33f5ee1f832cc031a381af5cc62c2a840616df19945719",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "4464263a97ca34956c33f5ee1f832cc031a381af5cc62c2a840616df19945719",
+                    "hash" : "0x4464263a97ca34956c33f5ee1f832cc031a381af5cc62c2a840616df19945719",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "4464263a97ca34956c33f5ee1f832cc031a381af5cc62c2a840616df19945719",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x197f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b58b66e4ff65a056f39b529f",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1857649905"
+                "0x6eb97cf1"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest45.json b/GeneralStateTests/stRandom/randomStatetest45.json
index 5ebec5287..6c034d24a 100644
--- a/GeneralStateTests/stRandom/randomStatetest45.json
+++ b/GeneralStateTests/stRandom/randomStatetest45.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest45" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "81ecc4f1cf883a5c5ee77143f4f72c4975c781b7432f3a3a73e4444a24de7905",
+                    "hash" : "0x81ecc4f1cf883a5c5ee77143f4f72c4975c781b7432f3a3a73e4444a24de7905",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "81ecc4f1cf883a5c5ee77143f4f72c4975c781b7432f3a3a73e4444a24de7905",
+                    "hash" : "0x81ecc4f1cf883a5c5ee77143f4f72c4975c781b7432f3a3a73e4444a24de7905",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "cb6a09074033e79b032266b4559b951707d2573a430f58550855dd6236f2cb3a",
+                    "hash" : "0xcb6a09074033e79b032266b4559b951707d2573a430f58550855dd6236f2cb3a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "cb6a09074033e79b032266b4559b951707d2573a430f58550855dd6236f2cb3a",
+                    "hash" : "0xcb6a09074033e79b032266b4559b951707d2573a430f58550855dd6236f2cb3a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "81ecc4f1cf883a5c5ee77143f4f72c4975c781b7432f3a3a73e4444a24de7905",
+                    "hash" : "0x81ecc4f1cf883a5c5ee77143f4f72c4975c781b7432f3a3a73e4444a24de7905",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "cb6a09074033e79b032266b4559b951707d2573a430f58550855dd6236f2cb3a",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5317fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000417ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe43147256a3130255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1998384914"
+                "0x771cef12"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest450.json b/GeneralStateTests/stRandom/randomStatetest450.json
index 615806055..ec54f2653 100644
--- a/GeneralStateTests/stRandom/randomStatetest450.json
+++ b/GeneralStateTests/stRandom/randomStatetest450.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest450" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "03a9f209c265fd52289ca0df99196210a90a9555aee156d1cad47689c9b19387",
+                    "hash" : "0x03a9f209c265fd52289ca0df99196210a90a9555aee156d1cad47689c9b19387",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "03a9f209c265fd52289ca0df99196210a90a9555aee156d1cad47689c9b19387",
+                    "hash" : "0x03a9f209c265fd52289ca0df99196210a90a9555aee156d1cad47689c9b19387",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "03a9f209c265fd52289ca0df99196210a90a9555aee156d1cad47689c9b19387",
+                    "hash" : "0x03a9f209c265fd52289ca0df99196210a90a9555aee156d1cad47689c9b19387",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "03a9f209c265fd52289ca0df99196210a90a9555aee156d1cad47689c9b19387",
+                    "hash" : "0x03a9f209c265fd52289ca0df99196210a90a9555aee156d1cad47689c9b19387",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "03a9f209c265fd52289ca0df99196210a90a9555aee156d1cad47689c9b19387",
+                    "hash" : "0x03a9f209c265fd52289ca0df99196210a90a9555aee156d1cad47689c9b19387",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "03a9f209c265fd52289ca0df99196210a90a9555aee156d1cad47689c9b19387",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000010000000000000000000000000000000000000000033a8060005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,8 +96,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x50f09196"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest451.json b/GeneralStateTests/stRandom/randomStatetest451.json
index b8e12b972..1bba33bba 100644
--- a/GeneralStateTests/stRandom/randomStatetest451.json
+++ b/GeneralStateTests/stRandom/randomStatetest451.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest451" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6add7e7ee018246f6130dcb4a6562c67239a7fd79a57f80baa1438224a0d49a3",
+                    "hash" : "0x6add7e7ee018246f6130dcb4a6562c67239a7fd79a57f80baa1438224a0d49a3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6add7e7ee018246f6130dcb4a6562c67239a7fd79a57f80baa1438224a0d49a3",
+                    "hash" : "0x6add7e7ee018246f6130dcb4a6562c67239a7fd79a57f80baa1438224a0d49a3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6add7e7ee018246f6130dcb4a6562c67239a7fd79a57f80baa1438224a0d49a3",
+                    "hash" : "0x6add7e7ee018246f6130dcb4a6562c67239a7fd79a57f80baa1438224a0d49a3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6add7e7ee018246f6130dcb4a6562c67239a7fd79a57f80baa1438224a0d49a3",
+                    "hash" : "0x6add7e7ee018246f6130dcb4a6562c67239a7fd79a57f80baa1438224a0d49a3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6add7e7ee018246f6130dcb4a6562c67239a7fd79a57f80baa1438224a0d49a3",
+                    "hash" : "0x6add7e7ee018246f6130dcb4a6562c67239a7fd79a57f80baa1438224a0d49a3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "6add7e7ee018246f6130dcb4a6562c67239a7fd79a57f80baa1438224a0d49a3",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000006fed05989a0659453076573a870411745560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "812425754"
+                "0x306ca21a"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest452.json b/GeneralStateTests/stRandom/randomStatetest452.json
index d1e8b8b15..4814cce04 100644
--- a/GeneralStateTests/stRandom/randomStatetest452.json
+++ b/GeneralStateTests/stRandom/randomStatetest452.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest452" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "ae04482669df0a13f38443b42853e852c919502cb80b7d292d81c1e54b065b14",
+                    "hash" : "0xae04482669df0a13f38443b42853e852c919502cb80b7d292d81c1e54b065b14",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "ae04482669df0a13f38443b42853e852c919502cb80b7d292d81c1e54b065b14",
+                    "hash" : "0xae04482669df0a13f38443b42853e852c919502cb80b7d292d81c1e54b065b14",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "ae04482669df0a13f38443b42853e852c919502cb80b7d292d81c1e54b065b14",
+                    "hash" : "0xae04482669df0a13f38443b42853e852c919502cb80b7d292d81c1e54b065b14",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ae04482669df0a13f38443b42853e852c919502cb80b7d292d81c1e54b065b14",
+                    "hash" : "0xae04482669df0a13f38443b42853e852c919502cb80b7d292d81c1e54b065b14",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "ae04482669df0a13f38443b42853e852c919502cb80b7d292d81c1e54b065b14",
+                    "hash" : "0xae04482669df0a13f38443b42853e852c919502cb80b7d292d81c1e54b065b14",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "ae04482669df0a13f38443b42853e852c919502cb80b7d292d81c1e54b065b14",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b56f0a3289746806163630047dff9831055560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1492613506"
+                "0x58f77982"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest453.json b/GeneralStateTests/stRandom/randomStatetest453.json
index 17f21961c..df397bd98 100644
--- a/GeneralStateTests/stRandom/randomStatetest453.json
+++ b/GeneralStateTests/stRandom/randomStatetest453.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest453" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
             {
@@ -21,7 +21,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6aa9b9bbe84c03b9a6e25628f3eb87f8e844f7d08de5afa9b3cfda9f62867ced",
+                    "hash" : "0x6aa9b9bbe84c03b9a6e25628f3eb87f8e844f7d08de5afa9b3cfda9f62867ced",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6aa9b9bbe84c03b9a6e25628f3eb87f8e844f7d08de5afa9b3cfda9f62867ced",
+                    "hash" : "0x6aa9b9bbe84c03b9a6e25628f3eb87f8e844f7d08de5afa9b3cfda9f62867ced",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6aa9b9bbe84c03b9a6e25628f3eb87f8e844f7d08de5afa9b3cfda9f62867ced",
+                    "hash" : "0x6aa9b9bbe84c03b9a6e25628f3eb87f8e844f7d08de5afa9b3cfda9f62867ced",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6aa9b9bbe84c03b9a6e25628f3eb87f8e844f7d08de5afa9b3cfda9f62867ced",
+                    "hash" : "0x6aa9b9bbe84c03b9a6e25628f3eb87f8e844f7d08de5afa9b3cfda9f62867ced",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,7 +61,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6aa9b9bbe84c03b9a6e25628f3eb87f8e844f7d08de5afa9b3cfda9f62867ced",
+                    "hash" : "0x6aa9b9bbe84c03b9a6e25628f3eb87f8e844f7d08de5afa9b3cfda9f62867ced",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -72,23 +72,23 @@
         },
         "postStateRoot" : "6aa9b9bbe84c03b9a6e25628f3eb87f8e844f7d08de5afa9b3cfda9f62867ced",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x457f000000000000000000000000000000000000000000000000000000000000c350457f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff097f0000000000000000000000000000000000000000000000000000000000000001a0407907a0609ba280596c733c3960005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -103,10 +103,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "2025901210"
+                "0x78c0cc9a"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest454.json b/GeneralStateTests/stRandom/randomStatetest454.json
index b39ac5771..35e5d2cb2 100644
--- a/GeneralStateTests/stRandom/randomStatetest454.json
+++ b/GeneralStateTests/stRandom/randomStatetest454.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest454" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "8b95863987e182e7ba0991c0d07e9f14959c04239819ee32c3ffe81cbec8400c",
+                    "hash" : "0x8b95863987e182e7ba0991c0d07e9f14959c04239819ee32c3ffe81cbec8400c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "8b95863987e182e7ba0991c0d07e9f14959c04239819ee32c3ffe81cbec8400c",
+                    "hash" : "0x8b95863987e182e7ba0991c0d07e9f14959c04239819ee32c3ffe81cbec8400c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "8b95863987e182e7ba0991c0d07e9f14959c04239819ee32c3ffe81cbec8400c",
+                    "hash" : "0x8b95863987e182e7ba0991c0d07e9f14959c04239819ee32c3ffe81cbec8400c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "8b95863987e182e7ba0991c0d07e9f14959c04239819ee32c3ffe81cbec8400c",
+                    "hash" : "0x8b95863987e182e7ba0991c0d07e9f14959c04239819ee32c3ffe81cbec8400c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "8b95863987e182e7ba0991c0d07e9f14959c04239819ee32c3ffe81cbec8400c",
+                    "hash" : "0x8b95863987e182e7ba0991c0d07e9f14959c04239819ee32c3ffe81cbec8400c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "8b95863987e182e7ba0991c0d07e9f14959c04239819ee32c3ffe81cbec8400c",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000000000000000000000000000557f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000557f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b50a84339188646595668352a061855560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1431310051"
+                "0x55500ee3"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest455.json b/GeneralStateTests/stRandom/randomStatetest455.json
index b9ee7c713..6b3089120 100644
--- a/GeneralStateTests/stRandom/randomStatetest455.json
+++ b/GeneralStateTests/stRandom/randomStatetest455.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest455" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "009cab4a4292263790c36bcf29fe2f0d540f7e08949ab7d4a2c67e7e854d2504",
+                    "hash" : "0x009cab4a4292263790c36bcf29fe2f0d540f7e08949ab7d4a2c67e7e854d2504",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "009cab4a4292263790c36bcf29fe2f0d540f7e08949ab7d4a2c67e7e854d2504",
+                    "hash" : "0x009cab4a4292263790c36bcf29fe2f0d540f7e08949ab7d4a2c67e7e854d2504",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "009cab4a4292263790c36bcf29fe2f0d540f7e08949ab7d4a2c67e7e854d2504",
+                    "hash" : "0x009cab4a4292263790c36bcf29fe2f0d540f7e08949ab7d4a2c67e7e854d2504",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "009cab4a4292263790c36bcf29fe2f0d540f7e08949ab7d4a2c67e7e854d2504",
+                    "hash" : "0x009cab4a4292263790c36bcf29fe2f0d540f7e08949ab7d4a2c67e7e854d2504",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "009cab4a4292263790c36bcf29fe2f0d540f7e08949ab7d4a2c67e7e854d2504",
+                    "hash" : "0x009cab4a4292263790c36bcf29fe2f0d540f7e08949ab7d4a2c67e7e854d2504",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "009cab4a4292263790c36bcf29fe2f0d540f7e08949ab7d4a2c67e7e854d2504",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b56f858b1411f218693ca2245b918274f35560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "737734735"
+                "0x2bf8f04f"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest456.json b/GeneralStateTests/stRandom/randomStatetest456.json
index 33989471e..6fd758fec 100644
--- a/GeneralStateTests/stRandom/randomStatetest456.json
+++ b/GeneralStateTests/stRandom/randomStatetest456.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest456" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "fd87625e181210729a2eb90f115a5d8071e58b87b3ea32f95c85842cf2cdc2f4",
+                    "hash" : "0xfd87625e181210729a2eb90f115a5d8071e58b87b3ea32f95c85842cf2cdc2f4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "fd87625e181210729a2eb90f115a5d8071e58b87b3ea32f95c85842cf2cdc2f4",
+                    "hash" : "0xfd87625e181210729a2eb90f115a5d8071e58b87b3ea32f95c85842cf2cdc2f4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "fd87625e181210729a2eb90f115a5d8071e58b87b3ea32f95c85842cf2cdc2f4",
+                    "hash" : "0xfd87625e181210729a2eb90f115a5d8071e58b87b3ea32f95c85842cf2cdc2f4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "fd87625e181210729a2eb90f115a5d8071e58b87b3ea32f95c85842cf2cdc2f4",
+                    "hash" : "0xfd87625e181210729a2eb90f115a5d8071e58b87b3ea32f95c85842cf2cdc2f4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "fd87625e181210729a2eb90f115a5d8071e58b87b3ea32f95c85842cf2cdc2f4",
+                    "hash" : "0xfd87625e181210729a2eb90f115a5d8071e58b87b3ea32f95c85842cf2cdc2f4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "8464ad6046be49963917e36af7d10ff41bc25f298dcb87c1e1a464bd05238f0b",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x41424143445a42f35b10773574016c9f",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest457.json b/GeneralStateTests/stRandom/randomStatetest457.json
index 764c85255..122bb4077 100644
--- a/GeneralStateTests/stRandom/randomStatetest457.json
+++ b/GeneralStateTests/stRandom/randomStatetest457.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest457" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7db537b28e282a8ce1726fa91e36b91a246577854aa6cf1158c2edd36734d77b",
+                    "hash" : "0x7db537b28e282a8ce1726fa91e36b91a246577854aa6cf1158c2edd36734d77b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7db537b28e282a8ce1726fa91e36b91a246577854aa6cf1158c2edd36734d77b",
+                    "hash" : "0x7db537b28e282a8ce1726fa91e36b91a246577854aa6cf1158c2edd36734d77b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "7db537b28e282a8ce1726fa91e36b91a246577854aa6cf1158c2edd36734d77b",
+                    "hash" : "0x7db537b28e282a8ce1726fa91e36b91a246577854aa6cf1158c2edd36734d77b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "7db537b28e282a8ce1726fa91e36b91a246577854aa6cf1158c2edd36734d77b",
+                    "hash" : "0x7db537b28e282a8ce1726fa91e36b91a246577854aa6cf1158c2edd36734d77b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7db537b28e282a8ce1726fa91e36b91a246577854aa6cf1158c2edd36734d77b",
+                    "hash" : "0x7db537b28e282a8ce1726fa91e36b91a246577854aa6cf1158c2edd36734d77b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "7db537b28e282a8ce1726fa91e36b91a246577854aa6cf1158c2edd36734d77b",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x44417f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f949fa28af308a37a136c626218927d5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "316557712"
+                "0x12de4990"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest458.json b/GeneralStateTests/stRandom/randomStatetest458.json
index 26e3aa68d..a73c9290a 100644
--- a/GeneralStateTests/stRandom/randomStatetest458.json
+++ b/GeneralStateTests/stRandom/randomStatetest458.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest458" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
             {
@@ -21,7 +21,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "49b518fee7a1b850759b6baeb61e6dec05746aa7a289978b340b44abf523998c",
+                    "hash" : "0x49b518fee7a1b850759b6baeb61e6dec05746aa7a289978b340b44abf523998c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "49b518fee7a1b850759b6baeb61e6dec05746aa7a289978b340b44abf523998c",
+                    "hash" : "0x49b518fee7a1b850759b6baeb61e6dec05746aa7a289978b340b44abf523998c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e64691d98e2e982dacfd2758bcefc2345f42bca0d4a964bc47e8b75746ab544f",
+                    "hash" : "0xe64691d98e2e982dacfd2758bcefc2345f42bca0d4a964bc47e8b75746ab544f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e64691d98e2e982dacfd2758bcefc2345f42bca0d4a964bc47e8b75746ab544f",
+                    "hash" : "0xe64691d98e2e982dacfd2758bcefc2345f42bca0d4a964bc47e8b75746ab544f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,7 +61,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "49b518fee7a1b850759b6baeb61e6dec05746aa7a289978b340b44abf523998c",
+                    "hash" : "0x49b518fee7a1b850759b6baeb61e6dec05746aa7a289978b340b44abf523998c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -72,23 +72,23 @@
         },
         "postStateRoot" : "e64691d98e2e982dacfd2758bcefc2345f42bca0d4a964bc47e8b75746ab544f",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7689747fb3520231748bbe5eb9617666e630019e3e84ce7179c5d83b7e36050e5c05623956e599f54eb56213e4f96f69f402cd73e13c366095a3fe56bdd6a815d9ba23f3a9729bc462385c697ed9f24192c949e33ff7ed256c84979d70148b8fd8a62438ca053de2642271456dde46ce78cf7c6d1d2cc48eee658a73ad9f9ca1e550720490e2d0769e0a429773e42fc965ea1030f6c0787b4e7bc4915150a99fc758d3373561d8917c4c7d605f0cd8d2203f4d69606198437429e2f2d2bf742b28760a9c0ab51203d0c5d5b9e16d74ce0428945aaff2d0f99240a901d3233bd04e366c367ab93ecea0c206fbf01084254636df9c1f308c7d6875d5d5d37f3ce27989e39048f175f0d2dc49eaa86530def7ab70553f5d3904c843b5736025e321e7e2ab92af570e5b3bef4014c54e65316bb546eb8906f155f7b9405326740104d8f5d98dc97ac374ad0c58f4385e086891b9b2657e982eb15a367eab6683b51ea9f219abae5ca39f669a1a88a82e14efd4192a3edbe04a12d35679cf6338130d67f37c324464d16cc866be846b0304ef9fd3c6611e6cdf1277d65f6b2a58ffb61ba979740b8df72816602071e979e6029c9307d718ffdc70f37ea0019353c06b0fb56d8e3738dfdb18418e952092e8625b51749f276cc6ae416a85bd070c61e65240d8c2719c76b0420f84ece41c9be0f93d4f30581c28f69768395163937f95b86da30fa76b6937870245d9250e06b6e07dffea8f849a37647378dd59ac8365a37dd908eea26be2f53375e1dbee32ecaa7e957eace8c6f0883e4ef830485bd43b2b7851a0b11497f752d3ee4560e312a7a91b7b2a88c109737c92feb7807d481ac3fd823f038c4ba82df40a60982a7c7a6f6ba2cb95233c257b30e1c9d3c84aa37b6f4268fec34fb9eef1f8602e6a7bf1ebfa162680b57af09f7a7fc584055ff32d68a92e59ddaf20bcaaaa70d5970fd71c04cdbab46cf86e566e870664b6df2c6861347b2a3886788bbebbd03cbb51ed29357f699c8b974c61528a0423f67a837bfab83afa78a0bff70a653ea0f398f73632d5e3bea0a31115d65486fb6d667110448e0208264a3f76f35972666e7aa7339f23b08e6028616337a0366016601d6014600b630e6db38e73095e7baea6a6c7c4c2dfeb977efac326af552d87635706352bf1695bb9e53d5ad3ba1191ea65ae1880d46c687605148e427a09d40172dbdd5fc72fffb1443080a39a0ee77feed9ddc9050affce41d68c34ad97c484f204a987bcfaf46b9fa4a9ed2dad3738771a3cf86b43f303a8db8cde3ed8a40ae35574b9084f4cab88701d150e628d9b2a33e71c8f9fb0ce9e72866257691776f999b7ddf64f22532351bd34743e08facd1acc94b0d6b56bf97491d5ed9d726af684d1a47abcb243b7c29d12a315e939f70af8d2617df63567c3bc56c16609a27871af77631fe1ccaa0d15f8da9bd9a712a544abb92b925b1d7561fced60b09b6b22f2121b105a65a209e151b76b31be481d57353d10a1d968ca7a185495a8a2935571a0d17443a327bf11cb421baca9064bc4e4497c7d4c486c40082cc2d01b3f6023b726de95ac2ad53ae0b731d741676338181e66c8ac8daf0d54776827987e79d9f617c51f6f4b87cf8fee734c99e5e3fc2e37f17e626cbfd1195157215d10fa39b4b0947c3339139b280c0b042da7ec93a24416d5c52e0ba21ec9d39d6fbcd3d74266580eef6ca9bb9d76bb4dc441f3d6d0cf38307b505251deea82ab39f9ccd17a6507bf16b38640679c22f2134e8258f79b",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -103,8 +103,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x7f120206"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest459.json b/GeneralStateTests/stRandom/randomStatetest459.json
index e381db8ea..4dfef851f 100644
--- a/GeneralStateTests/stRandom/randomStatetest459.json
+++ b/GeneralStateTests/stRandom/randomStatetest459.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest459" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "2ba3279a797229c6772fdf66ccdf61994b223fc9fc2587f7e0b2a9b319159f07",
+                    "hash" : "0x2ba3279a797229c6772fdf66ccdf61994b223fc9fc2587f7e0b2a9b319159f07",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "2ba3279a797229c6772fdf66ccdf61994b223fc9fc2587f7e0b2a9b319159f07",
+                    "hash" : "0x2ba3279a797229c6772fdf66ccdf61994b223fc9fc2587f7e0b2a9b319159f07",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2ba3279a797229c6772fdf66ccdf61994b223fc9fc2587f7e0b2a9b319159f07",
+                    "hash" : "0x2ba3279a797229c6772fdf66ccdf61994b223fc9fc2587f7e0b2a9b319159f07",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "2ba3279a797229c6772fdf66ccdf61994b223fc9fc2587f7e0b2a9b319159f07",
+                    "hash" : "0x2ba3279a797229c6772fdf66ccdf61994b223fc9fc2587f7e0b2a9b319159f07",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "2ba3279a797229c6772fdf66ccdf61994b223fc9fc2587f7e0b2a9b319159f07",
+                    "hash" : "0x2ba3279a797229c6772fdf66ccdf61994b223fc9fc2587f7e0b2a9b319159f07",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "be6da064f79684ac60494a46f2aa2e370502a750a01a5f8a3a87e8ae20d2378b",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x45414240454145450855",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest46.json b/GeneralStateTests/stRandom/randomStatetest46.json
index aacb78f15..d6b1440ee 100644
--- a/GeneralStateTests/stRandom/randomStatetest46.json
+++ b/GeneralStateTests/stRandom/randomStatetest46.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest46" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7183e605a39b0bb03e629f510e4bff48e9e676076d919f3792fd572048740b02",
+                    "hash" : "0x7183e605a39b0bb03e629f510e4bff48e9e676076d919f3792fd572048740b02",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7183e605a39b0bb03e629f510e4bff48e9e676076d919f3792fd572048740b02",
+                    "hash" : "0x7183e605a39b0bb03e629f510e4bff48e9e676076d919f3792fd572048740b02",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "7183e605a39b0bb03e629f510e4bff48e9e676076d919f3792fd572048740b02",
+                    "hash" : "0x7183e605a39b0bb03e629f510e4bff48e9e676076d919f3792fd572048740b02",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "7183e605a39b0bb03e629f510e4bff48e9e676076d919f3792fd572048740b02",
+                    "hash" : "0x7183e605a39b0bb03e629f510e4bff48e9e676076d919f3792fd572048740b02",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7183e605a39b0bb03e629f510e4bff48e9e676076d919f3792fd572048740b02",
+                    "hash" : "0x7183e605a39b0bb03e629f510e4bff48e9e676076d919f3792fd572048740b02",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "89a31aea399e1cdfed3e8749b53b15f3045d5243a20ef62d26bc7c1722a18e22",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000004560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,8 +96,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x2f7e230c"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest460.json b/GeneralStateTests/stRandom/randomStatetest460.json
index f8bc8c88e..f2dc32e50 100644
--- a/GeneralStateTests/stRandom/randomStatetest460.json
+++ b/GeneralStateTests/stRandom/randomStatetest460.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest460" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "2e82af4267e287bf6a3326cfd327cd098d9a4d2aea736c45206b69c46cde2f93",
+                    "hash" : "0x2e82af4267e287bf6a3326cfd327cd098d9a4d2aea736c45206b69c46cde2f93",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "2e82af4267e287bf6a3326cfd327cd098d9a4d2aea736c45206b69c46cde2f93",
+                    "hash" : "0x2e82af4267e287bf6a3326cfd327cd098d9a4d2aea736c45206b69c46cde2f93",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2e82af4267e287bf6a3326cfd327cd098d9a4d2aea736c45206b69c46cde2f93",
+                    "hash" : "0x2e82af4267e287bf6a3326cfd327cd098d9a4d2aea736c45206b69c46cde2f93",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "2e82af4267e287bf6a3326cfd327cd098d9a4d2aea736c45206b69c46cde2f93",
+                    "hash" : "0x2e82af4267e287bf6a3326cfd327cd098d9a4d2aea736c45206b69c46cde2f93",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "2e82af4267e287bf6a3326cfd327cd098d9a4d2aea736c45206b69c46cde2f93",
+                    "hash" : "0x2e82af4267e287bf6a3326cfd327cd098d9a4d2aea736c45206b69c46cde2f93",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "2e82af4267e287bf6a3326cfd327cd098d9a4d2aea736c45206b69c46cde2f93",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000003a7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350046f16a23c6c90739ba201697b4315778a5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1518569663"
+                "0x5a8388bf"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest461.json b/GeneralStateTests/stRandom/randomStatetest461.json
index 5c1a0f160..cb7ee140f 100644
--- a/GeneralStateTests/stRandom/randomStatetest461.json
+++ b/GeneralStateTests/stRandom/randomStatetest461.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest461" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "2411c06c4e0334f8dc399d4c79457c476893bf26d2d6ae8afa996d60de586d5d",
+                    "hash" : "0x2411c06c4e0334f8dc399d4c79457c476893bf26d2d6ae8afa996d60de586d5d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "2411c06c4e0334f8dc399d4c79457c476893bf26d2d6ae8afa996d60de586d5d",
+                    "hash" : "0x2411c06c4e0334f8dc399d4c79457c476893bf26d2d6ae8afa996d60de586d5d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2411c06c4e0334f8dc399d4c79457c476893bf26d2d6ae8afa996d60de586d5d",
+                    "hash" : "0x2411c06c4e0334f8dc399d4c79457c476893bf26d2d6ae8afa996d60de586d5d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "2411c06c4e0334f8dc399d4c79457c476893bf26d2d6ae8afa996d60de586d5d",
+                    "hash" : "0x2411c06c4e0334f8dc399d4c79457c476893bf26d2d6ae8afa996d60de586d5d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "2411c06c4e0334f8dc399d4c79457c476893bf26d2d6ae8afa996d60de586d5d",
+                    "hash" : "0x2411c06c4e0334f8dc399d4c79457c476893bf26d2d6ae8afa996d60de586d5d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "2411c06c4e0334f8dc399d4c79457c476893bf26d2d6ae8afa996d60de586d5d",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c350517f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff4251525960005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "548509958"
+                "0x20b19906"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest462.json b/GeneralStateTests/stRandom/randomStatetest462.json
index eb8266371..af76a2b73 100644
--- a/GeneralStateTests/stRandom/randomStatetest462.json
+++ b/GeneralStateTests/stRandom/randomStatetest462.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest462" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "30fc769caa24d621be5bcff4ec19d64892bad9931be765e05c82206aa98f7d68",
+                    "hash" : "0x30fc769caa24d621be5bcff4ec19d64892bad9931be765e05c82206aa98f7d68",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "30fc769caa24d621be5bcff4ec19d64892bad9931be765e05c82206aa98f7d68",
+                    "hash" : "0x30fc769caa24d621be5bcff4ec19d64892bad9931be765e05c82206aa98f7d68",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "30fc769caa24d621be5bcff4ec19d64892bad9931be765e05c82206aa98f7d68",
+                    "hash" : "0x30fc769caa24d621be5bcff4ec19d64892bad9931be765e05c82206aa98f7d68",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "30fc769caa24d621be5bcff4ec19d64892bad9931be765e05c82206aa98f7d68",
+                    "hash" : "0x30fc769caa24d621be5bcff4ec19d64892bad9931be765e05c82206aa98f7d68",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "30fc769caa24d621be5bcff4ec19d64892bad9931be765e05c82206aa98f7d68",
+                    "hash" : "0x30fc769caa24d621be5bcff4ec19d64892bad9931be765e05c82206aa98f7d68",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "30fc769caa24d621be5bcff4ec19d64892bad9931be765e05c82206aa98f7d68",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000006f8e0186019d029d1354681482826f375560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1447977690"
+                "0x564e62da"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest463.json b/GeneralStateTests/stRandom/randomStatetest463.json
index 1d65a729d..c5a0cb0fe 100644
--- a/GeneralStateTests/stRandom/randomStatetest463.json
+++ b/GeneralStateTests/stRandom/randomStatetest463.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest463" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "04bf93c06b276db4338cca26ab3037ee60c63fcd49a9b5ac0d37e9cf75c8b7e7",
+                    "hash" : "0x04bf93c06b276db4338cca26ab3037ee60c63fcd49a9b5ac0d37e9cf75c8b7e7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "04bf93c06b276db4338cca26ab3037ee60c63fcd49a9b5ac0d37e9cf75c8b7e7",
+                    "hash" : "0x04bf93c06b276db4338cca26ab3037ee60c63fcd49a9b5ac0d37e9cf75c8b7e7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6a118e1799c5d89dfbf8953e3396f060c5b58ba994cb695103bd3219938c8ce1",
+                    "hash" : "0x6a118e1799c5d89dfbf8953e3396f060c5b58ba994cb695103bd3219938c8ce1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6a118e1799c5d89dfbf8953e3396f060c5b58ba994cb695103bd3219938c8ce1",
+                    "hash" : "0x6a118e1799c5d89dfbf8953e3396f060c5b58ba994cb695103bd3219938c8ce1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "04bf93c06b276db4338cca26ab3037ee60c63fcd49a9b5ac0d37e9cf75c8b7e7",
+                    "hash" : "0x04bf93c06b276db4338cca26ab3037ee60c63fcd49a9b5ac0d37e9cf75c8b7e7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "316ebf2da7952e941d919dbe17a6d8b18d584d2c7a9c5ee605e411080ddc6955",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x4344434041424243f27a",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest464.json b/GeneralStateTests/stRandom/randomStatetest464.json
index 95b32524e..953f635f2 100644
--- a/GeneralStateTests/stRandom/randomStatetest464.json
+++ b/GeneralStateTests/stRandom/randomStatetest464.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest464" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6a8d2c6e4b289b2382dd8aa04960a1b0aa05200230948a693867cd4eba0c49bb",
+                    "hash" : "0x6a8d2c6e4b289b2382dd8aa04960a1b0aa05200230948a693867cd4eba0c49bb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6a8d2c6e4b289b2382dd8aa04960a1b0aa05200230948a693867cd4eba0c49bb",
+                    "hash" : "0x6a8d2c6e4b289b2382dd8aa04960a1b0aa05200230948a693867cd4eba0c49bb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6a8d2c6e4b289b2382dd8aa04960a1b0aa05200230948a693867cd4eba0c49bb",
+                    "hash" : "0x6a8d2c6e4b289b2382dd8aa04960a1b0aa05200230948a693867cd4eba0c49bb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6a8d2c6e4b289b2382dd8aa04960a1b0aa05200230948a693867cd4eba0c49bb",
+                    "hash" : "0x6a8d2c6e4b289b2382dd8aa04960a1b0aa05200230948a693867cd4eba0c49bb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6a8d2c6e4b289b2382dd8aa04960a1b0aa05200230948a693867cd4eba0c49bb",
+                    "hash" : "0x6a8d2c6e4b289b2382dd8aa04960a1b0aa05200230948a693867cd4eba0c49bb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "6a8d2c6e4b289b2382dd8aa04960a1b0aa05200230948a693867cd4eba0c49bb",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x447f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff82095560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "2396601"
+                "0x2491b9"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest465.json b/GeneralStateTests/stRandom/randomStatetest465.json
index 06e14e5b7..d639a1707 100644
--- a/GeneralStateTests/stRandom/randomStatetest465.json
+++ b/GeneralStateTests/stRandom/randomStatetest465.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest465" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f86368de65d734ca2c25bda227757d798e3a8a66dc8ce18ddceed0bd121a2518",
+                    "hash" : "0xf86368de65d734ca2c25bda227757d798e3a8a66dc8ce18ddceed0bd121a2518",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f86368de65d734ca2c25bda227757d798e3a8a66dc8ce18ddceed0bd121a2518",
+                    "hash" : "0xf86368de65d734ca2c25bda227757d798e3a8a66dc8ce18ddceed0bd121a2518",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f86368de65d734ca2c25bda227757d798e3a8a66dc8ce18ddceed0bd121a2518",
+                    "hash" : "0xf86368de65d734ca2c25bda227757d798e3a8a66dc8ce18ddceed0bd121a2518",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f86368de65d734ca2c25bda227757d798e3a8a66dc8ce18ddceed0bd121a2518",
+                    "hash" : "0xf86368de65d734ca2c25bda227757d798e3a8a66dc8ce18ddceed0bd121a2518",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f86368de65d734ca2c25bda227757d798e3a8a66dc8ce18ddceed0bd121a2518",
+                    "hash" : "0xf86368de65d734ca2c25bda227757d798e3a8a66dc8ce18ddceed0bd121a2518",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "f86368de65d734ca2c25bda227757d798e3a8a66dc8ce18ddceed0bd121a2518",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5437f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000000160005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,8 +96,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x5de12c27"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest466.json b/GeneralStateTests/stRandom/randomStatetest466.json
index 2648a3936..b5f6b600b 100644
--- a/GeneralStateTests/stRandom/randomStatetest466.json
+++ b/GeneralStateTests/stRandom/randomStatetest466.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest466" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c1f3c0aa5128dab2961bb8894332602d2434bb572e83f0e66d5e6bdda2c8c08d",
+                    "hash" : "0xc1f3c0aa5128dab2961bb8894332602d2434bb572e83f0e66d5e6bdda2c8c08d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c1f3c0aa5128dab2961bb8894332602d2434bb572e83f0e66d5e6bdda2c8c08d",
+                    "hash" : "0xc1f3c0aa5128dab2961bb8894332602d2434bb572e83f0e66d5e6bdda2c8c08d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "c1f3c0aa5128dab2961bb8894332602d2434bb572e83f0e66d5e6bdda2c8c08d",
+                    "hash" : "0xc1f3c0aa5128dab2961bb8894332602d2434bb572e83f0e66d5e6bdda2c8c08d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c1f3c0aa5128dab2961bb8894332602d2434bb572e83f0e66d5e6bdda2c8c08d",
+                    "hash" : "0xc1f3c0aa5128dab2961bb8894332602d2434bb572e83f0e66d5e6bdda2c8c08d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c1f3c0aa5128dab2961bb8894332602d2434bb572e83f0e66d5e6bdda2c8c08d",
+                    "hash" : "0xc1f3c0aa5128dab2961bb8894332602d2434bb572e83f0e66d5e6bdda2c8c08d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "8b81447cdcd4755c4a1ec09b07a61216dd66106844fe384b5b0e9a7ddf83055d",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff4244904244045560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,8 +96,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x6ac01f3a"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest467.json b/GeneralStateTests/stRandom/randomStatetest467.json
index d0326135b..3e07031ab 100644
--- a/GeneralStateTests/stRandom/randomStatetest467.json
+++ b/GeneralStateTests/stRandom/randomStatetest467.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest467" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
             {
@@ -24,7 +24,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "3bc552cd25f5b09eebbe4dd40ef523874785378d150321e05dc89f855ea35178",
+                    "hash" : "0x3bc552cd25f5b09eebbe4dd40ef523874785378d150321e05dc89f855ea35178",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "3bc552cd25f5b09eebbe4dd40ef523874785378d150321e05dc89f855ea35178",
+                    "hash" : "0x3bc552cd25f5b09eebbe4dd40ef523874785378d150321e05dc89f855ea35178",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e8479c587ba5b6697c96becd91817b010279c8e80a126642770f338214de201d",
+                    "hash" : "0xe8479c587ba5b6697c96becd91817b010279c8e80a126642770f338214de201d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e8479c587ba5b6697c96becd91817b010279c8e80a126642770f338214de201d",
+                    "hash" : "0xe8479c587ba5b6697c96becd91817b010279c8e80a126642770f338214de201d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -64,7 +64,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "3bc552cd25f5b09eebbe4dd40ef523874785378d150321e05dc89f855ea35178",
+                    "hash" : "0x3bc552cd25f5b09eebbe4dd40ef523874785378d150321e05dc89f855ea35178",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -75,23 +75,23 @@
         },
         "postStateRoot" : "e8479c587ba5b6697c96becd91817b010279c8e80a126642770f338214de201d",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x700ab6605e03171122aeebd20b63699a72d454628639346ffaf92bcd1855c6dde5c90ba78a966a256c777ce8880c23f90f4a2ecc999a6cd42da7121d5e1fde1c9c340f9660b571a71e20a5753bc4e291adbd41a228289a0be175a606bc44dd2079ece46a2cba498bee0d80a41673d8016e7232f97a66b29954364570f6e2d08b6d429c6a75f737c594aca21580bc0d60e67c38a50ce1ddf0ce9963fd79da8a590429f5fcfb6e7fd9ee2d27201f95707235ce3dbc5997e44baa174111977f51dc6b333a9a63483e6a3d6f423ed5778057702664b65d4af9aab14d773a787d60bd24c439b29533c6b172278b6a78e64f8e319fbd6b45eeca466afd1eb2eecbaeed773da8711c4c65787e0a0a1297f525b7418f49fbc1b2446a847d74bb0a66e3b06ef70d8a8aa09a910a6be623c6a8239960381512da962eb868a21f99d90741128fcb711e029cff42f4f8f5d35947c4a7b39cff7fd46f916cc8612b146bbf52db1cd36e6c2fce7cd9ed232e21946081d78d87e61bc42fce313fa32b458d1e898e52cc2e607570a7e1d2ae3b5b7d58e0a70396bcfaae0789cd9202876488bb595d457a45bc48e190f5d56b34be6d244070ffe02107ceaf9313db08d9a1809b366fc956e6c5567da1d8a656406871eb0dd46268b5127366225cb464667bd081c949847a95e2821f589dad60c061ef2fa36b9e17c2b3a94181a8f8a89b486734ca1a8a0c86c26d076004601160066012635e0d738673095e7baea6a6c7c4c2dfeb977efac326af552d87636158e2e1f166e10de5d590572335",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -106,8 +106,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x6e30a0e3"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest468.json b/GeneralStateTests/stRandom/randomStatetest468.json
index fcc7ddcce..a6830d0fa 100644
--- a/GeneralStateTests/stRandom/randomStatetest468.json
+++ b/GeneralStateTests/stRandom/randomStatetest468.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest468" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b775d6e61ee51fcc8412cd4ab306cc7ee30327cdb4d7997dd1872064d4818fdf",
+                    "hash" : "0xb775d6e61ee51fcc8412cd4ab306cc7ee30327cdb4d7997dd1872064d4818fdf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b775d6e61ee51fcc8412cd4ab306cc7ee30327cdb4d7997dd1872064d4818fdf",
+                    "hash" : "0xb775d6e61ee51fcc8412cd4ab306cc7ee30327cdb4d7997dd1872064d4818fdf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b775d6e61ee51fcc8412cd4ab306cc7ee30327cdb4d7997dd1872064d4818fdf",
+                    "hash" : "0xb775d6e61ee51fcc8412cd4ab306cc7ee30327cdb4d7997dd1872064d4818fdf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b775d6e61ee51fcc8412cd4ab306cc7ee30327cdb4d7997dd1872064d4818fdf",
+                    "hash" : "0xb775d6e61ee51fcc8412cd4ab306cc7ee30327cdb4d7997dd1872064d4818fdf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b775d6e61ee51fcc8412cd4ab306cc7ee30327cdb4d7997dd1872064d4818fdf",
+                    "hash" : "0xb775d6e61ee51fcc8412cd4ab306cc7ee30327cdb4d7997dd1872064d4818fdf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "9e25620dd9039c8044b101b6d5b5e40c8c2a7c9cf347ca4cbae7e9898dd004a1",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x44404144434542425220356a3b1a",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest469.json b/GeneralStateTests/stRandom/randomStatetest469.json
index 91e0a3710..9378a7e6e 100644
--- a/GeneralStateTests/stRandom/randomStatetest469.json
+++ b/GeneralStateTests/stRandom/randomStatetest469.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest469" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
             {
@@ -21,7 +21,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d71ce638907117f6bdacd55d5547feb04ea50a8c2da296dc887f5bbb909540b5",
+                    "hash" : "0xd71ce638907117f6bdacd55d5547feb04ea50a8c2da296dc887f5bbb909540b5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d71ce638907117f6bdacd55d5547feb04ea50a8c2da296dc887f5bbb909540b5",
+                    "hash" : "0xd71ce638907117f6bdacd55d5547feb04ea50a8c2da296dc887f5bbb909540b5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "d71ce638907117f6bdacd55d5547feb04ea50a8c2da296dc887f5bbb909540b5",
+                    "hash" : "0xd71ce638907117f6bdacd55d5547feb04ea50a8c2da296dc887f5bbb909540b5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "d71ce638907117f6bdacd55d5547feb04ea50a8c2da296dc887f5bbb909540b5",
+                    "hash" : "0xd71ce638907117f6bdacd55d5547feb04ea50a8c2da296dc887f5bbb909540b5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,7 +61,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d71ce638907117f6bdacd55d5547feb04ea50a8c2da296dc887f5bbb909540b5",
+                    "hash" : "0xd71ce638907117f6bdacd55d5547feb04ea50a8c2da296dc887f5bbb909540b5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -72,23 +72,23 @@
         },
         "postStateRoot" : "d71ce638907117f6bdacd55d5547feb04ea50a8c2da296dc887f5bbb909540b5",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001a07ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350f36409156a6aa261413b56f20855",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -103,10 +103,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1762323696"
+                "0x690aecf0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest47.json b/GeneralStateTests/stRandom/randomStatetest47.json
index 8a9697061..dc6686f62 100644
--- a/GeneralStateTests/stRandom/randomStatetest47.json
+++ b/GeneralStateTests/stRandom/randomStatetest47.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest47" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c749fbe6272d55b32cd73500b502d49abfaabb3e762944260687b705f834d5a7",
+                    "hash" : "0xc749fbe6272d55b32cd73500b502d49abfaabb3e762944260687b705f834d5a7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c749fbe6272d55b32cd73500b502d49abfaabb3e762944260687b705f834d5a7",
+                    "hash" : "0xc749fbe6272d55b32cd73500b502d49abfaabb3e762944260687b705f834d5a7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "c749fbe6272d55b32cd73500b502d49abfaabb3e762944260687b705f834d5a7",
+                    "hash" : "0xc749fbe6272d55b32cd73500b502d49abfaabb3e762944260687b705f834d5a7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c749fbe6272d55b32cd73500b502d49abfaabb3e762944260687b705f834d5a7",
+                    "hash" : "0xc749fbe6272d55b32cd73500b502d49abfaabb3e762944260687b705f834d5a7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c749fbe6272d55b32cd73500b502d49abfaabb3e762944260687b705f834d5a7",
+                    "hash" : "0xc749fbe6272d55b32cd73500b502d49abfaabb3e762944260687b705f834d5a7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "c749fbe6272d55b32cd73500b502d49abfaabb3e762944260687b705f834d5a7",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x437f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350437f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f1544898b167c6a6f6d5b953714457e5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "2007082101"
+                "0x77a1a475"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest470.json b/GeneralStateTests/stRandom/randomStatetest470.json
index 529a0edc2..c71189a74 100644
--- a/GeneralStateTests/stRandom/randomStatetest470.json
+++ b/GeneralStateTests/stRandom/randomStatetest470.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest470" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "803f04e36d462235dee12690809f33cb0020c810a6b421a46f97a89b5fade3b3",
+                    "hash" : "0x803f04e36d462235dee12690809f33cb0020c810a6b421a46f97a89b5fade3b3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "803f04e36d462235dee12690809f33cb0020c810a6b421a46f97a89b5fade3b3",
+                    "hash" : "0x803f04e36d462235dee12690809f33cb0020c810a6b421a46f97a89b5fade3b3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "803f04e36d462235dee12690809f33cb0020c810a6b421a46f97a89b5fade3b3",
+                    "hash" : "0x803f04e36d462235dee12690809f33cb0020c810a6b421a46f97a89b5fade3b3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "803f04e36d462235dee12690809f33cb0020c810a6b421a46f97a89b5fade3b3",
+                    "hash" : "0x803f04e36d462235dee12690809f33cb0020c810a6b421a46f97a89b5fade3b3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "803f04e36d462235dee12690809f33cb0020c810a6b421a46f97a89b5fade3b3",
+                    "hash" : "0x803f04e36d462235dee12690809f33cb0020c810a6b421a46f97a89b5fade3b3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "803f04e36d462235dee12690809f33cb0020c810a6b421a46f97a89b5fade3b3",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x457f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001357f00000000000000000000000000000000000000000000000000000000000000000b60005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1740863815"
+                "0x67c37947"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest471.json b/GeneralStateTests/stRandom/randomStatetest471.json
index 92e935cbe..8a20dc159 100644
--- a/GeneralStateTests/stRandom/randomStatetest471.json
+++ b/GeneralStateTests/stRandom/randomStatetest471.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest471" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9fbe514a2a700d3b0185d85ca7dc85d74af0ceaf8ad297c54155208387c44ec0",
+                    "hash" : "0x9fbe514a2a700d3b0185d85ca7dc85d74af0ceaf8ad297c54155208387c44ec0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9fbe514a2a700d3b0185d85ca7dc85d74af0ceaf8ad297c54155208387c44ec0",
+                    "hash" : "0x9fbe514a2a700d3b0185d85ca7dc85d74af0ceaf8ad297c54155208387c44ec0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9fbe514a2a700d3b0185d85ca7dc85d74af0ceaf8ad297c54155208387c44ec0",
+                    "hash" : "0x9fbe514a2a700d3b0185d85ca7dc85d74af0ceaf8ad297c54155208387c44ec0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9fbe514a2a700d3b0185d85ca7dc85d74af0ceaf8ad297c54155208387c44ec0",
+                    "hash" : "0x9fbe514a2a700d3b0185d85ca7dc85d74af0ceaf8ad297c54155208387c44ec0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9fbe514a2a700d3b0185d85ca7dc85d74af0ceaf8ad297c54155208387c44ec0",
+                    "hash" : "0x9fbe514a2a700d3b0185d85ca7dc85d74af0ceaf8ad297c54155208387c44ec0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "9fbe514a2a700d3b0185d85ca7dc85d74af0ceaf8ad297c54155208387c44ec0",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09650618701355040655183a51377d8260005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1662521271"
+                "0x63180fb7"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest472.json b/GeneralStateTests/stRandom/randomStatetest472.json
index c604b1f8a..cdaa86488 100644
--- a/GeneralStateTests/stRandom/randomStatetest472.json
+++ b/GeneralStateTests/stRandom/randomStatetest472.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest472" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c9b499ab5875451743ab43a7223fc04505840740850b00c23af8ac46efbec207",
+                    "hash" : "0xc9b499ab5875451743ab43a7223fc04505840740850b00c23af8ac46efbec207",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f8fc68962ca0b53cbf683816a31e9d1d0fc46969442d5c8e09a269d65d25eca3",
+                    "hash" : "0xf8fc68962ca0b53cbf683816a31e9d1d0fc46969442d5c8e09a269d65d25eca3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "c9b499ab5875451743ab43a7223fc04505840740850b00c23af8ac46efbec207",
+                    "hash" : "0xc9b499ab5875451743ab43a7223fc04505840740850b00c23af8ac46efbec207",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c9b499ab5875451743ab43a7223fc04505840740850b00c23af8ac46efbec207",
+                    "hash" : "0xc9b499ab5875451743ab43a7223fc04505840740850b00c23af8ac46efbec207",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f8fc68962ca0b53cbf683816a31e9d1d0fc46969442d5c8e09a269d65d25eca3",
+                    "hash" : "0xf8fc68962ca0b53cbf683816a31e9d1d0fc46969442d5c8e09a269d65d25eca3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "c9b499ab5875451743ab43a7223fc04505840740850b00c23af8ac46efbec207",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b541437ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff090a60005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1691421230"
+                "0x64d10a2e"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest473.json b/GeneralStateTests/stRandom/randomStatetest473.json
index d25b8c1dc..9c48fd932 100644
--- a/GeneralStateTests/stRandom/randomStatetest473.json
+++ b/GeneralStateTests/stRandom/randomStatetest473.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest473" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "04d6b581202997058f403b27486f229cd5957b14c111d18ee9d55f51a0989a05",
+                    "hash" : "0x04d6b581202997058f403b27486f229cd5957b14c111d18ee9d55f51a0989a05",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "04d6b581202997058f403b27486f229cd5957b14c111d18ee9d55f51a0989a05",
+                    "hash" : "0x04d6b581202997058f403b27486f229cd5957b14c111d18ee9d55f51a0989a05",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "c3b4377f40fdd50b14dff23a822170d4f067e723a800569efdb4e1b9f6e57cf8",
+                    "hash" : "0xc3b4377f40fdd50b14dff23a822170d4f067e723a800569efdb4e1b9f6e57cf8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c3b4377f40fdd50b14dff23a822170d4f067e723a800569efdb4e1b9f6e57cf8",
+                    "hash" : "0xc3b4377f40fdd50b14dff23a822170d4f067e723a800569efdb4e1b9f6e57cf8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "04d6b581202997058f403b27486f229cd5957b14c111d18ee9d55f51a0989a05",
+                    "hash" : "0x04d6b581202997058f403b27486f229cd5957b14c111d18ee9d55f51a0989a05",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "c3b4377f40fdd50b14dff23a822170d4f067e723a800569efdb4e1b9f6e57cf8",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff317f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b59102095560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1147652673"
+                "0x4467ca41"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest474.json b/GeneralStateTests/stRandom/randomStatetest474.json
index f13ac1149..82b163d4d 100644
--- a/GeneralStateTests/stRandom/randomStatetest474.json
+++ b/GeneralStateTests/stRandom/randomStatetest474.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest474" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "924815f435d63091a25b4b80aee866e4b9e7f5d48d63798efd5598340e5f5de3",
+                    "hash" : "0x924815f435d63091a25b4b80aee866e4b9e7f5d48d63798efd5598340e5f5de3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "924815f435d63091a25b4b80aee866e4b9e7f5d48d63798efd5598340e5f5de3",
+                    "hash" : "0x924815f435d63091a25b4b80aee866e4b9e7f5d48d63798efd5598340e5f5de3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "924815f435d63091a25b4b80aee866e4b9e7f5d48d63798efd5598340e5f5de3",
+                    "hash" : "0x924815f435d63091a25b4b80aee866e4b9e7f5d48d63798efd5598340e5f5de3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "924815f435d63091a25b4b80aee866e4b9e7f5d48d63798efd5598340e5f5de3",
+                    "hash" : "0x924815f435d63091a25b4b80aee866e4b9e7f5d48d63798efd5598340e5f5de3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "924815f435d63091a25b4b80aee866e4b9e7f5d48d63798efd5598340e5f5de3",
+                    "hash" : "0x924815f435d63091a25b4b80aee866e4b9e7f5d48d63798efd5598340e5f5de3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "924815f435d63091a25b4b80aee866e4b9e7f5d48d63798efd5598340e5f5de3",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe027f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f7d6f6b1051778ea1670387810b58055560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "2065350381"
+                "0x7b1abeed"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest475.json b/GeneralStateTests/stRandom/randomStatetest475.json
index 93b5e52e7..f1ed3bfb6 100644
--- a/GeneralStateTests/stRandom/randomStatetest475.json
+++ b/GeneralStateTests/stRandom/randomStatetest475.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest475" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c302eb7ff4e4283445a61c43514c0011ef5b95c4be283f30da3a407c8c31d9a7",
+                    "hash" : "0xc302eb7ff4e4283445a61c43514c0011ef5b95c4be283f30da3a407c8c31d9a7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c302eb7ff4e4283445a61c43514c0011ef5b95c4be283f30da3a407c8c31d9a7",
+                    "hash" : "0xc302eb7ff4e4283445a61c43514c0011ef5b95c4be283f30da3a407c8c31d9a7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "c302eb7ff4e4283445a61c43514c0011ef5b95c4be283f30da3a407c8c31d9a7",
+                    "hash" : "0xc302eb7ff4e4283445a61c43514c0011ef5b95c4be283f30da3a407c8c31d9a7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c302eb7ff4e4283445a61c43514c0011ef5b95c4be283f30da3a407c8c31d9a7",
+                    "hash" : "0xc302eb7ff4e4283445a61c43514c0011ef5b95c4be283f30da3a407c8c31d9a7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c302eb7ff4e4283445a61c43514c0011ef5b95c4be283f30da3a407c8c31d9a7",
+                    "hash" : "0xc302eb7ff4e4283445a61c43514c0011ef5b95c4be283f30da3a407c8c31d9a7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "c302eb7ff4e4283445a61c43514c0011ef5b95c4be283f30da3a407c8c31d9a7",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0955",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "428358692"
+                "0x19883c24"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest476.json b/GeneralStateTests/stRandom/randomStatetest476.json
index e190be6fe..00d016ae0 100644
--- a/GeneralStateTests/stRandom/randomStatetest476.json
+++ b/GeneralStateTests/stRandom/randomStatetest476.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest476" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
             {
@@ -25,7 +25,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "24c926a05cf07d794c1d83f0f60093f1efb7da76d285c21befb885cf561d7b4c",
+                    "hash" : "0x24c926a05cf07d794c1d83f0f60093f1efb7da76d285c21befb885cf561d7b4c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -35,7 +35,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "24c926a05cf07d794c1d83f0f60093f1efb7da76d285c21befb885cf561d7b4c",
+                    "hash" : "0x24c926a05cf07d794c1d83f0f60093f1efb7da76d285c21befb885cf561d7b4c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -45,7 +45,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2c7c47e9cb899ce0782f3a8e0c3acc3b789536efa478ee8e64c11ea1eb1a7e81",
+                    "hash" : "0x2c7c47e9cb899ce0782f3a8e0c3acc3b789536efa478ee8e64c11ea1eb1a7e81",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -55,7 +55,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "2c7c47e9cb899ce0782f3a8e0c3acc3b789536efa478ee8e64c11ea1eb1a7e81",
+                    "hash" : "0x2c7c47e9cb899ce0782f3a8e0c3acc3b789536efa478ee8e64c11ea1eb1a7e81",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,7 +65,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "24c926a05cf07d794c1d83f0f60093f1efb7da76d285c21befb885cf561d7b4c",
+                    "hash" : "0x24c926a05cf07d794c1d83f0f60093f1efb7da76d285c21befb885cf561d7b4c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -76,23 +76,23 @@
         },
         "postStateRoot" : "2c7c47e9cb899ce0782f3a8e0c3acc3b789536efa478ee8e64c11ea1eb1a7e81",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000010000000000000000000000000000000000000000448243628c0970843ba460005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -107,10 +107,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "2098819291"
+                "0x7d1970db"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest477.json b/GeneralStateTests/stRandom/randomStatetest477.json
index d3de1433e..0f52c70af 100644
--- a/GeneralStateTests/stRandom/randomStatetest477.json
+++ b/GeneralStateTests/stRandom/randomStatetest477.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest477" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "3e4f5a8b6e2d7207666c21e44646fb978e0a1202b6aeb7b46747af86eeef7ee0",
+                    "hash" : "0x3e4f5a8b6e2d7207666c21e44646fb978e0a1202b6aeb7b46747af86eeef7ee0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "3e4f5a8b6e2d7207666c21e44646fb978e0a1202b6aeb7b46747af86eeef7ee0",
+                    "hash" : "0x3e4f5a8b6e2d7207666c21e44646fb978e0a1202b6aeb7b46747af86eeef7ee0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3e4f5a8b6e2d7207666c21e44646fb978e0a1202b6aeb7b46747af86eeef7ee0",
+                    "hash" : "0x3e4f5a8b6e2d7207666c21e44646fb978e0a1202b6aeb7b46747af86eeef7ee0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3e4f5a8b6e2d7207666c21e44646fb978e0a1202b6aeb7b46747af86eeef7ee0",
+                    "hash" : "0x3e4f5a8b6e2d7207666c21e44646fb978e0a1202b6aeb7b46747af86eeef7ee0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "3e4f5a8b6e2d7207666c21e44646fb978e0a1202b6aeb7b46747af86eeef7ee0",
+                    "hash" : "0x3e4f5a8b6e2d7207666c21e44646fb978e0a1202b6aeb7b46747af86eeef7ee0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "3e4f5a8b6e2d7207666c21e44646fb978e0a1202b6aeb7b46747af86eeef7ee0",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000000000000000000000000000000000000000000001417ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f9084a3758d3456763aa4f09c8b735b5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "11119317"
+                "0xa9aad5"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest478.json b/GeneralStateTests/stRandom/randomStatetest478.json
index ee5a217f8..33428ce44 100644
--- a/GeneralStateTests/stRandom/randomStatetest478.json
+++ b/GeneralStateTests/stRandom/randomStatetest478.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest478" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1b827147bee0055ef753387d41f23fc8e5599501ec201dc57e209e9da6ced93d",
+                    "hash" : "0x1b827147bee0055ef753387d41f23fc8e5599501ec201dc57e209e9da6ced93d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "1b827147bee0055ef753387d41f23fc8e5599501ec201dc57e209e9da6ced93d",
+                    "hash" : "0x1b827147bee0055ef753387d41f23fc8e5599501ec201dc57e209e9da6ced93d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "1b827147bee0055ef753387d41f23fc8e5599501ec201dc57e209e9da6ced93d",
+                    "hash" : "0x1b827147bee0055ef753387d41f23fc8e5599501ec201dc57e209e9da6ced93d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "1b827147bee0055ef753387d41f23fc8e5599501ec201dc57e209e9da6ced93d",
+                    "hash" : "0x1b827147bee0055ef753387d41f23fc8e5599501ec201dc57e209e9da6ced93d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "1b827147bee0055ef753387d41f23fc8e5599501ec201dc57e209e9da6ced93d",
+                    "hash" : "0x1b827147bee0055ef753387d41f23fc8e5599501ec201dc57e209e9da6ced93d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "1b827147bee0055ef753387d41f23fc8e5599501ec201dc57e209e9da6ced93d",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000000000000000000000000000000000000000000001447f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f1606588a909558021569",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "844312201"
+                "0x32532e89"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest479.json b/GeneralStateTests/stRandom/randomStatetest479.json
index 5795e96d6..22d812a6b 100644
--- a/GeneralStateTests/stRandom/randomStatetest479.json
+++ b/GeneralStateTests/stRandom/randomStatetest479.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest479" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "946a8422a77b32e70cc49e9c9bfacb5fb3e70718c84072476a18fd05ed38c77c",
+                    "hash" : "0x946a8422a77b32e70cc49e9c9bfacb5fb3e70718c84072476a18fd05ed38c77c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "946a8422a77b32e70cc49e9c9bfacb5fb3e70718c84072476a18fd05ed38c77c",
+                    "hash" : "0x946a8422a77b32e70cc49e9c9bfacb5fb3e70718c84072476a18fd05ed38c77c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "946a8422a77b32e70cc49e9c9bfacb5fb3e70718c84072476a18fd05ed38c77c",
+                    "hash" : "0x946a8422a77b32e70cc49e9c9bfacb5fb3e70718c84072476a18fd05ed38c77c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "946a8422a77b32e70cc49e9c9bfacb5fb3e70718c84072476a18fd05ed38c77c",
+                    "hash" : "0x946a8422a77b32e70cc49e9c9bfacb5fb3e70718c84072476a18fd05ed38c77c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "946a8422a77b32e70cc49e9c9bfacb5fb3e70718c84072476a18fd05ed38c77c",
+                    "hash" : "0x946a8422a77b32e70cc49e9c9bfacb5fb3e70718c84072476a18fd05ed38c77c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "946a8422a77b32e70cc49e9c9bfacb5fb3e70718c84072476a18fd05ed38c77c",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3504035820b5079895560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1867148718"
+                "0x6f4a6dae"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest48.json b/GeneralStateTests/stRandom/randomStatetest48.json
index 3835dfa44..6e1ad6504 100644
--- a/GeneralStateTests/stRandom/randomStatetest48.json
+++ b/GeneralStateTests/stRandom/randomStatetest48.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest48" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
             {
@@ -24,7 +24,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "bba6f89356c1dd64d8a64751b4d11f53db94532bc404bbf22f3ce85969f3cb09",
+                    "hash" : "0xbba6f89356c1dd64d8a64751b4d11f53db94532bc404bbf22f3ce85969f3cb09",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "bba6f89356c1dd64d8a64751b4d11f53db94532bc404bbf22f3ce85969f3cb09",
+                    "hash" : "0xbba6f89356c1dd64d8a64751b4d11f53db94532bc404bbf22f3ce85969f3cb09",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "ad61be3564d4de068c89e806f88633ecfcaf3505f0b2f2dd59ab437c46f48d08",
+                    "hash" : "0xad61be3564d4de068c89e806f88633ecfcaf3505f0b2f2dd59ab437c46f48d08",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ad61be3564d4de068c89e806f88633ecfcaf3505f0b2f2dd59ab437c46f48d08",
+                    "hash" : "0xad61be3564d4de068c89e806f88633ecfcaf3505f0b2f2dd59ab437c46f48d08",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -64,7 +64,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "bba6f89356c1dd64d8a64751b4d11f53db94532bc404bbf22f3ce85969f3cb09",
+                    "hash" : "0xbba6f89356c1dd64d8a64751b4d11f53db94532bc404bbf22f3ce85969f3cb09",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -75,23 +75,23 @@
         },
         "postStateRoot" : "ad61be3564d4de068c89e806f88633ecfcaf3505f0b2f2dd59ab437c46f48d08",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x38785231d8e75db11d6da7040cee1a12ebf739e5022caa60f92d51636060b6d96d698fc0e9ced2f6a0087344559c43612f0561a73ba3600a600d6014600963186262c173095e7baea6a6c7c4c2dfeb977efac326af552d876370f82d9ff1604166f49ef1fea120af77ba4cce3f35bc52ca5c40bf14c77e95ea92e69520143ff9c7827bcfe760aee06d241e31a0773476da22f7ce8131475838c23b59f7a3c46b2b99c0955e169ee3527ca9f7674467bdf2c0eebf6f60129232",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -106,8 +106,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x5c4c6e38"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest480.json b/GeneralStateTests/stRandom/randomStatetest480.json
index c1b469a63..7df5bb5df 100644
--- a/GeneralStateTests/stRandom/randomStatetest480.json
+++ b/GeneralStateTests/stRandom/randomStatetest480.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest480" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7ad3dbf43136fb19c06e40ab6cfb9bc86bf9252e96f0d146686302f2c0297a2a",
+                    "hash" : "0x7ad3dbf43136fb19c06e40ab6cfb9bc86bf9252e96f0d146686302f2c0297a2a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7ad3dbf43136fb19c06e40ab6cfb9bc86bf9252e96f0d146686302f2c0297a2a",
+                    "hash" : "0x7ad3dbf43136fb19c06e40ab6cfb9bc86bf9252e96f0d146686302f2c0297a2a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "7ad3dbf43136fb19c06e40ab6cfb9bc86bf9252e96f0d146686302f2c0297a2a",
+                    "hash" : "0x7ad3dbf43136fb19c06e40ab6cfb9bc86bf9252e96f0d146686302f2c0297a2a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "7ad3dbf43136fb19c06e40ab6cfb9bc86bf9252e96f0d146686302f2c0297a2a",
+                    "hash" : "0x7ad3dbf43136fb19c06e40ab6cfb9bc86bf9252e96f0d146686302f2c0297a2a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7ad3dbf43136fb19c06e40ab6cfb9bc86bf9252e96f0d146686302f2c0297a2a",
+                    "hash" : "0x7ad3dbf43136fb19c06e40ab6cfb9bc86bf9252e96f0d146686302f2c0297a2a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "7ad3dbf43136fb19c06e40ab6cfb9bc86bf9252e96f0d146686302f2c0297a2a",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff037f0000000000000000000000000000000000000000000000000000000000000000427ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f5af3a474ff64f3a37d51f36a6a607f5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "745095931"
+                "0x2c6942fb"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest481.json b/GeneralStateTests/stRandom/randomStatetest481.json
index 586029aa1..a764a4c37 100644
--- a/GeneralStateTests/stRandom/randomStatetest481.json
+++ b/GeneralStateTests/stRandom/randomStatetest481.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest481" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
             {
@@ -23,7 +23,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "91f751eb8ebd34d4ed7c7482f702b43ab8ce666d00ac98b69d006bb3ef293e5a",
+                    "hash" : "0x91f751eb8ebd34d4ed7c7482f702b43ab8ce666d00ac98b69d006bb3ef293e5a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -33,7 +33,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "91f751eb8ebd34d4ed7c7482f702b43ab8ce666d00ac98b69d006bb3ef293e5a",
+                    "hash" : "0x91f751eb8ebd34d4ed7c7482f702b43ab8ce666d00ac98b69d006bb3ef293e5a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -43,7 +43,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "91f751eb8ebd34d4ed7c7482f702b43ab8ce666d00ac98b69d006bb3ef293e5a",
+                    "hash" : "0x91f751eb8ebd34d4ed7c7482f702b43ab8ce666d00ac98b69d006bb3ef293e5a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -53,7 +53,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "91f751eb8ebd34d4ed7c7482f702b43ab8ce666d00ac98b69d006bb3ef293e5a",
+                    "hash" : "0x91f751eb8ebd34d4ed7c7482f702b43ab8ce666d00ac98b69d006bb3ef293e5a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -63,7 +63,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "91f751eb8ebd34d4ed7c7482f702b43ab8ce666d00ac98b69d006bb3ef293e5a",
+                    "hash" : "0x91f751eb8ebd34d4ed7c7482f702b43ab8ce666d00ac98b69d006bb3ef293e5a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -74,23 +74,23 @@
         },
         "postStateRoot" : "1a07c553e3ea92e24b9b7d2089974bded1ef130e4c27c60fb47f5f398f7b8f14",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x447f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09437f0000000000000000000000010000000000000000000000000000000000000000a2695a7d52064361127350",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -105,10 +105,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1124860809"
+                "0x430c0389"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest482.json b/GeneralStateTests/stRandom/randomStatetest482.json
index 554bb02f0..ed2c2a8da 100644
--- a/GeneralStateTests/stRandom/randomStatetest482.json
+++ b/GeneralStateTests/stRandom/randomStatetest482.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest482" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "53d900ff9c6f88ac0f4c423646ab5ad0bf61853ef03ca31800dab4f5ae6c5e6d",
+                    "hash" : "0x53d900ff9c6f88ac0f4c423646ab5ad0bf61853ef03ca31800dab4f5ae6c5e6d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "53d900ff9c6f88ac0f4c423646ab5ad0bf61853ef03ca31800dab4f5ae6c5e6d",
+                    "hash" : "0x53d900ff9c6f88ac0f4c423646ab5ad0bf61853ef03ca31800dab4f5ae6c5e6d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "53d900ff9c6f88ac0f4c423646ab5ad0bf61853ef03ca31800dab4f5ae6c5e6d",
+                    "hash" : "0x53d900ff9c6f88ac0f4c423646ab5ad0bf61853ef03ca31800dab4f5ae6c5e6d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "53d900ff9c6f88ac0f4c423646ab5ad0bf61853ef03ca31800dab4f5ae6c5e6d",
+                    "hash" : "0x53d900ff9c6f88ac0f4c423646ab5ad0bf61853ef03ca31800dab4f5ae6c5e6d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "53d900ff9c6f88ac0f4c423646ab5ad0bf61853ef03ca31800dab4f5ae6c5e6d",
+                    "hash" : "0x53d900ff9c6f88ac0f4c423646ab5ad0bf61853ef03ca31800dab4f5ae6c5e6d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "53d900ff9c6f88ac0f4c423646ab5ad0bf61853ef03ca31800dab4f5ae6c5e6d",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5437fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f027c9d313d9b09376505927c8e71565560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1668252863"
+                "0x636f84bf"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest483.json b/GeneralStateTests/stRandom/randomStatetest483.json
index 655c4819e..f1f1e0b65 100644
--- a/GeneralStateTests/stRandom/randomStatetest483.json
+++ b/GeneralStateTests/stRandom/randomStatetest483.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest483" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1d756896619a01fb76a58466ffba5994f4a426f197b646d8d6d3486196d0a890",
+                    "hash" : "0x1d756896619a01fb76a58466ffba5994f4a426f197b646d8d6d3486196d0a890",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "1d756896619a01fb76a58466ffba5994f4a426f197b646d8d6d3486196d0a890",
+                    "hash" : "0x1d756896619a01fb76a58466ffba5994f4a426f197b646d8d6d3486196d0a890",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "1d756896619a01fb76a58466ffba5994f4a426f197b646d8d6d3486196d0a890",
+                    "hash" : "0x1d756896619a01fb76a58466ffba5994f4a426f197b646d8d6d3486196d0a890",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "1d756896619a01fb76a58466ffba5994f4a426f197b646d8d6d3486196d0a890",
+                    "hash" : "0x1d756896619a01fb76a58466ffba5994f4a426f197b646d8d6d3486196d0a890",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "1d756896619a01fb76a58466ffba5994f4a426f197b646d8d6d3486196d0a890",
+                    "hash" : "0x1d756896619a01fb76a58466ffba5994f4a426f197b646d8d6d3486196d0a890",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "1d756896619a01fb76a58466ffba5994f4a426f197b646d8d6d3486196d0a890",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe840955",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "2129514006"
+                "0x7eedce16"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest484.json b/GeneralStateTests/stRandom/randomStatetest484.json
index f629384f8..c6cceb613 100644
--- a/GeneralStateTests/stRandom/randomStatetest484.json
+++ b/GeneralStateTests/stRandom/randomStatetest484.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest484" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "05fb639609fc4553f7566f7aca01caba3908916c56656c72ef2d4fba8e9ddb32",
+                    "hash" : "0x05fb639609fc4553f7566f7aca01caba3908916c56656c72ef2d4fba8e9ddb32",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "05fb639609fc4553f7566f7aca01caba3908916c56656c72ef2d4fba8e9ddb32",
+                    "hash" : "0x05fb639609fc4553f7566f7aca01caba3908916c56656c72ef2d4fba8e9ddb32",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "05fb639609fc4553f7566f7aca01caba3908916c56656c72ef2d4fba8e9ddb32",
+                    "hash" : "0x05fb639609fc4553f7566f7aca01caba3908916c56656c72ef2d4fba8e9ddb32",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "05fb639609fc4553f7566f7aca01caba3908916c56656c72ef2d4fba8e9ddb32",
+                    "hash" : "0x05fb639609fc4553f7566f7aca01caba3908916c56656c72ef2d4fba8e9ddb32",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "05fb639609fc4553f7566f7aca01caba3908916c56656c72ef2d4fba8e9ddb32",
+                    "hash" : "0x05fb639609fc4553f7566f7aca01caba3908916c56656c72ef2d4fba8e9ddb32",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "05fb639609fc4553f7566f7aca01caba3908916c56656c72ef2d4fba8e9ddb32",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff35427ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5595584a2558493a25b5a6a60005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "465395296"
+                "0x1bbd5e60"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest485.json b/GeneralStateTests/stRandom/randomStatetest485.json
index 1971594ef..c2304a78c 100644
--- a/GeneralStateTests/stRandom/randomStatetest485.json
+++ b/GeneralStateTests/stRandom/randomStatetest485.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest485" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "5a92da9d20ba315a915849860cb82e883ea9b833444a30ef9aa59034a45e2b61",
+                    "hash" : "0x5a92da9d20ba315a915849860cb82e883ea9b833444a30ef9aa59034a45e2b61",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "5a92da9d20ba315a915849860cb82e883ea9b833444a30ef9aa59034a45e2b61",
+                    "hash" : "0x5a92da9d20ba315a915849860cb82e883ea9b833444a30ef9aa59034a45e2b61",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5a92da9d20ba315a915849860cb82e883ea9b833444a30ef9aa59034a45e2b61",
+                    "hash" : "0x5a92da9d20ba315a915849860cb82e883ea9b833444a30ef9aa59034a45e2b61",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5a92da9d20ba315a915849860cb82e883ea9b833444a30ef9aa59034a45e2b61",
+                    "hash" : "0x5a92da9d20ba315a915849860cb82e883ea9b833444a30ef9aa59034a45e2b61",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "5a92da9d20ba315a915849860cb82e883ea9b833444a30ef9aa59034a45e2b61",
+                    "hash" : "0x5a92da9d20ba315a915849860cb82e883ea9b833444a30ef9aa59034a45e2b61",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "5a92da9d20ba315a915849860cb82e883ea9b833444a30ef9aa59034a45e2b61",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000008e447f00000000000000000000000100000000000000000000000000000000000000003a1a7e",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1573164058"
+                "0x5dc4941a"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest486.json b/GeneralStateTests/stRandom/randomStatetest486.json
index 8fc167b09..6d1a72167 100644
--- a/GeneralStateTests/stRandom/randomStatetest486.json
+++ b/GeneralStateTests/stRandom/randomStatetest486.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest486" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a840e127293c240c138ad1c81224ca7e333bc11205adacebdc2933294eb349bd",
+                    "hash" : "0xa840e127293c240c138ad1c81224ca7e333bc11205adacebdc2933294eb349bd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a840e127293c240c138ad1c81224ca7e333bc11205adacebdc2933294eb349bd",
+                    "hash" : "0xa840e127293c240c138ad1c81224ca7e333bc11205adacebdc2933294eb349bd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a840e127293c240c138ad1c81224ca7e333bc11205adacebdc2933294eb349bd",
+                    "hash" : "0xa840e127293c240c138ad1c81224ca7e333bc11205adacebdc2933294eb349bd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a840e127293c240c138ad1c81224ca7e333bc11205adacebdc2933294eb349bd",
+                    "hash" : "0xa840e127293c240c138ad1c81224ca7e333bc11205adacebdc2933294eb349bd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a840e127293c240c138ad1c81224ca7e333bc11205adacebdc2933294eb349bd",
+                    "hash" : "0xa840e127293c240c138ad1c81224ca7e333bc11205adacebdc2933294eb349bd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "25ddab907c02d9e002e8bfff0a27850b7f46ddd23de112136634d63802b2d7e3",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x4434404341424140203855",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest487.json b/GeneralStateTests/stRandom/randomStatetest487.json
index 46ec9ee3b..3f9e14c83 100644
--- a/GeneralStateTests/stRandom/randomStatetest487.json
+++ b/GeneralStateTests/stRandom/randomStatetest487.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest487" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "19a6f5644266b1f5e7f9145ef7af36eb07fd60f2a5dbab0271384a36876e7371",
+                    "hash" : "0x19a6f5644266b1f5e7f9145ef7af36eb07fd60f2a5dbab0271384a36876e7371",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "19a6f5644266b1f5e7f9145ef7af36eb07fd60f2a5dbab0271384a36876e7371",
+                    "hash" : "0x19a6f5644266b1f5e7f9145ef7af36eb07fd60f2a5dbab0271384a36876e7371",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "d6510ef476cba7e1a61c4e81d74ef72d3d131b167e0bba682b70341f0fb977dd",
+                    "hash" : "0xd6510ef476cba7e1a61c4e81d74ef72d3d131b167e0bba682b70341f0fb977dd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "d6510ef476cba7e1a61c4e81d74ef72d3d131b167e0bba682b70341f0fb977dd",
+                    "hash" : "0xd6510ef476cba7e1a61c4e81d74ef72d3d131b167e0bba682b70341f0fb977dd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "19a6f5644266b1f5e7f9145ef7af36eb07fd60f2a5dbab0271384a36876e7371",
+                    "hash" : "0x19a6f5644266b1f5e7f9145ef7af36eb07fd60f2a5dbab0271384a36876e7371",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "d6510ef476cba7e1a61c4e81d74ef72d3d131b167e0bba682b70341f0fb977dd",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe337fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0308ff9f708d1710086a73a0766a6b55",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "841051523"
+                "0x32216d83"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest488.json b/GeneralStateTests/stRandom/randomStatetest488.json
index 120a996a5..4be292214 100644
--- a/GeneralStateTests/stRandom/randomStatetest488.json
+++ b/GeneralStateTests/stRandom/randomStatetest488.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest488" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "41bec878da08fb2c35a75e7966eca29f801f66de7c063102305953a814c66b43",
+                    "hash" : "0x41bec878da08fb2c35a75e7966eca29f801f66de7c063102305953a814c66b43",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "41bec878da08fb2c35a75e7966eca29f801f66de7c063102305953a814c66b43",
+                    "hash" : "0x41bec878da08fb2c35a75e7966eca29f801f66de7c063102305953a814c66b43",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "41bec878da08fb2c35a75e7966eca29f801f66de7c063102305953a814c66b43",
+                    "hash" : "0x41bec878da08fb2c35a75e7966eca29f801f66de7c063102305953a814c66b43",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "41bec878da08fb2c35a75e7966eca29f801f66de7c063102305953a814c66b43",
+                    "hash" : "0x41bec878da08fb2c35a75e7966eca29f801f66de7c063102305953a814c66b43",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "41bec878da08fb2c35a75e7966eca29f801f66de7c063102305953a814c66b43",
+                    "hash" : "0x41bec878da08fb2c35a75e7966eca29f801f66de7c063102305953a814c66b43",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "41bec878da08fb2c35a75e7966eca29f801f66de7c063102305953a814c66b43",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5427f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f3250648093577f6364a218f0907e7d5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1401176215"
+                "0x53844097"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest489.json b/GeneralStateTests/stRandom/randomStatetest489.json
index 2d252799b..7bf0ee5b4 100644
--- a/GeneralStateTests/stRandom/randomStatetest489.json
+++ b/GeneralStateTests/stRandom/randomStatetest489.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest489" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "14e961d4a120a5cc85ca21f286b423500fef5529e84c7912f2d5f0e5bf5ca134",
+                    "hash" : "0x14e961d4a120a5cc85ca21f286b423500fef5529e84c7912f2d5f0e5bf5ca134",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "14e961d4a120a5cc85ca21f286b423500fef5529e84c7912f2d5f0e5bf5ca134",
+                    "hash" : "0x14e961d4a120a5cc85ca21f286b423500fef5529e84c7912f2d5f0e5bf5ca134",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "14e961d4a120a5cc85ca21f286b423500fef5529e84c7912f2d5f0e5bf5ca134",
+                    "hash" : "0x14e961d4a120a5cc85ca21f286b423500fef5529e84c7912f2d5f0e5bf5ca134",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "14e961d4a120a5cc85ca21f286b423500fef5529e84c7912f2d5f0e5bf5ca134",
+                    "hash" : "0x14e961d4a120a5cc85ca21f286b423500fef5529e84c7912f2d5f0e5bf5ca134",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "14e961d4a120a5cc85ca21f286b423500fef5529e84c7912f2d5f0e5bf5ca134",
+                    "hash" : "0x14e961d4a120a5cc85ca21f286b423500fef5529e84c7912f2d5f0e5bf5ca134",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "14e961d4a120a5cc85ca21f286b423500fef5529e84c7912f2d5f0e5bf5ca134",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000456f2b8e846b91987417705a126e7707645560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1856101458"
+                "0x6ea1dc52"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest49.json b/GeneralStateTests/stRandom/randomStatetest49.json
index 86212979d..c987228ca 100644
--- a/GeneralStateTests/stRandom/randomStatetest49.json
+++ b/GeneralStateTests/stRandom/randomStatetest49.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest49" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a265c829988541b742b10dcb192bbe97f8c2c06e1a14bd88d479f50e7110aa24",
+                    "hash" : "0xa265c829988541b742b10dcb192bbe97f8c2c06e1a14bd88d479f50e7110aa24",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a265c829988541b742b10dcb192bbe97f8c2c06e1a14bd88d479f50e7110aa24",
+                    "hash" : "0xa265c829988541b742b10dcb192bbe97f8c2c06e1a14bd88d479f50e7110aa24",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a265c829988541b742b10dcb192bbe97f8c2c06e1a14bd88d479f50e7110aa24",
+                    "hash" : "0xa265c829988541b742b10dcb192bbe97f8c2c06e1a14bd88d479f50e7110aa24",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a265c829988541b742b10dcb192bbe97f8c2c06e1a14bd88d479f50e7110aa24",
+                    "hash" : "0xa265c829988541b742b10dcb192bbe97f8c2c06e1a14bd88d479f50e7110aa24",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a265c829988541b742b10dcb192bbe97f8c2c06e1a14bd88d479f50e7110aa24",
+                    "hash" : "0xa265c829988541b742b10dcb192bbe97f8c2c06e1a14bd88d479f50e7110aa24",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "a265c829988541b742b10dcb192bbe97f8c2c06e1a14bd88d479f50e7110aa24",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000807f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b561859c55",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,8 +96,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x69d65f4b"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest490.json b/GeneralStateTests/stRandom/randomStatetest490.json
index ab240a5a7..0e4ad4662 100644
--- a/GeneralStateTests/stRandom/randomStatetest490.json
+++ b/GeneralStateTests/stRandom/randomStatetest490.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest490" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "49727182f294a9ae81d23ef6b40a2807095945549509bdad4abe637fe8cfc37a",
+                    "hash" : "0x49727182f294a9ae81d23ef6b40a2807095945549509bdad4abe637fe8cfc37a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "49727182f294a9ae81d23ef6b40a2807095945549509bdad4abe637fe8cfc37a",
+                    "hash" : "0x49727182f294a9ae81d23ef6b40a2807095945549509bdad4abe637fe8cfc37a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e86a5c22ce15e4a7efb45f26719fc58d7f6dd219bff82c164357ad4380e36cbd",
+                    "hash" : "0xe86a5c22ce15e4a7efb45f26719fc58d7f6dd219bff82c164357ad4380e36cbd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e86a5c22ce15e4a7efb45f26719fc58d7f6dd219bff82c164357ad4380e36cbd",
+                    "hash" : "0xe86a5c22ce15e4a7efb45f26719fc58d7f6dd219bff82c164357ad4380e36cbd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "49727182f294a9ae81d23ef6b40a2807095945549509bdad4abe637fe8cfc37a",
+                    "hash" : "0x49727182f294a9ae81d23ef6b40a2807095945549509bdad4abe637fe8cfc37a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "e86a5c22ce15e4a7efb45f26719fc58d7f6dd219bff82c164357ad4380e36cbd",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x42444143404341413155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest491.json b/GeneralStateTests/stRandom/randomStatetest491.json
index f845562f1..4c4f2ca4c 100644
--- a/GeneralStateTests/stRandom/randomStatetest491.json
+++ b/GeneralStateTests/stRandom/randomStatetest491.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest491" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "319b3f153a09fba00cad7420a79438b47e69c7e406b64c29660df5012c26857a",
+                    "hash" : "0x319b3f153a09fba00cad7420a79438b47e69c7e406b64c29660df5012c26857a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "319b3f153a09fba00cad7420a79438b47e69c7e406b64c29660df5012c26857a",
+                    "hash" : "0x319b3f153a09fba00cad7420a79438b47e69c7e406b64c29660df5012c26857a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "319b3f153a09fba00cad7420a79438b47e69c7e406b64c29660df5012c26857a",
+                    "hash" : "0x319b3f153a09fba00cad7420a79438b47e69c7e406b64c29660df5012c26857a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "319b3f153a09fba00cad7420a79438b47e69c7e406b64c29660df5012c26857a",
+                    "hash" : "0x319b3f153a09fba00cad7420a79438b47e69c7e406b64c29660df5012c26857a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "319b3f153a09fba00cad7420a79438b47e69c7e406b64c29660df5012c26857a",
+                    "hash" : "0x319b3f153a09fba00cad7420a79438b47e69c7e406b64c29660df5012c26857a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "319b3f153a09fba00cad7420a79438b47e69c7e406b64c29660df5012c26857a",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000006fa0f670645a778c71127d3b5598308b1760005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1805810722"
+                "0x6ba27c22"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest492.json b/GeneralStateTests/stRandom/randomStatetest492.json
index e9c635f61..4741947bc 100644
--- a/GeneralStateTests/stRandom/randomStatetest492.json
+++ b/GeneralStateTests/stRandom/randomStatetest492.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest492" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "46f2f13f47cb191c285be3262ffd49b73275562d8e96fd9a1a156ddb10b5ff28",
+                    "hash" : "0x46f2f13f47cb191c285be3262ffd49b73275562d8e96fd9a1a156ddb10b5ff28",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "46f2f13f47cb191c285be3262ffd49b73275562d8e96fd9a1a156ddb10b5ff28",
+                    "hash" : "0x46f2f13f47cb191c285be3262ffd49b73275562d8e96fd9a1a156ddb10b5ff28",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "46f2f13f47cb191c285be3262ffd49b73275562d8e96fd9a1a156ddb10b5ff28",
+                    "hash" : "0x46f2f13f47cb191c285be3262ffd49b73275562d8e96fd9a1a156ddb10b5ff28",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "46f2f13f47cb191c285be3262ffd49b73275562d8e96fd9a1a156ddb10b5ff28",
+                    "hash" : "0x46f2f13f47cb191c285be3262ffd49b73275562d8e96fd9a1a156ddb10b5ff28",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "46f2f13f47cb191c285be3262ffd49b73275562d8e96fd9a1a156ddb10b5ff28",
+                    "hash" : "0x46f2f13f47cb191c285be3262ffd49b73275562d8e96fd9a1a156ddb10b5ff28",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "46f2f13f47cb191c285be3262ffd49b73275562d8e96fd9a1a156ddb10b5ff28",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09165b835560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1621604422"
+                "0x60a7b846"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest493.json b/GeneralStateTests/stRandom/randomStatetest493.json
index 22e384841..d340772dc 100644
--- a/GeneralStateTests/stRandom/randomStatetest493.json
+++ b/GeneralStateTests/stRandom/randomStatetest493.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest493" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1634528f33c1e24f624ec36021b26c37392cdd6977a1c06fdb51935668ca398b",
+                    "hash" : "0x1634528f33c1e24f624ec36021b26c37392cdd6977a1c06fdb51935668ca398b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "1634528f33c1e24f624ec36021b26c37392cdd6977a1c06fdb51935668ca398b",
+                    "hash" : "0x1634528f33c1e24f624ec36021b26c37392cdd6977a1c06fdb51935668ca398b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "1634528f33c1e24f624ec36021b26c37392cdd6977a1c06fdb51935668ca398b",
+                    "hash" : "0x1634528f33c1e24f624ec36021b26c37392cdd6977a1c06fdb51935668ca398b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "1634528f33c1e24f624ec36021b26c37392cdd6977a1c06fdb51935668ca398b",
+                    "hash" : "0x1634528f33c1e24f624ec36021b26c37392cdd6977a1c06fdb51935668ca398b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "1634528f33c1e24f624ec36021b26c37392cdd6977a1c06fdb51935668ca398b",
+                    "hash" : "0x1634528f33c1e24f624ec36021b26c37392cdd6977a1c06fdb51935668ca398b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "1634528f33c1e24f624ec36021b26c37392cdd6977a1c06fdb51935668ca398b",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5437f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff095560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1422979897"
+                "0x54d0f339"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest494.json b/GeneralStateTests/stRandom/randomStatetest494.json
index 765991de8..f54675ade 100644
--- a/GeneralStateTests/stRandom/randomStatetest494.json
+++ b/GeneralStateTests/stRandom/randomStatetest494.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest494" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "440660f4f8e63e8399d8ff0c24d1ce4f96b1957dede66eaf4e49c5ad3bdbbdb0",
+                    "hash" : "0x440660f4f8e63e8399d8ff0c24d1ce4f96b1957dede66eaf4e49c5ad3bdbbdb0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "440660f4f8e63e8399d8ff0c24d1ce4f96b1957dede66eaf4e49c5ad3bdbbdb0",
+                    "hash" : "0x440660f4f8e63e8399d8ff0c24d1ce4f96b1957dede66eaf4e49c5ad3bdbbdb0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "440660f4f8e63e8399d8ff0c24d1ce4f96b1957dede66eaf4e49c5ad3bdbbdb0",
+                    "hash" : "0x440660f4f8e63e8399d8ff0c24d1ce4f96b1957dede66eaf4e49c5ad3bdbbdb0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "440660f4f8e63e8399d8ff0c24d1ce4f96b1957dede66eaf4e49c5ad3bdbbdb0",
+                    "hash" : "0x440660f4f8e63e8399d8ff0c24d1ce4f96b1957dede66eaf4e49c5ad3bdbbdb0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "440660f4f8e63e8399d8ff0c24d1ce4f96b1957dede66eaf4e49c5ad3bdbbdb0",
+                    "hash" : "0x440660f4f8e63e8399d8ff0c24d1ce4f96b1957dede66eaf4e49c5ad3bdbbdb0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "440660f4f8e63e8399d8ff0c24d1ce4f96b1957dede66eaf4e49c5ad3bdbbdb0",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x847f000000000000000000000000000000000000000000000000000000000000c35043657f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff4362f03c897f50f073f219105455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1741426477"
+                "0x67cc0f2d"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest495.json b/GeneralStateTests/stRandom/randomStatetest495.json
index 6c76ea9e6..496e64866 100644
--- a/GeneralStateTests/stRandom/randomStatetest495.json
+++ b/GeneralStateTests/stRandom/randomStatetest495.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest495" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "8d5281cbe8803a800dea2b6e8f64e4078d14d21fd1bc4bab72d6ac6abce8519b",
+                    "hash" : "0x8d5281cbe8803a800dea2b6e8f64e4078d14d21fd1bc4bab72d6ac6abce8519b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "8d5281cbe8803a800dea2b6e8f64e4078d14d21fd1bc4bab72d6ac6abce8519b",
+                    "hash" : "0x8d5281cbe8803a800dea2b6e8f64e4078d14d21fd1bc4bab72d6ac6abce8519b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4b0266280765370fc26f2ecee50a128fcc7d1ff0e578ce684a43f546fabf41ad",
+                    "hash" : "0x4b0266280765370fc26f2ecee50a128fcc7d1ff0e578ce684a43f546fabf41ad",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4b0266280765370fc26f2ecee50a128fcc7d1ff0e578ce684a43f546fabf41ad",
+                    "hash" : "0x4b0266280765370fc26f2ecee50a128fcc7d1ff0e578ce684a43f546fabf41ad",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "8d5281cbe8803a800dea2b6e8f64e4078d14d21fd1bc4bab72d6ac6abce8519b",
+                    "hash" : "0x8d5281cbe8803a800dea2b6e8f64e4078d14d21fd1bc4bab72d6ac6abce8519b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "4b0266280765370fc26f2ecee50a128fcc7d1ff0e578ce684a43f546fabf41ad",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000006f427ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7e6410f26f519c538ea2070a6c60005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "211829998"
+                "0x0ca044ee"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest496.json b/GeneralStateTests/stRandom/randomStatetest496.json
index 910d23b51..079c1243d 100644
--- a/GeneralStateTests/stRandom/randomStatetest496.json
+++ b/GeneralStateTests/stRandom/randomStatetest496.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest496" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d9d8ae88eb4d3763f05d111564017b5abe73ffb844b0b988acbbc35047e1fba5",
+                    "hash" : "0xd9d8ae88eb4d3763f05d111564017b5abe73ffb844b0b988acbbc35047e1fba5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d9d8ae88eb4d3763f05d111564017b5abe73ffb844b0b988acbbc35047e1fba5",
+                    "hash" : "0xd9d8ae88eb4d3763f05d111564017b5abe73ffb844b0b988acbbc35047e1fba5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "d9d8ae88eb4d3763f05d111564017b5abe73ffb844b0b988acbbc35047e1fba5",
+                    "hash" : "0xd9d8ae88eb4d3763f05d111564017b5abe73ffb844b0b988acbbc35047e1fba5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "d9d8ae88eb4d3763f05d111564017b5abe73ffb844b0b988acbbc35047e1fba5",
+                    "hash" : "0xd9d8ae88eb4d3763f05d111564017b5abe73ffb844b0b988acbbc35047e1fba5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d9d8ae88eb4d3763f05d111564017b5abe73ffb844b0b988acbbc35047e1fba5",
+                    "hash" : "0xd9d8ae88eb4d3763f05d111564017b5abe73ffb844b0b988acbbc35047e1fba5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "d9d8ae88eb4d3763f05d111564017b5abe73ffb844b0b988acbbc35047e1fba5",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff457f0000000000000000000000000000000000000000000000000000000000000000355b7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3500b0b0207965560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "256677208"
+                "0x0f4c9558"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest497.json b/GeneralStateTests/stRandom/randomStatetest497.json
index 8be481d0d..e759bcfd3 100644
--- a/GeneralStateTests/stRandom/randomStatetest497.json
+++ b/GeneralStateTests/stRandom/randomStatetest497.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest497" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c581ce49c01fd5a1819ebbc0436beab7f47e50f51b711effbcc58f4483cb0e43",
+                    "hash" : "0xc581ce49c01fd5a1819ebbc0436beab7f47e50f51b711effbcc58f4483cb0e43",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c581ce49c01fd5a1819ebbc0436beab7f47e50f51b711effbcc58f4483cb0e43",
+                    "hash" : "0xc581ce49c01fd5a1819ebbc0436beab7f47e50f51b711effbcc58f4483cb0e43",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "c581ce49c01fd5a1819ebbc0436beab7f47e50f51b711effbcc58f4483cb0e43",
+                    "hash" : "0xc581ce49c01fd5a1819ebbc0436beab7f47e50f51b711effbcc58f4483cb0e43",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c581ce49c01fd5a1819ebbc0436beab7f47e50f51b711effbcc58f4483cb0e43",
+                    "hash" : "0xc581ce49c01fd5a1819ebbc0436beab7f47e50f51b711effbcc58f4483cb0e43",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c581ce49c01fd5a1819ebbc0436beab7f47e50f51b711effbcc58f4483cb0e43",
+                    "hash" : "0xc581ce49c01fd5a1819ebbc0436beab7f47e50f51b711effbcc58f4483cb0e43",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "c581ce49c01fd5a1819ebbc0436beab7f47e50f51b711effbcc58f4483cb0e43",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff090455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1143211377"
+                "0x44240571"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest498.json b/GeneralStateTests/stRandom/randomStatetest498.json
index 882772bc4..a8af257f1 100644
--- a/GeneralStateTests/stRandom/randomStatetest498.json
+++ b/GeneralStateTests/stRandom/randomStatetest498.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest498" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
             {
@@ -25,7 +25,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d19bf1f6eae804b8296e8556d87b2b818573fb2ccd2dff01af563fee71b5d6e1",
+                    "hash" : "0xd19bf1f6eae804b8296e8556d87b2b818573fb2ccd2dff01af563fee71b5d6e1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -35,7 +35,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d19bf1f6eae804b8296e8556d87b2b818573fb2ccd2dff01af563fee71b5d6e1",
+                    "hash" : "0xd19bf1f6eae804b8296e8556d87b2b818573fb2ccd2dff01af563fee71b5d6e1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -45,7 +45,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "21d1a847eeea201a5087d9a368949ee94fabe30175c06b6836c7398d3b8b41ee",
+                    "hash" : "0x21d1a847eeea201a5087d9a368949ee94fabe30175c06b6836c7398d3b8b41ee",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -55,7 +55,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "21d1a847eeea201a5087d9a368949ee94fabe30175c06b6836c7398d3b8b41ee",
+                    "hash" : "0x21d1a847eeea201a5087d9a368949ee94fabe30175c06b6836c7398d3b8b41ee",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,7 +65,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d19bf1f6eae804b8296e8556d87b2b818573fb2ccd2dff01af563fee71b5d6e1",
+                    "hash" : "0xd19bf1f6eae804b8296e8556d87b2b818573fb2ccd2dff01af563fee71b5d6e1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -76,23 +76,23 @@
         },
         "postStateRoot" : "21d1a847eeea201a5087d9a368949ee94fabe30175c06b6836c7398d3b8b41ee",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x6bd243dbcfdc6982733e4cd6261574fc6cdec93282ff50ef24d8be05d58be29301ddb00d7547f6b65997e73d232b76d6484c11eb15c87b01f89e2779c427711ba193e4e163967efd1b9315187c3227f67b9282fc7524692fbf851cb370d396d53f7a86353aacecc5c1eadeddbb3925522f935fc5ed03568fbf40261c056a124f1334cc9fa8eea2bdbf68f04c10cc08b6babcbb6ee8d3fb88dd42d06d445b5eab34cb5d64408cf652fd7568acaa81b573f66fa8781e83185438e42796631ae9a9987f714d986f94fc6354921a9367bb6b9e555f24107cb814557f8bd87547ad612c3e726f9f495b0ac9e37fbe5f23014c68d8d032bfae779a5213c33778af679417d77733645f87b6042be92c553dbb6d85a2c56b21a53c0e612ae0a8d78d60f162b52efea464ebb0472b3e7794198cdb286cd2f21f06659320130750e7aa2c83ceb2801555785c9f02455252560846587006e90cbffc955445d9ef1f55eeb07011c02cee02df12dc35b36702539873e4b766e4ae9e829a442460dd7f845cd37dc08f93bef98a4d5b53ecd4cf4dd1a5c416f92116160f0fb673c30b7873b85a2ff6331a5d371f3d109f5794d712e03493b17fc562ac7589411127e654ce32d273f8300cc8544e7bd782aa7828b543958dadf872d7f13401a51b13835cc8a36be87cc7347cdf0f7aa2df420bb03e925c117d4befbc7e69472fd75f01f3f6c966de818174aba3b7a43014c3dd39414fb3d239d72e06852ae48e6203c60a7e844d6fd61c5b519d43780d383d103989f9bfce5ed122804cba183c188f5ce47c348a96973eca904f096aed4fb77d40ca9139447527f267a028eae5e3706e1975fc3e38327505e81d0e8c9fab1f60ec7ece71cc87510f308984ebdcb8ab84e1905dfdc0a19ee3c5f37e88dc3a9f26497c51427da28f6d777d9585b4ec790722bacaa179b1dc5b086d945623f9d29f6013600c60096019634f4421eb73095e7baea6a6c7c4c2dfeb977efac326af552d87631ac754faf17506f9cc63229e7fe309b7a2f1acf074a43aa4dd2b75bf6dadf21aadb9a3e239a9592f576c9265eebd2420e2626d2b2f1f7ee7a56725d7d4fe23da45725e8b709d2976703147ef66a8fc9a6c1225df7b79eec95ddda5e91c6e19bbc55baf9d6c440cc805f0d229738d17a76f95e329f94d5bc48cc5964933f9597fb57a6f7290649722d68a72fa2d081c4547943b3bbca2edc5f4032c5c916e585fa6abd1b209e2b6fb64498a37b9796c95da3fdb8013c13ef99ed49b29282ae55458c651fdb8598b527024d2da1e8a7015f65ee4ab0178b68ab8c877d55f3c89a7f1f7bc6c0d86bc69688cbcc252972693993bf766aac4efb2b65b216cca2e721dea3f3b3df3abbbfb7b8d",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -107,8 +107,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x74c15a91"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest499.json b/GeneralStateTests/stRandom/randomStatetest499.json
index 3ede659bb..738c22dcd 100644
--- a/GeneralStateTests/stRandom/randomStatetest499.json
+++ b/GeneralStateTests/stRandom/randomStatetest499.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest499" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "462ff1e3cfe9f27035a3316763bdedf8e8a992d7999aa04af6d8dd1206fac2da",
+                    "hash" : "0x462ff1e3cfe9f27035a3316763bdedf8e8a992d7999aa04af6d8dd1206fac2da",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "462ff1e3cfe9f27035a3316763bdedf8e8a992d7999aa04af6d8dd1206fac2da",
+                    "hash" : "0x462ff1e3cfe9f27035a3316763bdedf8e8a992d7999aa04af6d8dd1206fac2da",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "462ff1e3cfe9f27035a3316763bdedf8e8a992d7999aa04af6d8dd1206fac2da",
+                    "hash" : "0x462ff1e3cfe9f27035a3316763bdedf8e8a992d7999aa04af6d8dd1206fac2da",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "462ff1e3cfe9f27035a3316763bdedf8e8a992d7999aa04af6d8dd1206fac2da",
+                    "hash" : "0x462ff1e3cfe9f27035a3316763bdedf8e8a992d7999aa04af6d8dd1206fac2da",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "462ff1e3cfe9f27035a3316763bdedf8e8a992d7999aa04af6d8dd1206fac2da",
+                    "hash" : "0x462ff1e3cfe9f27035a3316763bdedf8e8a992d7999aa04af6d8dd1206fac2da",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "462ff1e3cfe9f27035a3316763bdedf8e8a992d7999aa04af6d8dd1206fac2da",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000399f869aff3b06333860005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "2058040485"
+                "0x7aab34a5"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest5.json b/GeneralStateTests/stRandom/randomStatetest5.json
index 5e4475545..11f9f9c84 100644
--- a/GeneralStateTests/stRandom/randomStatetest5.json
+++ b/GeneralStateTests/stRandom/randomStatetest5.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest5" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6d418b444178233d6c7aeebe84e0dfdce70ae365b5420aa76768e7b4f2596b1d",
+                    "hash" : "0x6d418b444178233d6c7aeebe84e0dfdce70ae365b5420aa76768e7b4f2596b1d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6d418b444178233d6c7aeebe84e0dfdce70ae365b5420aa76768e7b4f2596b1d",
+                    "hash" : "0x6d418b444178233d6c7aeebe84e0dfdce70ae365b5420aa76768e7b4f2596b1d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6d418b444178233d6c7aeebe84e0dfdce70ae365b5420aa76768e7b4f2596b1d",
+                    "hash" : "0x6d418b444178233d6c7aeebe84e0dfdce70ae365b5420aa76768e7b4f2596b1d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6d418b444178233d6c7aeebe84e0dfdce70ae365b5420aa76768e7b4f2596b1d",
+                    "hash" : "0x6d418b444178233d6c7aeebe84e0dfdce70ae365b5420aa76768e7b4f2596b1d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6d418b444178233d6c7aeebe84e0dfdce70ae365b5420aa76768e7b4f2596b1d",
+                    "hash" : "0x6d418b444178233d6c7aeebe84e0dfdce70ae365b5420aa76768e7b4f2596b1d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "6d418b444178233d6c7aeebe84e0dfdce70ae365b5420aa76768e7b4f2596b1d",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x427f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0960005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1016957738"
+                "0x3c9d8b2a"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest50.json b/GeneralStateTests/stRandom/randomStatetest50.json
index 37fb39f0d..09ebc1751 100644
--- a/GeneralStateTests/stRandom/randomStatetest50.json
+++ b/GeneralStateTests/stRandom/randomStatetest50.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest50" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c124ab3ba66012badfe5f44331fa53fbfeda3936fc6d01a5402f2210e41ddd08",
+                    "hash" : "0xc124ab3ba66012badfe5f44331fa53fbfeda3936fc6d01a5402f2210e41ddd08",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c124ab3ba66012badfe5f44331fa53fbfeda3936fc6d01a5402f2210e41ddd08",
+                    "hash" : "0xc124ab3ba66012badfe5f44331fa53fbfeda3936fc6d01a5402f2210e41ddd08",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "c124ab3ba66012badfe5f44331fa53fbfeda3936fc6d01a5402f2210e41ddd08",
+                    "hash" : "0xc124ab3ba66012badfe5f44331fa53fbfeda3936fc6d01a5402f2210e41ddd08",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c124ab3ba66012badfe5f44331fa53fbfeda3936fc6d01a5402f2210e41ddd08",
+                    "hash" : "0xc124ab3ba66012badfe5f44331fa53fbfeda3936fc6d01a5402f2210e41ddd08",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c124ab3ba66012badfe5f44331fa53fbfeda3936fc6d01a5402f2210e41ddd08",
+                    "hash" : "0xc124ab3ba66012badfe5f44331fa53fbfeda3936fc6d01a5402f2210e41ddd08",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "c124ab3ba66012badfe5f44331fa53fbfeda3936fc6d01a5402f2210e41ddd08",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9a8b7379431080346b159960005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1492970685"
+                "0x58fcecbd"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest500.json b/GeneralStateTests/stRandom/randomStatetest500.json
index 6c6fb7f87..318b5b893 100644
--- a/GeneralStateTests/stRandom/randomStatetest500.json
+++ b/GeneralStateTests/stRandom/randomStatetest500.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest500" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e231640303aa5abe7f94a028bcc8c60ea2cdaf4a760bd843f3a37235201adb24",
+                    "hash" : "0xe231640303aa5abe7f94a028bcc8c60ea2cdaf4a760bd843f3a37235201adb24",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e231640303aa5abe7f94a028bcc8c60ea2cdaf4a760bd843f3a37235201adb24",
+                    "hash" : "0xe231640303aa5abe7f94a028bcc8c60ea2cdaf4a760bd843f3a37235201adb24",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e231640303aa5abe7f94a028bcc8c60ea2cdaf4a760bd843f3a37235201adb24",
+                    "hash" : "0xe231640303aa5abe7f94a028bcc8c60ea2cdaf4a760bd843f3a37235201adb24",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e231640303aa5abe7f94a028bcc8c60ea2cdaf4a760bd843f3a37235201adb24",
+                    "hash" : "0xe231640303aa5abe7f94a028bcc8c60ea2cdaf4a760bd843f3a37235201adb24",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e231640303aa5abe7f94a028bcc8c60ea2cdaf4a760bd843f3a37235201adb24",
+                    "hash" : "0xe231640303aa5abe7f94a028bcc8c60ea2cdaf4a760bd843f3a37235201adb24",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "e231640303aa5abe7f94a028bcc8c60ea2cdaf4a760bd843f3a37235201adb24",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff817ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f87196584968a97046c6791993114825560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "34424143"
+                "0x020d454f"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest501.json b/GeneralStateTests/stRandom/randomStatetest501.json
index 834c0efb9..aa2250027 100644
--- a/GeneralStateTests/stRandom/randomStatetest501.json
+++ b/GeneralStateTests/stRandom/randomStatetest501.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest501" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "653f0054738694e585611b712ed5887b2648def1d956f6846dd8047c82738a31",
+                    "hash" : "0x653f0054738694e585611b712ed5887b2648def1d956f6846dd8047c82738a31",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "653f0054738694e585611b712ed5887b2648def1d956f6846dd8047c82738a31",
+                    "hash" : "0x653f0054738694e585611b712ed5887b2648def1d956f6846dd8047c82738a31",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "653f0054738694e585611b712ed5887b2648def1d956f6846dd8047c82738a31",
+                    "hash" : "0x653f0054738694e585611b712ed5887b2648def1d956f6846dd8047c82738a31",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "653f0054738694e585611b712ed5887b2648def1d956f6846dd8047c82738a31",
+                    "hash" : "0x653f0054738694e585611b712ed5887b2648def1d956f6846dd8047c82738a31",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "653f0054738694e585611b712ed5887b2648def1d956f6846dd8047c82738a31",
+                    "hash" : "0x653f0054738694e585611b712ed5887b2648def1d956f6846dd8047c82738a31",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "653f0054738694e585611b712ed5887b2648def1d956f6846dd8047c82738a31",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff095560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "156676500"
+                "0x0956b194"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest502.json b/GeneralStateTests/stRandom/randomStatetest502.json
index 400b81946..03b2fbd85 100644
--- a/GeneralStateTests/stRandom/randomStatetest502.json
+++ b/GeneralStateTests/stRandom/randomStatetest502.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest502" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "79c5155a5e9ba0b27961d5693b01ef2dbca2495d0ddeb71302a575b01a8d4773",
+                    "hash" : "0x79c5155a5e9ba0b27961d5693b01ef2dbca2495d0ddeb71302a575b01a8d4773",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "79c5155a5e9ba0b27961d5693b01ef2dbca2495d0ddeb71302a575b01a8d4773",
+                    "hash" : "0x79c5155a5e9ba0b27961d5693b01ef2dbca2495d0ddeb71302a575b01a8d4773",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "79c5155a5e9ba0b27961d5693b01ef2dbca2495d0ddeb71302a575b01a8d4773",
+                    "hash" : "0x79c5155a5e9ba0b27961d5693b01ef2dbca2495d0ddeb71302a575b01a8d4773",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "79c5155a5e9ba0b27961d5693b01ef2dbca2495d0ddeb71302a575b01a8d4773",
+                    "hash" : "0x79c5155a5e9ba0b27961d5693b01ef2dbca2495d0ddeb71302a575b01a8d4773",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "79c5155a5e9ba0b27961d5693b01ef2dbca2495d0ddeb71302a575b01a8d4773",
+                    "hash" : "0x79c5155a5e9ba0b27961d5693b01ef2dbca2495d0ddeb71302a575b01a8d4773",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "79c5155a5e9ba0b27961d5693b01ef2dbca2495d0ddeb71302a575b01a8d4773",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c350807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b59c66369a85a46da182186158637860005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "345377880"
+                "0x14960c58"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest503.json b/GeneralStateTests/stRandom/randomStatetest503.json
index 9266dfff8..a0eb7ce80 100644
--- a/GeneralStateTests/stRandom/randomStatetest503.json
+++ b/GeneralStateTests/stRandom/randomStatetest503.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest503" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "3838d2e1a699d5b20e784ef83c3a165dfccfb971517bfc8baa119512bec1fcc0",
+                    "hash" : "0x3838d2e1a699d5b20e784ef83c3a165dfccfb971517bfc8baa119512bec1fcc0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "3838d2e1a699d5b20e784ef83c3a165dfccfb971517bfc8baa119512bec1fcc0",
+                    "hash" : "0x3838d2e1a699d5b20e784ef83c3a165dfccfb971517bfc8baa119512bec1fcc0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3838d2e1a699d5b20e784ef83c3a165dfccfb971517bfc8baa119512bec1fcc0",
+                    "hash" : "0x3838d2e1a699d5b20e784ef83c3a165dfccfb971517bfc8baa119512bec1fcc0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3838d2e1a699d5b20e784ef83c3a165dfccfb971517bfc8baa119512bec1fcc0",
+                    "hash" : "0x3838d2e1a699d5b20e784ef83c3a165dfccfb971517bfc8baa119512bec1fcc0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "3838d2e1a699d5b20e784ef83c3a165dfccfb971517bfc8baa119512bec1fcc0",
+                    "hash" : "0x3838d2e1a699d5b20e784ef83c3a165dfccfb971517bfc8baa119512bec1fcc0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "3838d2e1a699d5b20e784ef83c3a165dfccfb971517bfc8baa119512bec1fcc0",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000006f0886a83c66553c9889528d8f1294ff5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "2071462314"
+                "0x7b7801aa"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest504.json b/GeneralStateTests/stRandom/randomStatetest504.json
index 196cab277..0f2f8d1fb 100644
--- a/GeneralStateTests/stRandom/randomStatetest504.json
+++ b/GeneralStateTests/stRandom/randomStatetest504.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest504" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6eeb44aa195850cff56903b1bc6ad37ae32a33bf577e45dcda5013ecd50cf546",
+                    "hash" : "0x6eeb44aa195850cff56903b1bc6ad37ae32a33bf577e45dcda5013ecd50cf546",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6eeb44aa195850cff56903b1bc6ad37ae32a33bf577e45dcda5013ecd50cf546",
+                    "hash" : "0x6eeb44aa195850cff56903b1bc6ad37ae32a33bf577e45dcda5013ecd50cf546",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6eeb44aa195850cff56903b1bc6ad37ae32a33bf577e45dcda5013ecd50cf546",
+                    "hash" : "0x6eeb44aa195850cff56903b1bc6ad37ae32a33bf577e45dcda5013ecd50cf546",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6eeb44aa195850cff56903b1bc6ad37ae32a33bf577e45dcda5013ecd50cf546",
+                    "hash" : "0x6eeb44aa195850cff56903b1bc6ad37ae32a33bf577e45dcda5013ecd50cf546",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6eeb44aa195850cff56903b1bc6ad37ae32a33bf577e45dcda5013ecd50cf546",
+                    "hash" : "0x6eeb44aa195850cff56903b1bc6ad37ae32a33bf577e45dcda5013ecd50cf546",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "6eeb44aa195850cff56903b1bc6ad37ae32a33bf577e45dcda5013ecd50cf546",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe457f0000000000000000000000000000000000000000000000000000000000000001e37f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c35001589a84106d9c60005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1095126158"
+                "0x41464c8e"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest505.json b/GeneralStateTests/stRandom/randomStatetest505.json
index 18b953638..9c74292c3 100644
--- a/GeneralStateTests/stRandom/randomStatetest505.json
+++ b/GeneralStateTests/stRandom/randomStatetest505.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest505" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "52e98ba2380b764b31a76588cec8b8190e426dc12c17a5141c68e40fdd93c1af",
+                    "hash" : "0x52e98ba2380b764b31a76588cec8b8190e426dc12c17a5141c68e40fdd93c1af",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "52e98ba2380b764b31a76588cec8b8190e426dc12c17a5141c68e40fdd93c1af",
+                    "hash" : "0x52e98ba2380b764b31a76588cec8b8190e426dc12c17a5141c68e40fdd93c1af",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "52e98ba2380b764b31a76588cec8b8190e426dc12c17a5141c68e40fdd93c1af",
+                    "hash" : "0x52e98ba2380b764b31a76588cec8b8190e426dc12c17a5141c68e40fdd93c1af",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "52e98ba2380b764b31a76588cec8b8190e426dc12c17a5141c68e40fdd93c1af",
+                    "hash" : "0x52e98ba2380b764b31a76588cec8b8190e426dc12c17a5141c68e40fdd93c1af",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "52e98ba2380b764b31a76588cec8b8190e426dc12c17a5141c68e40fdd93c1af",
+                    "hash" : "0x52e98ba2380b764b31a76588cec8b8190e426dc12c17a5141c68e40fdd93c1af",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "52e98ba2380b764b31a76588cec8b8190e426dc12c17a5141c68e40fdd93c1af",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe427f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe457f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000006f44a06f550371317376738c539984375560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1075033443"
+                "0x4013b563"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest506.json b/GeneralStateTests/stRandom/randomStatetest506.json
index 9eaeb566c..d25a1e5a6 100644
--- a/GeneralStateTests/stRandom/randomStatetest506.json
+++ b/GeneralStateTests/stRandom/randomStatetest506.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest506" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a97f1d4662256ab6c1913e78a165b345420bbf1f5a89520803c54da3fe737937",
+                    "hash" : "0xa97f1d4662256ab6c1913e78a165b345420bbf1f5a89520803c54da3fe737937",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a97f1d4662256ab6c1913e78a165b345420bbf1f5a89520803c54da3fe737937",
+                    "hash" : "0xa97f1d4662256ab6c1913e78a165b345420bbf1f5a89520803c54da3fe737937",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a97f1d4662256ab6c1913e78a165b345420bbf1f5a89520803c54da3fe737937",
+                    "hash" : "0xa97f1d4662256ab6c1913e78a165b345420bbf1f5a89520803c54da3fe737937",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a97f1d4662256ab6c1913e78a165b345420bbf1f5a89520803c54da3fe737937",
+                    "hash" : "0xa97f1d4662256ab6c1913e78a165b345420bbf1f5a89520803c54da3fe737937",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a97f1d4662256ab6c1913e78a165b345420bbf1f5a89520803c54da3fe737937",
+                    "hash" : "0xa97f1d4662256ab6c1913e78a165b345420bbf1f5a89520803c54da3fe737937",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "b4e662a2c2bc80db9f92d6e76529ac438544e4bc22f713eab59a05c764d1144e",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000000042377f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006ba218f370862059149e3cff2060005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "947509958"
+                "0x3879dac6"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest507.json b/GeneralStateTests/stRandom/randomStatetest507.json
index cd3950823..f403a70eb 100644
--- a/GeneralStateTests/stRandom/randomStatetest507.json
+++ b/GeneralStateTests/stRandom/randomStatetest507.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest507" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "192265c0723dc7c2d20ffdcfee7110c09e76add57cd068dc374c021eee3e17f3",
+                    "hash" : "0x192265c0723dc7c2d20ffdcfee7110c09e76add57cd068dc374c021eee3e17f3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "192265c0723dc7c2d20ffdcfee7110c09e76add57cd068dc374c021eee3e17f3",
+                    "hash" : "0x192265c0723dc7c2d20ffdcfee7110c09e76add57cd068dc374c021eee3e17f3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "192265c0723dc7c2d20ffdcfee7110c09e76add57cd068dc374c021eee3e17f3",
+                    "hash" : "0x192265c0723dc7c2d20ffdcfee7110c09e76add57cd068dc374c021eee3e17f3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "192265c0723dc7c2d20ffdcfee7110c09e76add57cd068dc374c021eee3e17f3",
+                    "hash" : "0x192265c0723dc7c2d20ffdcfee7110c09e76add57cd068dc374c021eee3e17f3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "192265c0723dc7c2d20ffdcfee7110c09e76add57cd068dc374c021eee3e17f3",
+                    "hash" : "0x192265c0723dc7c2d20ffdcfee7110c09e76add57cd068dc374c021eee3e17f3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "192265c0723dc7c2d20ffdcfee7110c09e76add57cd068dc374c021eee3e17f3",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x5a7f0000000000000000000000010000000000000000000000000000000000000000327f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b56f99a4527612a199a06d1a348b02563a9b60005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "696746762"
+                "0x2987830a"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest508.json b/GeneralStateTests/stRandom/randomStatetest508.json
index 03525321f..cc9dbae37 100644
--- a/GeneralStateTests/stRandom/randomStatetest508.json
+++ b/GeneralStateTests/stRandom/randomStatetest508.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest508" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9ae2579ba5b9d5c58e22e61dce07e9ed484addf5a7f7e05ead85bc579c6547a7",
+                    "hash" : "0x9ae2579ba5b9d5c58e22e61dce07e9ed484addf5a7f7e05ead85bc579c6547a7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9ae2579ba5b9d5c58e22e61dce07e9ed484addf5a7f7e05ead85bc579c6547a7",
+                    "hash" : "0x9ae2579ba5b9d5c58e22e61dce07e9ed484addf5a7f7e05ead85bc579c6547a7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3d03bc1c45759cac030d4352629c83013c6f475445189fa2b4b38fad8e11c021",
+                    "hash" : "0x3d03bc1c45759cac030d4352629c83013c6f475445189fa2b4b38fad8e11c021",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3d03bc1c45759cac030d4352629c83013c6f475445189fa2b4b38fad8e11c021",
+                    "hash" : "0x3d03bc1c45759cac030d4352629c83013c6f475445189fa2b4b38fad8e11c021",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9ae2579ba5b9d5c58e22e61dce07e9ed484addf5a7f7e05ead85bc579c6547a7",
+                    "hash" : "0x9ae2579ba5b9d5c58e22e61dce07e9ed484addf5a7f7e05ead85bc579c6547a7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "3d03bc1c45759cac030d4352629c83013c6f475445189fa2b4b38fad8e11c021",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x41414444424143448231537241317f55",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest509.json b/GeneralStateTests/stRandom/randomStatetest509.json
index d4ac0b204..fa095521f 100644
--- a/GeneralStateTests/stRandom/randomStatetest509.json
+++ b/GeneralStateTests/stRandom/randomStatetest509.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest509" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7bf406e499739a794f51923be7a9504443e4a9a34b34e5127f350d66865f8451",
+                    "hash" : "0x7bf406e499739a794f51923be7a9504443e4a9a34b34e5127f350d66865f8451",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7bf406e499739a794f51923be7a9504443e4a9a34b34e5127f350d66865f8451",
+                    "hash" : "0x7bf406e499739a794f51923be7a9504443e4a9a34b34e5127f350d66865f8451",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "7bf406e499739a794f51923be7a9504443e4a9a34b34e5127f350d66865f8451",
+                    "hash" : "0x7bf406e499739a794f51923be7a9504443e4a9a34b34e5127f350d66865f8451",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "7bf406e499739a794f51923be7a9504443e4a9a34b34e5127f350d66865f8451",
+                    "hash" : "0x7bf406e499739a794f51923be7a9504443e4a9a34b34e5127f350d66865f8451",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7bf406e499739a794f51923be7a9504443e4a9a34b34e5127f350d66865f8451",
+                    "hash" : "0x7bf406e499739a794f51923be7a9504443e4a9a34b34e5127f350d66865f8451",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "7bf406e499739a794f51923be7a9504443e4a9a34b34e5127f350d66865f8451",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x4542",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest51.json b/GeneralStateTests/stRandom/randomStatetest51.json
index 30c1f018a..fab30d78a 100644
--- a/GeneralStateTests/stRandom/randomStatetest51.json
+++ b/GeneralStateTests/stRandom/randomStatetest51.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest51" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9d35d961673db10b4083751411fb01ce25c9d6b4dae15c4bc12db4ae3aa45b06",
+                    "hash" : "0x9d35d961673db10b4083751411fb01ce25c9d6b4dae15c4bc12db4ae3aa45b06",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9d35d961673db10b4083751411fb01ce25c9d6b4dae15c4bc12db4ae3aa45b06",
+                    "hash" : "0x9d35d961673db10b4083751411fb01ce25c9d6b4dae15c4bc12db4ae3aa45b06",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9d35d961673db10b4083751411fb01ce25c9d6b4dae15c4bc12db4ae3aa45b06",
+                    "hash" : "0x9d35d961673db10b4083751411fb01ce25c9d6b4dae15c4bc12db4ae3aa45b06",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9d35d961673db10b4083751411fb01ce25c9d6b4dae15c4bc12db4ae3aa45b06",
+                    "hash" : "0x9d35d961673db10b4083751411fb01ce25c9d6b4dae15c4bc12db4ae3aa45b06",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9d35d961673db10b4083751411fb01ce25c9d6b4dae15c4bc12db4ae3aa45b06",
+                    "hash" : "0x9d35d961673db10b4083751411fb01ce25c9d6b4dae15c4bc12db4ae3aa45b06",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "9d35d961673db10b4083751411fb01ce25c9d6b4dae15c4bc12db4ae3aa45b06",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f0000000000000000000000000000000000000000000000000000000000000001757f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57a7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe83189b60005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1062041617"
+                "0x3f4d7811"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest510.json b/GeneralStateTests/stRandom/randomStatetest510.json
index b685a3cf4..14b8abc57 100644
--- a/GeneralStateTests/stRandom/randomStatetest510.json
+++ b/GeneralStateTests/stRandom/randomStatetest510.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest510" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "89b38c7da2c1aa8c535ccbff5392c3f23c50a3ff50569d528baf04c7b1fc71f0",
+                    "hash" : "0x89b38c7da2c1aa8c535ccbff5392c3f23c50a3ff50569d528baf04c7b1fc71f0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "89b38c7da2c1aa8c535ccbff5392c3f23c50a3ff50569d528baf04c7b1fc71f0",
+                    "hash" : "0x89b38c7da2c1aa8c535ccbff5392c3f23c50a3ff50569d528baf04c7b1fc71f0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "89b38c7da2c1aa8c535ccbff5392c3f23c50a3ff50569d528baf04c7b1fc71f0",
+                    "hash" : "0x89b38c7da2c1aa8c535ccbff5392c3f23c50a3ff50569d528baf04c7b1fc71f0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "89b38c7da2c1aa8c535ccbff5392c3f23c50a3ff50569d528baf04c7b1fc71f0",
+                    "hash" : "0x89b38c7da2c1aa8c535ccbff5392c3f23c50a3ff50569d528baf04c7b1fc71f0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "89b38c7da2c1aa8c535ccbff5392c3f23c50a3ff50569d528baf04c7b1fc71f0",
+                    "hash" : "0x89b38c7da2c1aa8c535ccbff5392c3f23c50a3ff50569d528baf04c7b1fc71f0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "89b38c7da2c1aa8c535ccbff5392c3f23c50a3ff50569d528baf04c7b1fc71f0",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5447f00000000000000000000000000000000000000000000000000000000000000005a456ff23a88535564545969f162615b93325560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1913364794"
+                "0x720ba13a"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest511.json b/GeneralStateTests/stRandom/randomStatetest511.json
index 329563524..f5f73c13b 100644
--- a/GeneralStateTests/stRandom/randomStatetest511.json
+++ b/GeneralStateTests/stRandom/randomStatetest511.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest511" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "18fe0ad1e56bfffdff063202d62837a841c423282e6365a96a34b02c9978a36a",
+                    "hash" : "0x18fe0ad1e56bfffdff063202d62837a841c423282e6365a96a34b02c9978a36a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "18fe0ad1e56bfffdff063202d62837a841c423282e6365a96a34b02c9978a36a",
+                    "hash" : "0x18fe0ad1e56bfffdff063202d62837a841c423282e6365a96a34b02c9978a36a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "18fe0ad1e56bfffdff063202d62837a841c423282e6365a96a34b02c9978a36a",
+                    "hash" : "0x18fe0ad1e56bfffdff063202d62837a841c423282e6365a96a34b02c9978a36a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "18fe0ad1e56bfffdff063202d62837a841c423282e6365a96a34b02c9978a36a",
+                    "hash" : "0x18fe0ad1e56bfffdff063202d62837a841c423282e6365a96a34b02c9978a36a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "18fe0ad1e56bfffdff063202d62837a841c423282e6365a96a34b02c9978a36a",
+                    "hash" : "0x18fe0ad1e56bfffdff063202d62837a841c423282e6365a96a34b02c9978a36a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "18fe0ad1e56bfffdff063202d62837a841c423282e6365a96a34b02c9978a36a",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff416f6a52027f41f267453843630a6644414560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "462006051"
+                "0x1b89a723"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest512.json b/GeneralStateTests/stRandom/randomStatetest512.json
index 759ab07dc..73f6a8288 100644
--- a/GeneralStateTests/stRandom/randomStatetest512.json
+++ b/GeneralStateTests/stRandom/randomStatetest512.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest512" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "ea9e2334a34bdc4cca759398b5b8bb20794dc7c1be990a3ef80ac799aa8403ef",
+                    "hash" : "0xea9e2334a34bdc4cca759398b5b8bb20794dc7c1be990a3ef80ac799aa8403ef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "ea9e2334a34bdc4cca759398b5b8bb20794dc7c1be990a3ef80ac799aa8403ef",
+                    "hash" : "0xea9e2334a34bdc4cca759398b5b8bb20794dc7c1be990a3ef80ac799aa8403ef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "ea9e2334a34bdc4cca759398b5b8bb20794dc7c1be990a3ef80ac799aa8403ef",
+                    "hash" : "0xea9e2334a34bdc4cca759398b5b8bb20794dc7c1be990a3ef80ac799aa8403ef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ea9e2334a34bdc4cca759398b5b8bb20794dc7c1be990a3ef80ac799aa8403ef",
+                    "hash" : "0xea9e2334a34bdc4cca759398b5b8bb20794dc7c1be990a3ef80ac799aa8403ef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "ea9e2334a34bdc4cca759398b5b8bb20794dc7c1be990a3ef80ac799aa8403ef",
+                    "hash" : "0xea9e2334a34bdc4cca759398b5b8bb20794dc7c1be990a3ef80ac799aa8403ef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "ea9e2334a34bdc4cca759398b5b8bb20794dc7c1be990a3ef80ac799aa8403ef",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350437fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f3b5bff4056709774995150026344925560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "871411208"
+                "0x33f0ae08"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest513.json b/GeneralStateTests/stRandom/randomStatetest513.json
index b79e446bf..5cdcfa775 100644
--- a/GeneralStateTests/stRandom/randomStatetest513.json
+++ b/GeneralStateTests/stRandom/randomStatetest513.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest513" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b94e1ef66b03fbd5194cde790dd593e3b32dc1f940fc219df947586e28602cb1",
+                    "hash" : "0xb94e1ef66b03fbd5194cde790dd593e3b32dc1f940fc219df947586e28602cb1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b94e1ef66b03fbd5194cde790dd593e3b32dc1f940fc219df947586e28602cb1",
+                    "hash" : "0xb94e1ef66b03fbd5194cde790dd593e3b32dc1f940fc219df947586e28602cb1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b94e1ef66b03fbd5194cde790dd593e3b32dc1f940fc219df947586e28602cb1",
+                    "hash" : "0xb94e1ef66b03fbd5194cde790dd593e3b32dc1f940fc219df947586e28602cb1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b94e1ef66b03fbd5194cde790dd593e3b32dc1f940fc219df947586e28602cb1",
+                    "hash" : "0xb94e1ef66b03fbd5194cde790dd593e3b32dc1f940fc219df947586e28602cb1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b94e1ef66b03fbd5194cde790dd593e3b32dc1f940fc219df947586e28602cb1",
+                    "hash" : "0xb94e1ef66b03fbd5194cde790dd593e3b32dc1f940fc219df947586e28602cb1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "b94e1ef66b03fbd5194cde790dd593e3b32dc1f940fc219df947586e28602cb1",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff3b437ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000000000000000000000000001982046817382a13afa3760088d55",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "406473464"
+                "0x183a4af8"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest514.json b/GeneralStateTests/stRandom/randomStatetest514.json
index 9496df502..bd4b18e02 100644
--- a/GeneralStateTests/stRandom/randomStatetest514.json
+++ b/GeneralStateTests/stRandom/randomStatetest514.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest514" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "40a5c7197419fb4c4bbd2c399eddc9ad8bcd01b0b950428958c21339ed0253ef",
+                    "hash" : "0x40a5c7197419fb4c4bbd2c399eddc9ad8bcd01b0b950428958c21339ed0253ef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "40a5c7197419fb4c4bbd2c399eddc9ad8bcd01b0b950428958c21339ed0253ef",
+                    "hash" : "0x40a5c7197419fb4c4bbd2c399eddc9ad8bcd01b0b950428958c21339ed0253ef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "40a5c7197419fb4c4bbd2c399eddc9ad8bcd01b0b950428958c21339ed0253ef",
+                    "hash" : "0x40a5c7197419fb4c4bbd2c399eddc9ad8bcd01b0b950428958c21339ed0253ef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "40a5c7197419fb4c4bbd2c399eddc9ad8bcd01b0b950428958c21339ed0253ef",
+                    "hash" : "0x40a5c7197419fb4c4bbd2c399eddc9ad8bcd01b0b950428958c21339ed0253ef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "40a5c7197419fb4c4bbd2c399eddc9ad8bcd01b0b950428958c21339ed0253ef",
+                    "hash" : "0x40a5c7197419fb4c4bbd2c399eddc9ad8bcd01b0b950428958c21339ed0253ef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "40a5c7197419fb4c4bbd2c399eddc9ad8bcd01b0b950428958c21339ed0253ef",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe44447f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3506c8ea356796d65546d3883768f5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,8 +96,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x105d80ad"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest515.json b/GeneralStateTests/stRandom/randomStatetest515.json
index 8922cd546..f59110e8d 100644
--- a/GeneralStateTests/stRandom/randomStatetest515.json
+++ b/GeneralStateTests/stRandom/randomStatetest515.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest515" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "fa6523aa138f4c6e58cce52e268d93c44f54b064ab32e36474c89f9454c3f48e",
+                    "hash" : "0xfa6523aa138f4c6e58cce52e268d93c44f54b064ab32e36474c89f9454c3f48e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "fa6523aa138f4c6e58cce52e268d93c44f54b064ab32e36474c89f9454c3f48e",
+                    "hash" : "0xfa6523aa138f4c6e58cce52e268d93c44f54b064ab32e36474c89f9454c3f48e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "fa6523aa138f4c6e58cce52e268d93c44f54b064ab32e36474c89f9454c3f48e",
+                    "hash" : "0xfa6523aa138f4c6e58cce52e268d93c44f54b064ab32e36474c89f9454c3f48e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "fa6523aa138f4c6e58cce52e268d93c44f54b064ab32e36474c89f9454c3f48e",
+                    "hash" : "0xfa6523aa138f4c6e58cce52e268d93c44f54b064ab32e36474c89f9454c3f48e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "fa6523aa138f4c6e58cce52e268d93c44f54b064ab32e36474c89f9454c3f48e",
+                    "hash" : "0xfa6523aa138f4c6e58cce52e268d93c44f54b064ab32e36474c89f9454c3f48e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "fa6523aa138f4c6e58cce52e268d93c44f54b064ab32e36474c89f9454c3f48e",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x437f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f9283944569657e135a7e38997986955560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1108434794"
+                "0x42115f6a"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest516.json b/GeneralStateTests/stRandom/randomStatetest516.json
index 3b0d42468..19c2f0e02 100644
--- a/GeneralStateTests/stRandom/randomStatetest516.json
+++ b/GeneralStateTests/stRandom/randomStatetest516.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest516" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7adf35a566488b6f07d1b3df73f78141341a13e859fe05d6d0469778ddf24895",
+                    "hash" : "0x7adf35a566488b6f07d1b3df73f78141341a13e859fe05d6d0469778ddf24895",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7adf35a566488b6f07d1b3df73f78141341a13e859fe05d6d0469778ddf24895",
+                    "hash" : "0x7adf35a566488b6f07d1b3df73f78141341a13e859fe05d6d0469778ddf24895",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "7adf35a566488b6f07d1b3df73f78141341a13e859fe05d6d0469778ddf24895",
+                    "hash" : "0x7adf35a566488b6f07d1b3df73f78141341a13e859fe05d6d0469778ddf24895",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "7adf35a566488b6f07d1b3df73f78141341a13e859fe05d6d0469778ddf24895",
+                    "hash" : "0x7adf35a566488b6f07d1b3df73f78141341a13e859fe05d6d0469778ddf24895",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7adf35a566488b6f07d1b3df73f78141341a13e859fe05d6d0469778ddf24895",
+                    "hash" : "0x7adf35a566488b6f07d1b3df73f78141341a13e859fe05d6d0469778ddf24895",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "7adf35a566488b6f07d1b3df73f78141341a13e859fe05d6d0469778ddf24895",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6a32787358019b39186861940960005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "46630890"
+                "0x02c787ea"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest517.json b/GeneralStateTests/stRandom/randomStatetest517.json
index 8e55409f3..3e73e3917 100644
--- a/GeneralStateTests/stRandom/randomStatetest517.json
+++ b/GeneralStateTests/stRandom/randomStatetest517.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest517" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "0375c4ffc1cda5322d96617111cb9151c91589cd4b9a92856701aa046067a4b7",
+                    "hash" : "0x0375c4ffc1cda5322d96617111cb9151c91589cd4b9a92856701aa046067a4b7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "0375c4ffc1cda5322d96617111cb9151c91589cd4b9a92856701aa046067a4b7",
+                    "hash" : "0x0375c4ffc1cda5322d96617111cb9151c91589cd4b9a92856701aa046067a4b7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "0375c4ffc1cda5322d96617111cb9151c91589cd4b9a92856701aa046067a4b7",
+                    "hash" : "0x0375c4ffc1cda5322d96617111cb9151c91589cd4b9a92856701aa046067a4b7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "0375c4ffc1cda5322d96617111cb9151c91589cd4b9a92856701aa046067a4b7",
+                    "hash" : "0x0375c4ffc1cda5322d96617111cb9151c91589cd4b9a92856701aa046067a4b7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0375c4ffc1cda5322d96617111cb9151c91589cd4b9a92856701aa046067a4b7",
+                    "hash" : "0x0375c4ffc1cda5322d96617111cb9151c91589cd4b9a92856701aa046067a4b7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "0375c4ffc1cda5322d96617111cb9151c91589cd4b9a92856701aa046067a4b7",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff3a6f450831a46a867f32569596f0099f7b8c915560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1922148943"
+                "0x7291aa4f"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest518.json b/GeneralStateTests/stRandom/randomStatetest518.json
index b7643bca0..a8a110d6b 100644
--- a/GeneralStateTests/stRandom/randomStatetest518.json
+++ b/GeneralStateTests/stRandom/randomStatetest518.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest518" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "356061dda37e155624c4341318a571b634341e459ea80c8ba38f1e616cce75e7",
+                    "hash" : "0x356061dda37e155624c4341318a571b634341e459ea80c8ba38f1e616cce75e7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "356061dda37e155624c4341318a571b634341e459ea80c8ba38f1e616cce75e7",
+                    "hash" : "0x356061dda37e155624c4341318a571b634341e459ea80c8ba38f1e616cce75e7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "356061dda37e155624c4341318a571b634341e459ea80c8ba38f1e616cce75e7",
+                    "hash" : "0x356061dda37e155624c4341318a571b634341e459ea80c8ba38f1e616cce75e7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "356061dda37e155624c4341318a571b634341e459ea80c8ba38f1e616cce75e7",
+                    "hash" : "0x356061dda37e155624c4341318a571b634341e459ea80c8ba38f1e616cce75e7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "356061dda37e155624c4341318a571b634341e459ea80c8ba38f1e616cce75e7",
+                    "hash" : "0x356061dda37e155624c4341318a571b634341e459ea80c8ba38f1e616cce75e7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "356061dda37e155624c4341318a571b634341e459ea80c8ba38f1e616cce75e7",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f3c589f416d947a5134f268515b6c925560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1096593865"
+                "0x415cb1c9"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest519.json b/GeneralStateTests/stRandom/randomStatetest519.json
index a8230deac..71dd88baf 100644
--- a/GeneralStateTests/stRandom/randomStatetest519.json
+++ b/GeneralStateTests/stRandom/randomStatetest519.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest519" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "008998dffe180dfdea2806ecb245f6fa99182df32462cac44d4d9bc9343ad763",
+                    "hash" : "0x008998dffe180dfdea2806ecb245f6fa99182df32462cac44d4d9bc9343ad763",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "008998dffe180dfdea2806ecb245f6fa99182df32462cac44d4d9bc9343ad763",
+                    "hash" : "0x008998dffe180dfdea2806ecb245f6fa99182df32462cac44d4d9bc9343ad763",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "008998dffe180dfdea2806ecb245f6fa99182df32462cac44d4d9bc9343ad763",
+                    "hash" : "0x008998dffe180dfdea2806ecb245f6fa99182df32462cac44d4d9bc9343ad763",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "008998dffe180dfdea2806ecb245f6fa99182df32462cac44d4d9bc9343ad763",
+                    "hash" : "0x008998dffe180dfdea2806ecb245f6fa99182df32462cac44d4d9bc9343ad763",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "008998dffe180dfdea2806ecb245f6fa99182df32462cac44d4d9bc9343ad763",
+                    "hash" : "0x008998dffe180dfdea2806ecb245f6fa99182df32462cac44d4d9bc9343ad763",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "008998dffe180dfdea2806ecb245f6fa99182df32462cac44d4d9bc9343ad763",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000001000000000000000000000000000000000000000009457f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3501a02556b85a4531155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "245898175"
+                "0x0ea81bbf"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest52.json b/GeneralStateTests/stRandom/randomStatetest52.json
index 91b2ee93c..6bc7cbd54 100644
--- a/GeneralStateTests/stRandom/randomStatetest52.json
+++ b/GeneralStateTests/stRandom/randomStatetest52.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest52" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "01b3692c1a97599e3d570ac4319b0ebe50555552f3d9958b2b4c5ac4fef2c8ed",
+                    "hash" : "0x01b3692c1a97599e3d570ac4319b0ebe50555552f3d9958b2b4c5ac4fef2c8ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f1f32496e98d94deef759c088703253a00f2adbed488d04e109106ae0f544644",
+                    "hash" : "0xf1f32496e98d94deef759c088703253a00f2adbed488d04e109106ae0f544644",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "01b3692c1a97599e3d570ac4319b0ebe50555552f3d9958b2b4c5ac4fef2c8ed",
+                    "hash" : "0x01b3692c1a97599e3d570ac4319b0ebe50555552f3d9958b2b4c5ac4fef2c8ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "01b3692c1a97599e3d570ac4319b0ebe50555552f3d9958b2b4c5ac4fef2c8ed",
+                    "hash" : "0x01b3692c1a97599e3d570ac4319b0ebe50555552f3d9958b2b4c5ac4fef2c8ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f1f32496e98d94deef759c088703253a00f2adbed488d04e109106ae0f544644",
+                    "hash" : "0xf1f32496e98d94deef759c088703253a00f2adbed488d04e109106ae0f544644",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "01b3692c1a97599e3d570ac4319b0ebe50555552f3d9958b2b4c5ac4fef2c8ed",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe410a81437f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000006f59a130a10a189fc653057a185b886c5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "667679116"
+                "0x27cbf98c"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest520.json b/GeneralStateTests/stRandom/randomStatetest520.json
index eb32bbf1e..0a93696f3 100644
--- a/GeneralStateTests/stRandom/randomStatetest520.json
+++ b/GeneralStateTests/stRandom/randomStatetest520.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest520" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "794d825de7d715e2ec9be8ed324ba4b02e7971cf509325a90568a8e9f92629fa",
+                    "hash" : "0x794d825de7d715e2ec9be8ed324ba4b02e7971cf509325a90568a8e9f92629fa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "794d825de7d715e2ec9be8ed324ba4b02e7971cf509325a90568a8e9f92629fa",
+                    "hash" : "0x794d825de7d715e2ec9be8ed324ba4b02e7971cf509325a90568a8e9f92629fa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "794d825de7d715e2ec9be8ed324ba4b02e7971cf509325a90568a8e9f92629fa",
+                    "hash" : "0x794d825de7d715e2ec9be8ed324ba4b02e7971cf509325a90568a8e9f92629fa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "794d825de7d715e2ec9be8ed324ba4b02e7971cf509325a90568a8e9f92629fa",
+                    "hash" : "0x794d825de7d715e2ec9be8ed324ba4b02e7971cf509325a90568a8e9f92629fa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "794d825de7d715e2ec9be8ed324ba4b02e7971cf509325a90568a8e9f92629fa",
+                    "hash" : "0x794d825de7d715e2ec9be8ed324ba4b02e7971cf509325a90568a8e9f92629fa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "794d825de7d715e2ec9be8ed324ba4b02e7971cf509325a90568a8e9f92629fa",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff19030860005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "333039523"
+                "0x13d9c7a3"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest521.json b/GeneralStateTests/stRandom/randomStatetest521.json
index 631157197..624c513e7 100644
--- a/GeneralStateTests/stRandom/randomStatetest521.json
+++ b/GeneralStateTests/stRandom/randomStatetest521.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest521" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "de8f0646239826016ac16c15b27ba6d23c236b503206bbad2325cfe3514b6d3f",
+                    "hash" : "0xde8f0646239826016ac16c15b27ba6d23c236b503206bbad2325cfe3514b6d3f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "de8f0646239826016ac16c15b27ba6d23c236b503206bbad2325cfe3514b6d3f",
+                    "hash" : "0xde8f0646239826016ac16c15b27ba6d23c236b503206bbad2325cfe3514b6d3f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "de8f0646239826016ac16c15b27ba6d23c236b503206bbad2325cfe3514b6d3f",
+                    "hash" : "0xde8f0646239826016ac16c15b27ba6d23c236b503206bbad2325cfe3514b6d3f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "de8f0646239826016ac16c15b27ba6d23c236b503206bbad2325cfe3514b6d3f",
+                    "hash" : "0xde8f0646239826016ac16c15b27ba6d23c236b503206bbad2325cfe3514b6d3f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "de8f0646239826016ac16c15b27ba6d23c236b503206bbad2325cfe3514b6d3f",
+                    "hash" : "0xde8f0646239826016ac16c15b27ba6d23c236b503206bbad2325cfe3514b6d3f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "de8f0646239826016ac16c15b27ba6d23c236b503206bbad2325cfe3514b6d3f",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6a73905597946a57769a6d9209335560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "2095633379"
+                "0x7ce8d3e3"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest522.json b/GeneralStateTests/stRandom/randomStatetest522.json
index 457bdf270..ef853c96e 100644
--- a/GeneralStateTests/stRandom/randomStatetest522.json
+++ b/GeneralStateTests/stRandom/randomStatetest522.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest522" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a1122b7867f6e5ec0872ee3a6a50d1745a85b0a029db85c3c45ab4215195f0de",
+                    "hash" : "0xa1122b7867f6e5ec0872ee3a6a50d1745a85b0a029db85c3c45ab4215195f0de",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a1122b7867f6e5ec0872ee3a6a50d1745a85b0a029db85c3c45ab4215195f0de",
+                    "hash" : "0xa1122b7867f6e5ec0872ee3a6a50d1745a85b0a029db85c3c45ab4215195f0de",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "71a87aad1a3e9876a76602dae704f893a347fd2463486348229ea6de3628ad14",
+                    "hash" : "0x71a87aad1a3e9876a76602dae704f893a347fd2463486348229ea6de3628ad14",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "71a87aad1a3e9876a76602dae704f893a347fd2463486348229ea6de3628ad14",
+                    "hash" : "0x71a87aad1a3e9876a76602dae704f893a347fd2463486348229ea6de3628ad14",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a1122b7867f6e5ec0872ee3a6a50d1745a85b0a029db85c3c45ab4215195f0de",
+                    "hash" : "0xa1122b7867f6e5ec0872ee3a6a50d1745a85b0a029db85c3c45ab4215195f0de",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "71a87aad1a3e9876a76602dae704f893a347fd2463486348229ea6de3628ad14",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x43444042454340443b8155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest523.json b/GeneralStateTests/stRandom/randomStatetest523.json
index aa0557470..d68b50a9d 100644
--- a/GeneralStateTests/stRandom/randomStatetest523.json
+++ b/GeneralStateTests/stRandom/randomStatetest523.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest523" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f49c16027e28753abd81f7d12958fa86ec206e3473dfef64c410177d9051ba9f",
+                    "hash" : "0xf49c16027e28753abd81f7d12958fa86ec206e3473dfef64c410177d9051ba9f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f49c16027e28753abd81f7d12958fa86ec206e3473dfef64c410177d9051ba9f",
+                    "hash" : "0xf49c16027e28753abd81f7d12958fa86ec206e3473dfef64c410177d9051ba9f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f49c16027e28753abd81f7d12958fa86ec206e3473dfef64c410177d9051ba9f",
+                    "hash" : "0xf49c16027e28753abd81f7d12958fa86ec206e3473dfef64c410177d9051ba9f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f49c16027e28753abd81f7d12958fa86ec206e3473dfef64c410177d9051ba9f",
+                    "hash" : "0xf49c16027e28753abd81f7d12958fa86ec206e3473dfef64c410177d9051ba9f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f49c16027e28753abd81f7d12958fa86ec206e3473dfef64c410177d9051ba9f",
+                    "hash" : "0xf49c16027e28753abd81f7d12958fa86ec206e3473dfef64c410177d9051ba9f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "f49c16027e28753abd81f7d12958fa86ec206e3473dfef64c410177d9051ba9f",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x417f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe4450427f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000003560080b348d5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1463926659"
+                "0x5741bf83"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest524.json b/GeneralStateTests/stRandom/randomStatetest524.json
index 45aaa61dc..c3a4c8ac0 100644
--- a/GeneralStateTests/stRandom/randomStatetest524.json
+++ b/GeneralStateTests/stRandom/randomStatetest524.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest524" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "cd011ca3a24ae9664db18ee1273cf494ad2047f020e4285ced363653fe1f02ed",
+                    "hash" : "0xcd011ca3a24ae9664db18ee1273cf494ad2047f020e4285ced363653fe1f02ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "cd011ca3a24ae9664db18ee1273cf494ad2047f020e4285ced363653fe1f02ed",
+                    "hash" : "0xcd011ca3a24ae9664db18ee1273cf494ad2047f020e4285ced363653fe1f02ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "cd011ca3a24ae9664db18ee1273cf494ad2047f020e4285ced363653fe1f02ed",
+                    "hash" : "0xcd011ca3a24ae9664db18ee1273cf494ad2047f020e4285ced363653fe1f02ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "cd011ca3a24ae9664db18ee1273cf494ad2047f020e4285ced363653fe1f02ed",
+                    "hash" : "0xcd011ca3a24ae9664db18ee1273cf494ad2047f020e4285ced363653fe1f02ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "cd011ca3a24ae9664db18ee1273cf494ad2047f020e4285ced363653fe1f02ed",
+                    "hash" : "0xcd011ca3a24ae9664db18ee1273cf494ad2047f020e4285ced363653fe1f02ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "cd011ca3a24ae9664db18ee1273cf494ad2047f020e4285ced363653fe1f02ed",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff357f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000034208a340a9e5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1968091255"
+                "0x754eb077"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest525.json b/GeneralStateTests/stRandom/randomStatetest525.json
index 5d8d91172..dc043a548 100644
--- a/GeneralStateTests/stRandom/randomStatetest525.json
+++ b/GeneralStateTests/stRandom/randomStatetest525.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest525" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f0bd0d32959c5f9f46c5fc153d3c72cff1e8c3c4c817178039528fac216b834e",
+                    "hash" : "0xf0bd0d32959c5f9f46c5fc153d3c72cff1e8c3c4c817178039528fac216b834e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f0bd0d32959c5f9f46c5fc153d3c72cff1e8c3c4c817178039528fac216b834e",
+                    "hash" : "0xf0bd0d32959c5f9f46c5fc153d3c72cff1e8c3c4c817178039528fac216b834e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f0bd0d32959c5f9f46c5fc153d3c72cff1e8c3c4c817178039528fac216b834e",
+                    "hash" : "0xf0bd0d32959c5f9f46c5fc153d3c72cff1e8c3c4c817178039528fac216b834e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f0bd0d32959c5f9f46c5fc153d3c72cff1e8c3c4c817178039528fac216b834e",
+                    "hash" : "0xf0bd0d32959c5f9f46c5fc153d3c72cff1e8c3c4c817178039528fac216b834e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f0bd0d32959c5f9f46c5fc153d3c72cff1e8c3c4c817178039528fac216b834e",
+                    "hash" : "0xf0bd0d32959c5f9f46c5fc153d3c72cff1e8c3c4c817178039528fac216b834e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "f0bd0d32959c5f9f46c5fc153d3c72cff1e8c3c4c817178039528fac216b834e",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff097ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe02207160005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "177899732"
+                "0x0a9a88d4"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest526.json b/GeneralStateTests/stRandom/randomStatetest526.json
index 5a81d87f3..bbb28ba08 100644
--- a/GeneralStateTests/stRandom/randomStatetest526.json
+++ b/GeneralStateTests/stRandom/randomStatetest526.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest526" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "8f399c1f578afcf3bc564e7c71194fcfe5a3668584658909ef97041b80db23c3",
+                    "hash" : "0x8f399c1f578afcf3bc564e7c71194fcfe5a3668584658909ef97041b80db23c3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "8f399c1f578afcf3bc564e7c71194fcfe5a3668584658909ef97041b80db23c3",
+                    "hash" : "0x8f399c1f578afcf3bc564e7c71194fcfe5a3668584658909ef97041b80db23c3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "8f399c1f578afcf3bc564e7c71194fcfe5a3668584658909ef97041b80db23c3",
+                    "hash" : "0x8f399c1f578afcf3bc564e7c71194fcfe5a3668584658909ef97041b80db23c3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "8f399c1f578afcf3bc564e7c71194fcfe5a3668584658909ef97041b80db23c3",
+                    "hash" : "0x8f399c1f578afcf3bc564e7c71194fcfe5a3668584658909ef97041b80db23c3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "8f399c1f578afcf3bc564e7c71194fcfe5a3668584658909ef97041b80db23c3",
+                    "hash" : "0x8f399c1f578afcf3bc564e7c71194fcfe5a3668584658909ef97041b80db23c3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "8f399c1f578afcf3bc564e7c71194fcfe5a3668584658909ef97041b80db23c3",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5417e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5419e01950777810975058c746f5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "984138850"
+                "0x3aa8c462"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest527.json b/GeneralStateTests/stRandom/randomStatetest527.json
index 8bc8d1f2a..f9f4db179 100644
--- a/GeneralStateTests/stRandom/randomStatetest527.json
+++ b/GeneralStateTests/stRandom/randomStatetest527.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest527" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "50e33a02616d3b0f18c73efa68528c6611152a537a23947e3b3ab013fc7bc945",
+                    "hash" : "0x50e33a02616d3b0f18c73efa68528c6611152a537a23947e3b3ab013fc7bc945",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "50e33a02616d3b0f18c73efa68528c6611152a537a23947e3b3ab013fc7bc945",
+                    "hash" : "0x50e33a02616d3b0f18c73efa68528c6611152a537a23947e3b3ab013fc7bc945",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "50e33a02616d3b0f18c73efa68528c6611152a537a23947e3b3ab013fc7bc945",
+                    "hash" : "0x50e33a02616d3b0f18c73efa68528c6611152a537a23947e3b3ab013fc7bc945",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "50e33a02616d3b0f18c73efa68528c6611152a537a23947e3b3ab013fc7bc945",
+                    "hash" : "0x50e33a02616d3b0f18c73efa68528c6611152a537a23947e3b3ab013fc7bc945",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "50e33a02616d3b0f18c73efa68528c6611152a537a23947e3b3ab013fc7bc945",
+                    "hash" : "0x50e33a02616d3b0f18c73efa68528c6611152a537a23947e3b3ab013fc7bc945",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "50e33a02616d3b0f18c73efa68528c6611152a537a23947e3b3ab013fc7bc945",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x347f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff447f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff80a160005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "179309326"
+                "0x0ab00b0e"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest528.json b/GeneralStateTests/stRandom/randomStatetest528.json
index 8db26a723..456ddcfed 100644
--- a/GeneralStateTests/stRandom/randomStatetest528.json
+++ b/GeneralStateTests/stRandom/randomStatetest528.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest528" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d1b4c4dbe542c00c23f35c9610b0d0e1e826e9e82dbad3b22ac582b128bd9bba",
+                    "hash" : "0xd1b4c4dbe542c00c23f35c9610b0d0e1e826e9e82dbad3b22ac582b128bd9bba",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d1b4c4dbe542c00c23f35c9610b0d0e1e826e9e82dbad3b22ac582b128bd9bba",
+                    "hash" : "0xd1b4c4dbe542c00c23f35c9610b0d0e1e826e9e82dbad3b22ac582b128bd9bba",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "d1b4c4dbe542c00c23f35c9610b0d0e1e826e9e82dbad3b22ac582b128bd9bba",
+                    "hash" : "0xd1b4c4dbe542c00c23f35c9610b0d0e1e826e9e82dbad3b22ac582b128bd9bba",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "d1b4c4dbe542c00c23f35c9610b0d0e1e826e9e82dbad3b22ac582b128bd9bba",
+                    "hash" : "0xd1b4c4dbe542c00c23f35c9610b0d0e1e826e9e82dbad3b22ac582b128bd9bba",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d1b4c4dbe542c00c23f35c9610b0d0e1e826e9e82dbad3b22ac582b128bd9bba",
+                    "hash" : "0xd1b4c4dbe542c00c23f35c9610b0d0e1e826e9e82dbad3b22ac582b128bd9bba",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "d1b4c4dbe542c00c23f35c9610b0d0e1e826e9e82dbad3b22ac582b128bd9bba",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x457f000000000000000000000000000000000000000000000000000000000000c350397ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0a9d30390b8c858455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "532918830"
+                "0x1fc3b22e"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest529.json b/GeneralStateTests/stRandom/randomStatetest529.json
index 515d602ee..a620ed34e 100644
--- a/GeneralStateTests/stRandom/randomStatetest529.json
+++ b/GeneralStateTests/stRandom/randomStatetest529.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest529" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
             {
@@ -22,7 +22,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d3dd7cc970e7c686cb26ee75c8b996044f317287202851d17d730090204a65d7",
+                    "hash" : "0xd3dd7cc970e7c686cb26ee75c8b996044f317287202851d17d730090204a65d7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -32,7 +32,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d3dd7cc970e7c686cb26ee75c8b996044f317287202851d17d730090204a65d7",
+                    "hash" : "0xd3dd7cc970e7c686cb26ee75c8b996044f317287202851d17d730090204a65d7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -42,7 +42,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "d3dd7cc970e7c686cb26ee75c8b996044f317287202851d17d730090204a65d7",
+                    "hash" : "0xd3dd7cc970e7c686cb26ee75c8b996044f317287202851d17d730090204a65d7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -52,7 +52,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "d3dd7cc970e7c686cb26ee75c8b996044f317287202851d17d730090204a65d7",
+                    "hash" : "0xd3dd7cc970e7c686cb26ee75c8b996044f317287202851d17d730090204a65d7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,7 +62,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d3dd7cc970e7c686cb26ee75c8b996044f317287202851d17d730090204a65d7",
+                    "hash" : "0xd3dd7cc970e7c686cb26ee75c8b996044f317287202851d17d730090204a65d7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -73,23 +73,23 @@
         },
         "postStateRoot" : "0678e558c0243528024322e646e30991027a594204d1d89d35049cf93b4a74b7",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x4445434244444044a158205855",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -100,14 +100,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest53.json b/GeneralStateTests/stRandom/randomStatetest53.json
index f36b3f4d7..be88bdd5c 100644
--- a/GeneralStateTests/stRandom/randomStatetest53.json
+++ b/GeneralStateTests/stRandom/randomStatetest53.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest53" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "23bb4bd52c3e5cc3fee02d368f964f87b150387d4ef54939fa02bb001dd359d1",
+                    "hash" : "0x23bb4bd52c3e5cc3fee02d368f964f87b150387d4ef54939fa02bb001dd359d1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "23bb4bd52c3e5cc3fee02d368f964f87b150387d4ef54939fa02bb001dd359d1",
+                    "hash" : "0x23bb4bd52c3e5cc3fee02d368f964f87b150387d4ef54939fa02bb001dd359d1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "23bb4bd52c3e5cc3fee02d368f964f87b150387d4ef54939fa02bb001dd359d1",
+                    "hash" : "0x23bb4bd52c3e5cc3fee02d368f964f87b150387d4ef54939fa02bb001dd359d1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "23bb4bd52c3e5cc3fee02d368f964f87b150387d4ef54939fa02bb001dd359d1",
+                    "hash" : "0x23bb4bd52c3e5cc3fee02d368f964f87b150387d4ef54939fa02bb001dd359d1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "23bb4bd52c3e5cc3fee02d368f964f87b150387d4ef54939fa02bb001dd359d1",
+                    "hash" : "0x23bb4bd52c3e5cc3fee02d368f964f87b150387d4ef54939fa02bb001dd359d1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "23bb4bd52c3e5cc3fee02d368f964f87b150387d4ef54939fa02bb001dd359d1",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x427f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff583481f36a85646d53671639175b940860005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1485632"
+                "0x16ab40"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest530.json b/GeneralStateTests/stRandom/randomStatetest530.json
index ad19a5443..511f7d82d 100644
--- a/GeneralStateTests/stRandom/randomStatetest530.json
+++ b/GeneralStateTests/stRandom/randomStatetest530.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest530" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "5fed63aae4c790f2e447709a347c0c32315a30f51bd160d9265cdac06f434273",
+                    "hash" : "0x5fed63aae4c790f2e447709a347c0c32315a30f51bd160d9265cdac06f434273",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "5fed63aae4c790f2e447709a347c0c32315a30f51bd160d9265cdac06f434273",
+                    "hash" : "0x5fed63aae4c790f2e447709a347c0c32315a30f51bd160d9265cdac06f434273",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5fed63aae4c790f2e447709a347c0c32315a30f51bd160d9265cdac06f434273",
+                    "hash" : "0x5fed63aae4c790f2e447709a347c0c32315a30f51bd160d9265cdac06f434273",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5fed63aae4c790f2e447709a347c0c32315a30f51bd160d9265cdac06f434273",
+                    "hash" : "0x5fed63aae4c790f2e447709a347c0c32315a30f51bd160d9265cdac06f434273",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "5fed63aae4c790f2e447709a347c0c32315a30f51bd160d9265cdac06f434273",
+                    "hash" : "0x5fed63aae4c790f2e447709a347c0c32315a30f51bd160d9265cdac06f434273",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "5fed63aae4c790f2e447709a347c0c32315a30f51bd160d9265cdac06f434273",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5127fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000406fa36f44a1623c178c05749f036a50575560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1887817956"
+                "0x7085d0e4"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest531.json b/GeneralStateTests/stRandom/randomStatetest531.json
index 49854ce1e..2cc5ee88f 100644
--- a/GeneralStateTests/stRandom/randomStatetest531.json
+++ b/GeneralStateTests/stRandom/randomStatetest531.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest531" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "cbb19c5b0411315db21caddc52d03b78779489209a58a6ce48af07e762bce246",
+                    "hash" : "0xcbb19c5b0411315db21caddc52d03b78779489209a58a6ce48af07e762bce246",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "cbb19c5b0411315db21caddc52d03b78779489209a58a6ce48af07e762bce246",
+                    "hash" : "0xcbb19c5b0411315db21caddc52d03b78779489209a58a6ce48af07e762bce246",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "cbb19c5b0411315db21caddc52d03b78779489209a58a6ce48af07e762bce246",
+                    "hash" : "0xcbb19c5b0411315db21caddc52d03b78779489209a58a6ce48af07e762bce246",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "cbb19c5b0411315db21caddc52d03b78779489209a58a6ce48af07e762bce246",
+                    "hash" : "0xcbb19c5b0411315db21caddc52d03b78779489209a58a6ce48af07e762bce246",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "cbb19c5b0411315db21caddc52d03b78779489209a58a6ce48af07e762bce246",
+                    "hash" : "0xcbb19c5b0411315db21caddc52d03b78779489209a58a6ce48af07e762bce246",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "cbb19c5b0411315db21caddc52d03b78779489209a58a6ce48af07e762bce246",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x41414143434344456a12c140f3933655",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest532.json b/GeneralStateTests/stRandom/randomStatetest532.json
index df3163824..79720efa0 100644
--- a/GeneralStateTests/stRandom/randomStatetest532.json
+++ b/GeneralStateTests/stRandom/randomStatetest532.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest532" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b60e6463331ea8c26f6146c4f6b7a1e4af696f9ecdeae12757f2d5469362fab2",
+                    "hash" : "0xb60e6463331ea8c26f6146c4f6b7a1e4af696f9ecdeae12757f2d5469362fab2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b60e6463331ea8c26f6146c4f6b7a1e4af696f9ecdeae12757f2d5469362fab2",
+                    "hash" : "0xb60e6463331ea8c26f6146c4f6b7a1e4af696f9ecdeae12757f2d5469362fab2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "d0b51e522347b9c14152ea84403d4e2d4a2ef4f0318283d00965856c311e6429",
+                    "hash" : "0xd0b51e522347b9c14152ea84403d4e2d4a2ef4f0318283d00965856c311e6429",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "d0b51e522347b9c14152ea84403d4e2d4a2ef4f0318283d00965856c311e6429",
+                    "hash" : "0xd0b51e522347b9c14152ea84403d4e2d4a2ef4f0318283d00965856c311e6429",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b60e6463331ea8c26f6146c4f6b7a1e4af696f9ecdeae12757f2d5469362fab2",
+                    "hash" : "0xb60e6463331ea8c26f6146c4f6b7a1e4af696f9ecdeae12757f2d5469362fab2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "d0b51e522347b9c14152ea84403d4e2d4a2ef4f0318283d00965856c311e6429",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe54447f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f78297ba08ba478507f413b3597109c5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1139122760"
+                "0x43e5a248"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest533.json b/GeneralStateTests/stRandom/randomStatetest533.json
index 0e00581b0..73951a1b1 100644
--- a/GeneralStateTests/stRandom/randomStatetest533.json
+++ b/GeneralStateTests/stRandom/randomStatetest533.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest533" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d522c2441010ceff4a7042baa0b1578fdb453046c0e2c523cc4c24fafaf906a6",
+                    "hash" : "0xd522c2441010ceff4a7042baa0b1578fdb453046c0e2c523cc4c24fafaf906a6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d522c2441010ceff4a7042baa0b1578fdb453046c0e2c523cc4c24fafaf906a6",
+                    "hash" : "0xd522c2441010ceff4a7042baa0b1578fdb453046c0e2c523cc4c24fafaf906a6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "d522c2441010ceff4a7042baa0b1578fdb453046c0e2c523cc4c24fafaf906a6",
+                    "hash" : "0xd522c2441010ceff4a7042baa0b1578fdb453046c0e2c523cc4c24fafaf906a6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "d522c2441010ceff4a7042baa0b1578fdb453046c0e2c523cc4c24fafaf906a6",
+                    "hash" : "0xd522c2441010ceff4a7042baa0b1578fdb453046c0e2c523cc4c24fafaf906a6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d522c2441010ceff4a7042baa0b1578fdb453046c0e2c523cc4c24fafaf906a6",
+                    "hash" : "0xd522c2441010ceff4a7042baa0b1578fdb453046c0e2c523cc4c24fafaf906a6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "d522c2441010ceff4a7042baa0b1578fdb453046c0e2c523cc4c24fafaf906a6",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001847f00000000000000000000000100000000000000000000000000000000000000003a0761525560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,8 +96,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x70d690f4"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest534.json b/GeneralStateTests/stRandom/randomStatetest534.json
index c70c8dbcf..8c4f1046e 100644
--- a/GeneralStateTests/stRandom/randomStatetest534.json
+++ b/GeneralStateTests/stRandom/randomStatetest534.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest534" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1574eff7e6ced4d527e646ef4e568a5d0414751286ef2fd92d956bb53424c4e5",
+                    "hash" : "0x1574eff7e6ced4d527e646ef4e568a5d0414751286ef2fd92d956bb53424c4e5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "1574eff7e6ced4d527e646ef4e568a5d0414751286ef2fd92d956bb53424c4e5",
+                    "hash" : "0x1574eff7e6ced4d527e646ef4e568a5d0414751286ef2fd92d956bb53424c4e5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "1574eff7e6ced4d527e646ef4e568a5d0414751286ef2fd92d956bb53424c4e5",
+                    "hash" : "0x1574eff7e6ced4d527e646ef4e568a5d0414751286ef2fd92d956bb53424c4e5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "1574eff7e6ced4d527e646ef4e568a5d0414751286ef2fd92d956bb53424c4e5",
+                    "hash" : "0x1574eff7e6ced4d527e646ef4e568a5d0414751286ef2fd92d956bb53424c4e5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "1574eff7e6ced4d527e646ef4e568a5d0414751286ef2fd92d956bb53424c4e5",
+                    "hash" : "0x1574eff7e6ced4d527e646ef4e568a5d0414751286ef2fd92d956bb53424c4e5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "1574eff7e6ced4d527e646ef4e568a5d0414751286ef2fd92d956bb53424c4e5",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000001000000000000000000000000000000000000000045437f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff457f0000000000000000000000000000000000000000000000000000000000000000436ff3075243846d88747b6a9e7ff28c615560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1440446145"
+                "0x55db76c1"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest535.json b/GeneralStateTests/stRandom/randomStatetest535.json
index 07ae20888..20209da17 100644
--- a/GeneralStateTests/stRandom/randomStatetest535.json
+++ b/GeneralStateTests/stRandom/randomStatetest535.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest535" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b098726ac5c2f7001c66db547c70b9ba7a42db05d839fb969f114818d9db1544",
+                    "hash" : "0xb098726ac5c2f7001c66db547c70b9ba7a42db05d839fb969f114818d9db1544",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b098726ac5c2f7001c66db547c70b9ba7a42db05d839fb969f114818d9db1544",
+                    "hash" : "0xb098726ac5c2f7001c66db547c70b9ba7a42db05d839fb969f114818d9db1544",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b098726ac5c2f7001c66db547c70b9ba7a42db05d839fb969f114818d9db1544",
+                    "hash" : "0xb098726ac5c2f7001c66db547c70b9ba7a42db05d839fb969f114818d9db1544",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b098726ac5c2f7001c66db547c70b9ba7a42db05d839fb969f114818d9db1544",
+                    "hash" : "0xb098726ac5c2f7001c66db547c70b9ba7a42db05d839fb969f114818d9db1544",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b098726ac5c2f7001c66db547c70b9ba7a42db05d839fb969f114818d9db1544",
+                    "hash" : "0xb098726ac5c2f7001c66db547c70b9ba7a42db05d839fb969f114818d9db1544",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "b098726ac5c2f7001c66db547c70b9ba7a42db05d839fb969f114818d9db1544",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,8 +96,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x4cd4dc30"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest536.json b/GeneralStateTests/stRandom/randomStatetest536.json
index cc0909958..148375a49 100644
--- a/GeneralStateTests/stRandom/randomStatetest536.json
+++ b/GeneralStateTests/stRandom/randomStatetest536.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest536" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d48e2cd18cfbab19f208076885dbf9161398e91c1d8eb4c3b8ff97965d51be22",
+                    "hash" : "0xd48e2cd18cfbab19f208076885dbf9161398e91c1d8eb4c3b8ff97965d51be22",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d48e2cd18cfbab19f208076885dbf9161398e91c1d8eb4c3b8ff97965d51be22",
+                    "hash" : "0xd48e2cd18cfbab19f208076885dbf9161398e91c1d8eb4c3b8ff97965d51be22",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "d48e2cd18cfbab19f208076885dbf9161398e91c1d8eb4c3b8ff97965d51be22",
+                    "hash" : "0xd48e2cd18cfbab19f208076885dbf9161398e91c1d8eb4c3b8ff97965d51be22",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "d48e2cd18cfbab19f208076885dbf9161398e91c1d8eb4c3b8ff97965d51be22",
+                    "hash" : "0xd48e2cd18cfbab19f208076885dbf9161398e91c1d8eb4c3b8ff97965d51be22",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d48e2cd18cfbab19f208076885dbf9161398e91c1d8eb4c3b8ff97965d51be22",
+                    "hash" : "0xd48e2cd18cfbab19f208076885dbf9161398e91c1d8eb4c3b8ff97965d51be22",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "d48e2cd18cfbab19f208076885dbf9161398e91c1d8eb4c3b8ff97965d51be22",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350537f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9309f3999c7d92795a947a6f317f55",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1392179737"
+                "0x52fafa19"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest537.json b/GeneralStateTests/stRandom/randomStatetest537.json
index 9e7529e26..5eada7a59 100644
--- a/GeneralStateTests/stRandom/randomStatetest537.json
+++ b/GeneralStateTests/stRandom/randomStatetest537.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest537" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f5f1d160a4dbfe330a774f839fabe850ee58a0d4de98f4a9cf70bfddbe33317f",
+                    "hash" : "0xf5f1d160a4dbfe330a774f839fabe850ee58a0d4de98f4a9cf70bfddbe33317f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f5f1d160a4dbfe330a774f839fabe850ee58a0d4de98f4a9cf70bfddbe33317f",
+                    "hash" : "0xf5f1d160a4dbfe330a774f839fabe850ee58a0d4de98f4a9cf70bfddbe33317f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f5f1d160a4dbfe330a774f839fabe850ee58a0d4de98f4a9cf70bfddbe33317f",
+                    "hash" : "0xf5f1d160a4dbfe330a774f839fabe850ee58a0d4de98f4a9cf70bfddbe33317f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f5f1d160a4dbfe330a774f839fabe850ee58a0d4de98f4a9cf70bfddbe33317f",
+                    "hash" : "0xf5f1d160a4dbfe330a774f839fabe850ee58a0d4de98f4a9cf70bfddbe33317f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f5f1d160a4dbfe330a774f839fabe850ee58a0d4de98f4a9cf70bfddbe33317f",
+                    "hash" : "0xf5f1d160a4dbfe330a774f839fabe850ee58a0d4de98f4a9cf70bfddbe33317f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "f5f1d160a4dbfe330a774f839fabe850ee58a0d4de98f4a9cf70bfddbe33317f",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5688068515a6a996a540a03686d6d60005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1910780625"
+                "0x71e432d1"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest538.json b/GeneralStateTests/stRandom/randomStatetest538.json
index 620c89d6b..8cb6542bb 100644
--- a/GeneralStateTests/stRandom/randomStatetest538.json
+++ b/GeneralStateTests/stRandom/randomStatetest538.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest538" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "adebc5b15e70b5b8ad3eb5d2d0bc7880149d6f86d96cbc861494f810c3d325c1",
+                    "hash" : "0xadebc5b15e70b5b8ad3eb5d2d0bc7880149d6f86d96cbc861494f810c3d325c1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "adebc5b15e70b5b8ad3eb5d2d0bc7880149d6f86d96cbc861494f810c3d325c1",
+                    "hash" : "0xadebc5b15e70b5b8ad3eb5d2d0bc7880149d6f86d96cbc861494f810c3d325c1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "adebc5b15e70b5b8ad3eb5d2d0bc7880149d6f86d96cbc861494f810c3d325c1",
+                    "hash" : "0xadebc5b15e70b5b8ad3eb5d2d0bc7880149d6f86d96cbc861494f810c3d325c1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "adebc5b15e70b5b8ad3eb5d2d0bc7880149d6f86d96cbc861494f810c3d325c1",
+                    "hash" : "0xadebc5b15e70b5b8ad3eb5d2d0bc7880149d6f86d96cbc861494f810c3d325c1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "adebc5b15e70b5b8ad3eb5d2d0bc7880149d6f86d96cbc861494f810c3d325c1",
+                    "hash" : "0xadebc5b15e70b5b8ad3eb5d2d0bc7880149d6f86d96cbc861494f810c3d325c1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "adebc5b15e70b5b8ad3eb5d2d0bc7880149d6f86d96cbc861494f810c3d325c1",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000004340427f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff52835a546b6685923465",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1959890283"
+                "0x74d18d6b"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest539.json b/GeneralStateTests/stRandom/randomStatetest539.json
index 5b4c50e93..c7cb4e59b 100644
--- a/GeneralStateTests/stRandom/randomStatetest539.json
+++ b/GeneralStateTests/stRandom/randomStatetest539.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest539" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "5b769df394b81be945938b4b63a2806dad29b30558ba93537f81f0c1acd79d97",
+                    "hash" : "0x5b769df394b81be945938b4b63a2806dad29b30558ba93537f81f0c1acd79d97",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "5b769df394b81be945938b4b63a2806dad29b30558ba93537f81f0c1acd79d97",
+                    "hash" : "0x5b769df394b81be945938b4b63a2806dad29b30558ba93537f81f0c1acd79d97",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5b769df394b81be945938b4b63a2806dad29b30558ba93537f81f0c1acd79d97",
+                    "hash" : "0x5b769df394b81be945938b4b63a2806dad29b30558ba93537f81f0c1acd79d97",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5b769df394b81be945938b4b63a2806dad29b30558ba93537f81f0c1acd79d97",
+                    "hash" : "0x5b769df394b81be945938b4b63a2806dad29b30558ba93537f81f0c1acd79d97",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "5b769df394b81be945938b4b63a2806dad29b30558ba93537f81f0c1acd79d97",
+                    "hash" : "0x5b769df394b81be945938b4b63a2806dad29b30558ba93537f81f0c1acd79d97",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "5b769df394b81be945938b4b63a2806dad29b30558ba93537f81f0c1acd79d97",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff457f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff096794200bf18b0b316e415560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1428708105"
+                "0x55285b09"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest54.json b/GeneralStateTests/stRandom/randomStatetest54.json
index 8b57f215c..001e3d1e5 100644
--- a/GeneralStateTests/stRandom/randomStatetest54.json
+++ b/GeneralStateTests/stRandom/randomStatetest54.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest54" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "cbcd9800020c801c45de04da2bd7697b9fd44d571860a7555ebc61ba44ae11af",
+                    "hash" : "0xcbcd9800020c801c45de04da2bd7697b9fd44d571860a7555ebc61ba44ae11af",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "cbcd9800020c801c45de04da2bd7697b9fd44d571860a7555ebc61ba44ae11af",
+                    "hash" : "0xcbcd9800020c801c45de04da2bd7697b9fd44d571860a7555ebc61ba44ae11af",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "cbcd9800020c801c45de04da2bd7697b9fd44d571860a7555ebc61ba44ae11af",
+                    "hash" : "0xcbcd9800020c801c45de04da2bd7697b9fd44d571860a7555ebc61ba44ae11af",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "cbcd9800020c801c45de04da2bd7697b9fd44d571860a7555ebc61ba44ae11af",
+                    "hash" : "0xcbcd9800020c801c45de04da2bd7697b9fd44d571860a7555ebc61ba44ae11af",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "cbcd9800020c801c45de04da2bd7697b9fd44d571860a7555ebc61ba44ae11af",
+                    "hash" : "0xcbcd9800020c801c45de04da2bd7697b9fd44d571860a7555ebc61ba44ae11af",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "cbcd9800020c801c45de04da2bd7697b9fd44d571860a7555ebc61ba44ae11af",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000000000000000000000000001c9206e3b8f9d858f438a",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1174580620"
+                "0x4602ad8c"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest540.json b/GeneralStateTests/stRandom/randomStatetest540.json
index b2cdbefe2..17b9c1f29 100644
--- a/GeneralStateTests/stRandom/randomStatetest540.json
+++ b/GeneralStateTests/stRandom/randomStatetest540.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest540" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e53f7250db24b2d8d51079f1e73a62383c7eff8fcb4569460663a0bd9959df9b",
+                    "hash" : "0xe53f7250db24b2d8d51079f1e73a62383c7eff8fcb4569460663a0bd9959df9b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e53f7250db24b2d8d51079f1e73a62383c7eff8fcb4569460663a0bd9959df9b",
+                    "hash" : "0xe53f7250db24b2d8d51079f1e73a62383c7eff8fcb4569460663a0bd9959df9b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "14c936796ad296ffb8b9611722533facf565ff9df5ad816ef48931bd99b358cf",
+                    "hash" : "0x14c936796ad296ffb8b9611722533facf565ff9df5ad816ef48931bd99b358cf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "14c936796ad296ffb8b9611722533facf565ff9df5ad816ef48931bd99b358cf",
+                    "hash" : "0x14c936796ad296ffb8b9611722533facf565ff9df5ad816ef48931bd99b358cf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e53f7250db24b2d8d51079f1e73a62383c7eff8fcb4569460663a0bd9959df9b",
+                    "hash" : "0xe53f7250db24b2d8d51079f1e73a62383c7eff8fcb4569460663a0bd9959df9b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "2831da52e99ecb98f98d52a4fb635681b6e3c37f6cc1ea2c63531c8b5ef31fcb",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x414144401a0745423b55",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest541.json b/GeneralStateTests/stRandom/randomStatetest541.json
index cbc002c3e..bdffd2ee1 100644
--- a/GeneralStateTests/stRandom/randomStatetest541.json
+++ b/GeneralStateTests/stRandom/randomStatetest541.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest541" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "941269097ac5280c635054b3872a3f735c56a718043d887c8a339842dfb928e2",
+                    "hash" : "0x941269097ac5280c635054b3872a3f735c56a718043d887c8a339842dfb928e2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "941269097ac5280c635054b3872a3f735c56a718043d887c8a339842dfb928e2",
+                    "hash" : "0x941269097ac5280c635054b3872a3f735c56a718043d887c8a339842dfb928e2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "941269097ac5280c635054b3872a3f735c56a718043d887c8a339842dfb928e2",
+                    "hash" : "0x941269097ac5280c635054b3872a3f735c56a718043d887c8a339842dfb928e2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "941269097ac5280c635054b3872a3f735c56a718043d887c8a339842dfb928e2",
+                    "hash" : "0x941269097ac5280c635054b3872a3f735c56a718043d887c8a339842dfb928e2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "941269097ac5280c635054b3872a3f735c56a718043d887c8a339842dfb928e2",
+                    "hash" : "0x941269097ac5280c635054b3872a3f735c56a718043d887c8a339842dfb928e2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "941269097ac5280c635054b3872a3f735c56a718043d887c8a339842dfb928e2",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff457f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000004335696e089257368d07897d57350b105560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "525505301"
+                "0x1f529315"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest542.json b/GeneralStateTests/stRandom/randomStatetest542.json
index 201441604..005b86797 100644
--- a/GeneralStateTests/stRandom/randomStatetest542.json
+++ b/GeneralStateTests/stRandom/randomStatetest542.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest542" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "26f9ef7553b68e53d55a79839655fd6c35690c38926ac2f26ed1c72eae52d63f",
+                    "hash" : "0x26f9ef7553b68e53d55a79839655fd6c35690c38926ac2f26ed1c72eae52d63f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "26f9ef7553b68e53d55a79839655fd6c35690c38926ac2f26ed1c72eae52d63f",
+                    "hash" : "0x26f9ef7553b68e53d55a79839655fd6c35690c38926ac2f26ed1c72eae52d63f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "26f9ef7553b68e53d55a79839655fd6c35690c38926ac2f26ed1c72eae52d63f",
+                    "hash" : "0x26f9ef7553b68e53d55a79839655fd6c35690c38926ac2f26ed1c72eae52d63f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "26f9ef7553b68e53d55a79839655fd6c35690c38926ac2f26ed1c72eae52d63f",
+                    "hash" : "0x26f9ef7553b68e53d55a79839655fd6c35690c38926ac2f26ed1c72eae52d63f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "26f9ef7553b68e53d55a79839655fd6c35690c38926ac2f26ed1c72eae52d63f",
+                    "hash" : "0x26f9ef7553b68e53d55a79839655fd6c35690c38926ac2f26ed1c72eae52d63f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "77c725d792dce4219ca91d10a797446637a88f1761dbb8dd1daba161c4e8979e",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x427f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000397f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5925560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "2111491039"
+                "0x7ddacbdf"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest543.json b/GeneralStateTests/stRandom/randomStatetest543.json
index acf55efc5..e92ced611 100644
--- a/GeneralStateTests/stRandom/randomStatetest543.json
+++ b/GeneralStateTests/stRandom/randomStatetest543.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest543" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "009cdfe12bb06588c7382e66facc4058eb08d3cacaa89e128a7cf367b31d0682",
+                    "hash" : "0x009cdfe12bb06588c7382e66facc4058eb08d3cacaa89e128a7cf367b31d0682",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "009cdfe12bb06588c7382e66facc4058eb08d3cacaa89e128a7cf367b31d0682",
+                    "hash" : "0x009cdfe12bb06588c7382e66facc4058eb08d3cacaa89e128a7cf367b31d0682",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "009cdfe12bb06588c7382e66facc4058eb08d3cacaa89e128a7cf367b31d0682",
+                    "hash" : "0x009cdfe12bb06588c7382e66facc4058eb08d3cacaa89e128a7cf367b31d0682",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "009cdfe12bb06588c7382e66facc4058eb08d3cacaa89e128a7cf367b31d0682",
+                    "hash" : "0x009cdfe12bb06588c7382e66facc4058eb08d3cacaa89e128a7cf367b31d0682",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "009cdfe12bb06588c7382e66facc4058eb08d3cacaa89e128a7cf367b31d0682",
+                    "hash" : "0x009cdfe12bb06588c7382e66facc4058eb08d3cacaa89e128a7cf367b31d0682",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "009cdfe12bb06588c7382e66facc4058eb08d3cacaa89e128a7cf367b31d0682",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000004586",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,8 +96,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x025dcd0a"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest544.json b/GeneralStateTests/stRandom/randomStatetest544.json
index 61cd9ee12..147c8c7c7 100644
--- a/GeneralStateTests/stRandom/randomStatetest544.json
+++ b/GeneralStateTests/stRandom/randomStatetest544.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest544" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "4c82fbc09c054508c63d819f3a65964a080e971ecf80e311ec83d1f7b0f8d4dd",
+                    "hash" : "0x4c82fbc09c054508c63d819f3a65964a080e971ecf80e311ec83d1f7b0f8d4dd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "4c82fbc09c054508c63d819f3a65964a080e971ecf80e311ec83d1f7b0f8d4dd",
+                    "hash" : "0x4c82fbc09c054508c63d819f3a65964a080e971ecf80e311ec83d1f7b0f8d4dd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "59bc15059d9dc8600ccada761966b3313282a210ae4fa560934d6b327b42f026",
+                    "hash" : "0x59bc15059d9dc8600ccada761966b3313282a210ae4fa560934d6b327b42f026",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "59bc15059d9dc8600ccada761966b3313282a210ae4fa560934d6b327b42f026",
+                    "hash" : "0x59bc15059d9dc8600ccada761966b3313282a210ae4fa560934d6b327b42f026",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "4c82fbc09c054508c63d819f3a65964a080e971ecf80e311ec83d1f7b0f8d4dd",
+                    "hash" : "0x4c82fbc09c054508c63d819f3a65964a080e971ecf80e311ec83d1f7b0f8d4dd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "59bc15059d9dc8600ccada761966b3313282a210ae4fa560934d6b327b42f026",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3503b7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff097f000000000000000000000000000000000000000000000000000000000000000055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1348206974"
+                "0x505c017e"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest545.json b/GeneralStateTests/stRandom/randomStatetest545.json
index 8f2fec3f3..69b059e2a 100644
--- a/GeneralStateTests/stRandom/randomStatetest545.json
+++ b/GeneralStateTests/stRandom/randomStatetest545.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest545" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7c3fd223a72b38606bc451d71688c466575f034493c1ea41b7250196727d0f44",
+                    "hash" : "0x7c3fd223a72b38606bc451d71688c466575f034493c1ea41b7250196727d0f44",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7c3fd223a72b38606bc451d71688c466575f034493c1ea41b7250196727d0f44",
+                    "hash" : "0x7c3fd223a72b38606bc451d71688c466575f034493c1ea41b7250196727d0f44",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "7c3fd223a72b38606bc451d71688c466575f034493c1ea41b7250196727d0f44",
+                    "hash" : "0x7c3fd223a72b38606bc451d71688c466575f034493c1ea41b7250196727d0f44",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "7c3fd223a72b38606bc451d71688c466575f034493c1ea41b7250196727d0f44",
+                    "hash" : "0x7c3fd223a72b38606bc451d71688c466575f034493c1ea41b7250196727d0f44",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7c3fd223a72b38606bc451d71688c466575f034493c1ea41b7250196727d0f44",
+                    "hash" : "0x7c3fd223a72b38606bc451d71688c466575f034493c1ea41b7250196727d0f44",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "7c3fd223a72b38606bc451d71688c466575f034493c1ea41b7250196727d0f44",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350637c9c8213300560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "321021476"
+                "0x13226624"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest546.json b/GeneralStateTests/stRandom/randomStatetest546.json
index c352ad0ff..f0b68267a 100644
--- a/GeneralStateTests/stRandom/randomStatetest546.json
+++ b/GeneralStateTests/stRandom/randomStatetest546.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest546" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e2424cd2e7ecd99f68d701e09cf51a96eef20a217478da5361c5aae39e7a361e",
+                    "hash" : "0xe2424cd2e7ecd99f68d701e09cf51a96eef20a217478da5361c5aae39e7a361e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e2424cd2e7ecd99f68d701e09cf51a96eef20a217478da5361c5aae39e7a361e",
+                    "hash" : "0xe2424cd2e7ecd99f68d701e09cf51a96eef20a217478da5361c5aae39e7a361e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e2424cd2e7ecd99f68d701e09cf51a96eef20a217478da5361c5aae39e7a361e",
+                    "hash" : "0xe2424cd2e7ecd99f68d701e09cf51a96eef20a217478da5361c5aae39e7a361e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e2424cd2e7ecd99f68d701e09cf51a96eef20a217478da5361c5aae39e7a361e",
+                    "hash" : "0xe2424cd2e7ecd99f68d701e09cf51a96eef20a217478da5361c5aae39e7a361e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e2424cd2e7ecd99f68d701e09cf51a96eef20a217478da5361c5aae39e7a361e",
+                    "hash" : "0xe2424cd2e7ecd99f68d701e09cf51a96eef20a217478da5361c5aae39e7a361e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "e2424cd2e7ecd99f68d701e09cf51a96eef20a217478da5361c5aae39e7a361e",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff447f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f0000000000000000000000010000000000000000000000000000000000000000956f895258826c355765922086717315015560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1796553007"
+                "0x6b15392f"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest547.json b/GeneralStateTests/stRandom/randomStatetest547.json
index 26a8e109e..ca3c00df8 100644
--- a/GeneralStateTests/stRandom/randomStatetest547.json
+++ b/GeneralStateTests/stRandom/randomStatetest547.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest547" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
             {
@@ -21,7 +21,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c1caaee92a003ced2a5e937992db24db13336c6f82e0a22c5c38bb79a945428c",
+                    "hash" : "0xc1caaee92a003ced2a5e937992db24db13336c6f82e0a22c5c38bb79a945428c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c1caaee92a003ced2a5e937992db24db13336c6f82e0a22c5c38bb79a945428c",
+                    "hash" : "0xc1caaee92a003ced2a5e937992db24db13336c6f82e0a22c5c38bb79a945428c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "0f7291ecb91b63577349784d5460818fec6539a23abb9041157bf70b00962de3",
+                    "hash" : "0x0f7291ecb91b63577349784d5460818fec6539a23abb9041157bf70b00962de3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "0f7291ecb91b63577349784d5460818fec6539a23abb9041157bf70b00962de3",
+                    "hash" : "0x0f7291ecb91b63577349784d5460818fec6539a23abb9041157bf70b00962de3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,7 +61,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c1caaee92a003ced2a5e937992db24db13336c6f82e0a22c5c38bb79a945428c",
+                    "hash" : "0xc1caaee92a003ced2a5e937992db24db13336c6f82e0a22c5c38bb79a945428c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -72,23 +72,23 @@
         },
         "postStateRoot" : "0f7291ecb91b63577349784d5460818fec6539a23abb9041157bf70b00962de3",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c35014623971943854a009768255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -103,10 +103,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1980806241"
+                "0x7610b461"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest548.json b/GeneralStateTests/stRandom/randomStatetest548.json
index 6a544ba33..00df11ca5 100644
--- a/GeneralStateTests/stRandom/randomStatetest548.json
+++ b/GeneralStateTests/stRandom/randomStatetest548.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest548" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "93780ea38353849c8b44571282a8da97c9ca498714dc6d9c6b70f0a53f0b4b13",
+                    "hash" : "0x93780ea38353849c8b44571282a8da97c9ca498714dc6d9c6b70f0a53f0b4b13",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "93780ea38353849c8b44571282a8da97c9ca498714dc6d9c6b70f0a53f0b4b13",
+                    "hash" : "0x93780ea38353849c8b44571282a8da97c9ca498714dc6d9c6b70f0a53f0b4b13",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "93780ea38353849c8b44571282a8da97c9ca498714dc6d9c6b70f0a53f0b4b13",
+                    "hash" : "0x93780ea38353849c8b44571282a8da97c9ca498714dc6d9c6b70f0a53f0b4b13",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "93780ea38353849c8b44571282a8da97c9ca498714dc6d9c6b70f0a53f0b4b13",
+                    "hash" : "0x93780ea38353849c8b44571282a8da97c9ca498714dc6d9c6b70f0a53f0b4b13",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "93780ea38353849c8b44571282a8da97c9ca498714dc6d9c6b70f0a53f0b4b13",
+                    "hash" : "0x93780ea38353849c8b44571282a8da97c9ca498714dc6d9c6b70f0a53f0b4b13",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "93780ea38353849c8b44571282a8da97c9ca498714dc6d9c6b70f0a53f0b4b13",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f0000000000000000000000010000000000000000000000000000000000000000417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000001000000000000000000000000000000000000000019417f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f777a349a646633977da01a315a3c035560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "715419522"
+                "0x2aa46f82"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest549.json b/GeneralStateTests/stRandom/randomStatetest549.json
index b44dbe367..1e8978aca 100644
--- a/GeneralStateTests/stRandom/randomStatetest549.json
+++ b/GeneralStateTests/stRandom/randomStatetest549.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest549" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "990db9d5f07c4c9e80aa47e60c6e94930a6ecebb5502bf526af142affecc9f4a",
+                    "hash" : "0x990db9d5f07c4c9e80aa47e60c6e94930a6ecebb5502bf526af142affecc9f4a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "990db9d5f07c4c9e80aa47e60c6e94930a6ecebb5502bf526af142affecc9f4a",
+                    "hash" : "0x990db9d5f07c4c9e80aa47e60c6e94930a6ecebb5502bf526af142affecc9f4a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "80a4f96c995f31704d3c94c2a5476bbfa9dc76b497d01b31ef91a88609cad0a3",
+                    "hash" : "0x80a4f96c995f31704d3c94c2a5476bbfa9dc76b497d01b31ef91a88609cad0a3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "80a4f96c995f31704d3c94c2a5476bbfa9dc76b497d01b31ef91a88609cad0a3",
+                    "hash" : "0x80a4f96c995f31704d3c94c2a5476bbfa9dc76b497d01b31ef91a88609cad0a3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "990db9d5f07c4c9e80aa47e60c6e94930a6ecebb5502bf526af142affecc9f4a",
+                    "hash" : "0x990db9d5f07c4c9e80aa47e60c6e94930a6ecebb5502bf526af142affecc9f4a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "4bb7b2c32daf12a48ab214c74b5cf1c8634e40b6273e17a62555d0e2b86bd25c",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x424441444141454208ff65a0090272",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest55.json b/GeneralStateTests/stRandom/randomStatetest55.json
index 2f89b46d3..8a47a9b3f 100644
--- a/GeneralStateTests/stRandom/randomStatetest55.json
+++ b/GeneralStateTests/stRandom/randomStatetest55.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest55" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6679658a0098c0b2d5bfcad043a0d321ac3bd90a2202253d1ac2db557560f0b6",
+                    "hash" : "0x6679658a0098c0b2d5bfcad043a0d321ac3bd90a2202253d1ac2db557560f0b6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6679658a0098c0b2d5bfcad043a0d321ac3bd90a2202253d1ac2db557560f0b6",
+                    "hash" : "0x6679658a0098c0b2d5bfcad043a0d321ac3bd90a2202253d1ac2db557560f0b6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6679658a0098c0b2d5bfcad043a0d321ac3bd90a2202253d1ac2db557560f0b6",
+                    "hash" : "0x6679658a0098c0b2d5bfcad043a0d321ac3bd90a2202253d1ac2db557560f0b6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6679658a0098c0b2d5bfcad043a0d321ac3bd90a2202253d1ac2db557560f0b6",
+                    "hash" : "0x6679658a0098c0b2d5bfcad043a0d321ac3bd90a2202253d1ac2db557560f0b6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6679658a0098c0b2d5bfcad043a0d321ac3bd90a2202253d1ac2db557560f0b6",
+                    "hash" : "0x6679658a0098c0b2d5bfcad043a0d321ac3bd90a2202253d1ac2db557560f0b6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "6679658a0098c0b2d5bfcad043a0d321ac3bd90a2202253d1ac2db557560f0b6",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000000084967f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff137ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016f3a5b594088a2f238089b71",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1086316137"
+                "0x40bfde69"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest550.json b/GeneralStateTests/stRandom/randomStatetest550.json
index 5ae7f50a9..c40853b3c 100644
--- a/GeneralStateTests/stRandom/randomStatetest550.json
+++ b/GeneralStateTests/stRandom/randomStatetest550.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest550" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "353b1f732d1ad4a79fb1f07fd73d816eea624ad5de613efc884291c890595b2e",
+                    "hash" : "0x353b1f732d1ad4a79fb1f07fd73d816eea624ad5de613efc884291c890595b2e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "353b1f732d1ad4a79fb1f07fd73d816eea624ad5de613efc884291c890595b2e",
+                    "hash" : "0x353b1f732d1ad4a79fb1f07fd73d816eea624ad5de613efc884291c890595b2e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "353b1f732d1ad4a79fb1f07fd73d816eea624ad5de613efc884291c890595b2e",
+                    "hash" : "0x353b1f732d1ad4a79fb1f07fd73d816eea624ad5de613efc884291c890595b2e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "353b1f732d1ad4a79fb1f07fd73d816eea624ad5de613efc884291c890595b2e",
+                    "hash" : "0x353b1f732d1ad4a79fb1f07fd73d816eea624ad5de613efc884291c890595b2e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "353b1f732d1ad4a79fb1f07fd73d816eea624ad5de613efc884291c890595b2e",
+                    "hash" : "0x353b1f732d1ad4a79fb1f07fd73d816eea624ad5de613efc884291c890595b2e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "353b1f732d1ad4a79fb1f07fd73d816eea624ad5de613efc884291c890595b2e",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000006f4472a17829659c94a29041419564313a60005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1391193544"
+                "0x52ebedc8"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest551.json b/GeneralStateTests/stRandom/randomStatetest551.json
index 88b2df70e..99d64145e 100644
--- a/GeneralStateTests/stRandom/randomStatetest551.json
+++ b/GeneralStateTests/stRandom/randomStatetest551.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest551" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "cdc52497ce2fdda1279d2d8b3cbfb8475f12e572538f70dc318f0cdc652c0aa4",
+                    "hash" : "0xcdc52497ce2fdda1279d2d8b3cbfb8475f12e572538f70dc318f0cdc652c0aa4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "cdc52497ce2fdda1279d2d8b3cbfb8475f12e572538f70dc318f0cdc652c0aa4",
+                    "hash" : "0xcdc52497ce2fdda1279d2d8b3cbfb8475f12e572538f70dc318f0cdc652c0aa4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "cdc52497ce2fdda1279d2d8b3cbfb8475f12e572538f70dc318f0cdc652c0aa4",
+                    "hash" : "0xcdc52497ce2fdda1279d2d8b3cbfb8475f12e572538f70dc318f0cdc652c0aa4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "cdc52497ce2fdda1279d2d8b3cbfb8475f12e572538f70dc318f0cdc652c0aa4",
+                    "hash" : "0xcdc52497ce2fdda1279d2d8b3cbfb8475f12e572538f70dc318f0cdc652c0aa4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "cdc52497ce2fdda1279d2d8b3cbfb8475f12e572538f70dc318f0cdc652c0aa4",
+                    "hash" : "0xcdc52497ce2fdda1279d2d8b3cbfb8475f12e572538f70dc318f0cdc652c0aa4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "cdc52497ce2fdda1279d2d8b3cbfb8475f12e572538f70dc318f0cdc652c0aa4",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c350457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f68809e688f8d9841318b806c046a6e5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "954172415"
+                "0x38df83ff"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest552.json b/GeneralStateTests/stRandom/randomStatetest552.json
index c8802dc37..5acdcd049 100644
--- a/GeneralStateTests/stRandom/randomStatetest552.json
+++ b/GeneralStateTests/stRandom/randomStatetest552.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest552" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "2c1938140279367e997725f0ba927415a4feeed657192f114bed35d9a945cc79",
+                    "hash" : "0x2c1938140279367e997725f0ba927415a4feeed657192f114bed35d9a945cc79",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "2c1938140279367e997725f0ba927415a4feeed657192f114bed35d9a945cc79",
+                    "hash" : "0x2c1938140279367e997725f0ba927415a4feeed657192f114bed35d9a945cc79",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "09b3473145b654d689add3df15495a407a140334dd3e2f107a0b0f556ca39391",
+                    "hash" : "0x09b3473145b654d689add3df15495a407a140334dd3e2f107a0b0f556ca39391",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "09b3473145b654d689add3df15495a407a140334dd3e2f107a0b0f556ca39391",
+                    "hash" : "0x09b3473145b654d689add3df15495a407a140334dd3e2f107a0b0f556ca39391",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "2c1938140279367e997725f0ba927415a4feeed657192f114bed35d9a945cc79",
+                    "hash" : "0x2c1938140279367e997725f0ba927415a4feeed657192f114bed35d9a945cc79",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "09b3473145b654d689add3df15495a407a140334dd3e2f107a0b0f556ca39391",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff42147ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe547f00000000000000000000000000000000000000000000000000000000000000006f6a72a37b5219f089416d4336a08e825560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1809429900"
+                "0x6bd9b58c"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest553.json b/GeneralStateTests/stRandom/randomStatetest553.json
index 158c3e636..22b25e3b8 100644
--- a/GeneralStateTests/stRandom/randomStatetest553.json
+++ b/GeneralStateTests/stRandom/randomStatetest553.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest553" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "639c1bf1ec0f21503c18a8ef77400118874ca8ba3c94ed1f5435f9d3c49774c4",
+                    "hash" : "0x639c1bf1ec0f21503c18a8ef77400118874ca8ba3c94ed1f5435f9d3c49774c4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "639c1bf1ec0f21503c18a8ef77400118874ca8ba3c94ed1f5435f9d3c49774c4",
+                    "hash" : "0x639c1bf1ec0f21503c18a8ef77400118874ca8ba3c94ed1f5435f9d3c49774c4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "639c1bf1ec0f21503c18a8ef77400118874ca8ba3c94ed1f5435f9d3c49774c4",
+                    "hash" : "0x639c1bf1ec0f21503c18a8ef77400118874ca8ba3c94ed1f5435f9d3c49774c4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "639c1bf1ec0f21503c18a8ef77400118874ca8ba3c94ed1f5435f9d3c49774c4",
+                    "hash" : "0x639c1bf1ec0f21503c18a8ef77400118874ca8ba3c94ed1f5435f9d3c49774c4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "639c1bf1ec0f21503c18a8ef77400118874ca8ba3c94ed1f5435f9d3c49774c4",
+                    "hash" : "0x639c1bf1ec0f21503c18a8ef77400118874ca8ba3c94ed1f5435f9d3c49774c4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "639c1bf1ec0f21503c18a8ef77400118874ca8ba3c94ed1f5435f9d3c49774c4",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000016f94819c780585376da073368c45828ca060005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "143286"
+                "0x022fb6"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest554.json b/GeneralStateTests/stRandom/randomStatetest554.json
index ed3b4e1ac..ac517d7e0 100644
--- a/GeneralStateTests/stRandom/randomStatetest554.json
+++ b/GeneralStateTests/stRandom/randomStatetest554.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest554" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
             {
@@ -21,7 +21,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "5904ba514537a4da19e4dda5cd7f0fca9f444bcfe3f40b83fe02b627bae9e261",
+                    "hash" : "0x5904ba514537a4da19e4dda5cd7f0fca9f444bcfe3f40b83fe02b627bae9e261",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "5904ba514537a4da19e4dda5cd7f0fca9f444bcfe3f40b83fe02b627bae9e261",
+                    "hash" : "0x5904ba514537a4da19e4dda5cd7f0fca9f444bcfe3f40b83fe02b627bae9e261",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e5c36420d3cdf522a37504c4ac4cc5669337f45f2f634f666494d34f92c8d190",
+                    "hash" : "0xe5c36420d3cdf522a37504c4ac4cc5669337f45f2f634f666494d34f92c8d190",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e5c36420d3cdf522a37504c4ac4cc5669337f45f2f634f666494d34f92c8d190",
+                    "hash" : "0xe5c36420d3cdf522a37504c4ac4cc5669337f45f2f634f666494d34f92c8d190",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,7 +61,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "5904ba514537a4da19e4dda5cd7f0fca9f444bcfe3f40b83fe02b627bae9e261",
+                    "hash" : "0x5904ba514537a4da19e4dda5cd7f0fca9f444bcfe3f40b83fe02b627bae9e261",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -72,23 +72,23 @@
         },
         "postStateRoot" : "e5c36420d3cdf522a37504c4ac4cc5669337f45f2f634f666494d34f92c8d190",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x601460dca06029728b67ba4c2fc8c63c46f19bb45a4be3f678b30669ba571e944074c21b140a7a65d14a921ec804a45ecf4d952aa923fb23a0574acd8ef9f82c7db17e157f651bbeb520203bd398160345137b0419a395630fce1a7ed24c0cccfd91766140e0682f6bd571db701b4616b567f215faf42fb37d2a7c43c05a634612322eda99f09cc2907a6cba01bb6869b7d24b897ec43b9b63a8747a897af14c1f4c0b186c6311d36de86b8c8172aa43c3dfe3ea16503380877fa7f32deb9f60254d124338105942b4b5b88c443351de5ebf14c2380f4a91327d68a0da66abd627db75739942675f5855728fd677646cafec536e37d0da8122cf8681bc106013601b600360086307efe33a73095e7baea6a6c7c4c2dfeb977efac326af552d8763176fe819f16566b603cccf387c5f10e5cdb2ba1b456d2a0386ee72ddf3ff65b33a551afa423f8af05e347b5c50b6fe69c77f0682ef890d8ed8ab3833f128389f6407911fb20590642c9765e97c7f31dfa251377a47ca45b72ce5c1896a697990d60a01cabaf5e4d8f55f11fd37427351d1f8e89810c7aeec6482fd03d7e7ca58fbaae361e3936936543d6dacb1f97f19c3721866491bad73f32faea37b4a8c273668e04dff8863a542e11775a693c3b4bcd4fc1a87ddb6450f8f6c2f1ba807aaffb67e62af22cd93175b5ffb428ee9116dad4a695aa514b8ca4d615fd728a61c124c796554a98241320ac2d6b9f16ee1c203dbba537a211142df4c2e626e4108f87ab6d5b8e9ce86f92aba50a47acc60d734e7a066131d99dad149451b386120eed210723bd8304caa61048c67512ca417ae8857a46ad24ca1f2cb75f75ef86a927152bd86981a216d8147f49ead4be46967dd10751491f9f1ac2f50fd5dad394b7838a9eb89b372698362647bddbb90586e4e921a8cc96ea0c50d07da472b3e6360a39c",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -103,8 +103,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x485341cc"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest555.json b/GeneralStateTests/stRandom/randomStatetest555.json
index 938b88651..04b058094 100644
--- a/GeneralStateTests/stRandom/randomStatetest555.json
+++ b/GeneralStateTests/stRandom/randomStatetest555.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest555" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "78ea6d6870dd607c16f72de4ae9ebf001157f996ee36dd7c2d4460472e93bbeb",
+                    "hash" : "0x78ea6d6870dd607c16f72de4ae9ebf001157f996ee36dd7c2d4460472e93bbeb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "78ea6d6870dd607c16f72de4ae9ebf001157f996ee36dd7c2d4460472e93bbeb",
+                    "hash" : "0x78ea6d6870dd607c16f72de4ae9ebf001157f996ee36dd7c2d4460472e93bbeb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "78ea6d6870dd607c16f72de4ae9ebf001157f996ee36dd7c2d4460472e93bbeb",
+                    "hash" : "0x78ea6d6870dd607c16f72de4ae9ebf001157f996ee36dd7c2d4460472e93bbeb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "78ea6d6870dd607c16f72de4ae9ebf001157f996ee36dd7c2d4460472e93bbeb",
+                    "hash" : "0x78ea6d6870dd607c16f72de4ae9ebf001157f996ee36dd7c2d4460472e93bbeb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "78ea6d6870dd607c16f72de4ae9ebf001157f996ee36dd7c2d4460472e93bbeb",
+                    "hash" : "0x78ea6d6870dd607c16f72de4ae9ebf001157f996ee36dd7c2d4460472e93bbeb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "78ea6d6870dd607c16f72de4ae9ebf001157f996ee36dd7c2d4460472e93bbeb",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe437f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff437f000000000000000000000000000000000000000000000000000000000000c3506f3b8f936e6f3874603c59120707e3588c60005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "119135864"
+                "0x0719de78"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest556.json b/GeneralStateTests/stRandom/randomStatetest556.json
index d2094d6e2..4eb78c3c9 100644
--- a/GeneralStateTests/stRandom/randomStatetest556.json
+++ b/GeneralStateTests/stRandom/randomStatetest556.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest556" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "0055816a27a63f97f415e9f2ae5fa3ff2bd61d3a08d29c54aad8ffd7665f3a47",
+                    "hash" : "0x0055816a27a63f97f415e9f2ae5fa3ff2bd61d3a08d29c54aad8ffd7665f3a47",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "0055816a27a63f97f415e9f2ae5fa3ff2bd61d3a08d29c54aad8ffd7665f3a47",
+                    "hash" : "0x0055816a27a63f97f415e9f2ae5fa3ff2bd61d3a08d29c54aad8ffd7665f3a47",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "0055816a27a63f97f415e9f2ae5fa3ff2bd61d3a08d29c54aad8ffd7665f3a47",
+                    "hash" : "0x0055816a27a63f97f415e9f2ae5fa3ff2bd61d3a08d29c54aad8ffd7665f3a47",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "0055816a27a63f97f415e9f2ae5fa3ff2bd61d3a08d29c54aad8ffd7665f3a47",
+                    "hash" : "0x0055816a27a63f97f415e9f2ae5fa3ff2bd61d3a08d29c54aad8ffd7665f3a47",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0055816a27a63f97f415e9f2ae5fa3ff2bd61d3a08d29c54aad8ffd7665f3a47",
+                    "hash" : "0x0055816a27a63f97f415e9f2ae5fa3ff2bd61d3a08d29c54aad8ffd7665f3a47",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "0055816a27a63f97f415e9f2ae5fa3ff2bd61d3a08d29c54aad8ffd7665f3a47",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000437f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000006f726e757692a2ad96526b9e8b77a33a5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1156625804"
+                "0x44f0b58c"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest557.json b/GeneralStateTests/stRandom/randomStatetest557.json
index 81daf1638..7d3fdf9e3 100644
--- a/GeneralStateTests/stRandom/randomStatetest557.json
+++ b/GeneralStateTests/stRandom/randomStatetest557.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest557" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6b1b313796063c3cd97d8d0fb199c4be5378c5ae2106b78d9524c49f8233edd2",
+                    "hash" : "0x6b1b313796063c3cd97d8d0fb199c4be5378c5ae2106b78d9524c49f8233edd2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6b1b313796063c3cd97d8d0fb199c4be5378c5ae2106b78d9524c49f8233edd2",
+                    "hash" : "0x6b1b313796063c3cd97d8d0fb199c4be5378c5ae2106b78d9524c49f8233edd2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "77df2a740c2a760c9f9fb197005050481ef37f677ebff3cb66bf66913f15a0f6",
+                    "hash" : "0x77df2a740c2a760c9f9fb197005050481ef37f677ebff3cb66bf66913f15a0f6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "77df2a740c2a760c9f9fb197005050481ef37f677ebff3cb66bf66913f15a0f6",
+                    "hash" : "0x77df2a740c2a760c9f9fb197005050481ef37f677ebff3cb66bf66913f15a0f6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6b1b313796063c3cd97d8d0fb199c4be5378c5ae2106b78d9524c49f8233edd2",
+                    "hash" : "0x6b1b313796063c3cd97d8d0fb199c4be5378c5ae2106b78d9524c49f8233edd2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "77df2a740c2a760c9f9fb197005050481ef37f677ebff3cb66bf66913f15a0f6",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x45404141314155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest558.json b/GeneralStateTests/stRandom/randomStatetest558.json
index 4c931ee30..e3c9f3502 100644
--- a/GeneralStateTests/stRandom/randomStatetest558.json
+++ b/GeneralStateTests/stRandom/randomStatetest558.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest558" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "4cf7506d1dea424f139b33df9f98b63319321abdc35573704330cdaabd604e80",
+                    "hash" : "0x4cf7506d1dea424f139b33df9f98b63319321abdc35573704330cdaabd604e80",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "4cf7506d1dea424f139b33df9f98b63319321abdc35573704330cdaabd604e80",
+                    "hash" : "0x4cf7506d1dea424f139b33df9f98b63319321abdc35573704330cdaabd604e80",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4cf7506d1dea424f139b33df9f98b63319321abdc35573704330cdaabd604e80",
+                    "hash" : "0x4cf7506d1dea424f139b33df9f98b63319321abdc35573704330cdaabd604e80",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4cf7506d1dea424f139b33df9f98b63319321abdc35573704330cdaabd604e80",
+                    "hash" : "0x4cf7506d1dea424f139b33df9f98b63319321abdc35573704330cdaabd604e80",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "4cf7506d1dea424f139b33df9f98b63319321abdc35573704330cdaabd604e80",
+                    "hash" : "0x4cf7506d1dea424f139b33df9f98b63319321abdc35573704330cdaabd604e80",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "4cf7506d1dea424f139b33df9f98b63319321abdc35573704330cdaabd604e80",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x43767855",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest559.json b/GeneralStateTests/stRandom/randomStatetest559.json
index ca38b3811..03b88f8fc 100644
--- a/GeneralStateTests/stRandom/randomStatetest559.json
+++ b/GeneralStateTests/stRandom/randomStatetest559.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest559" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "bf0eb5473b48cd5d7480cb723150f0140fb6b426c83ad8165dc012d0a2a38473",
+                    "hash" : "0xbf0eb5473b48cd5d7480cb723150f0140fb6b426c83ad8165dc012d0a2a38473",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "bf0eb5473b48cd5d7480cb723150f0140fb6b426c83ad8165dc012d0a2a38473",
+                    "hash" : "0xbf0eb5473b48cd5d7480cb723150f0140fb6b426c83ad8165dc012d0a2a38473",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9461e2fa23cb2804ba815d6a49dccd298976a131c36f717823ea7641622a5892",
+                    "hash" : "0x9461e2fa23cb2804ba815d6a49dccd298976a131c36f717823ea7641622a5892",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9461e2fa23cb2804ba815d6a49dccd298976a131c36f717823ea7641622a5892",
+                    "hash" : "0x9461e2fa23cb2804ba815d6a49dccd298976a131c36f717823ea7641622a5892",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "bf0eb5473b48cd5d7480cb723150f0140fb6b426c83ad8165dc012d0a2a38473",
+                    "hash" : "0xbf0eb5473b48cd5d7480cb723150f0140fb6b426c83ad8165dc012d0a2a38473",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "9461e2fa23cb2804ba815d6a49dccd298976a131c36f717823ea7641622a5892",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000008509ff1555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "312647948"
+                "0x12a2a10c"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest56.json b/GeneralStateTests/stRandom/randomStatetest56.json
index 58d36fad7..c26968338 100644
--- a/GeneralStateTests/stRandom/randomStatetest56.json
+++ b/GeneralStateTests/stRandom/randomStatetest56.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest56" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "ea8a3355c8e94595abefc7b9ab39b9949885c8d2cfdb0154475b1e4c08e35b71",
+                    "hash" : "0xea8a3355c8e94595abefc7b9ab39b9949885c8d2cfdb0154475b1e4c08e35b71",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "ea8a3355c8e94595abefc7b9ab39b9949885c8d2cfdb0154475b1e4c08e35b71",
+                    "hash" : "0xea8a3355c8e94595abefc7b9ab39b9949885c8d2cfdb0154475b1e4c08e35b71",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "ea8a3355c8e94595abefc7b9ab39b9949885c8d2cfdb0154475b1e4c08e35b71",
+                    "hash" : "0xea8a3355c8e94595abefc7b9ab39b9949885c8d2cfdb0154475b1e4c08e35b71",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ea8a3355c8e94595abefc7b9ab39b9949885c8d2cfdb0154475b1e4c08e35b71",
+                    "hash" : "0xea8a3355c8e94595abefc7b9ab39b9949885c8d2cfdb0154475b1e4c08e35b71",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "ea8a3355c8e94595abefc7b9ab39b9949885c8d2cfdb0154475b1e4c08e35b71",
+                    "hash" : "0xea8a3355c8e94595abefc7b9ab39b9949885c8d2cfdb0154475b1e4c08e35b71",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "aa12d41c4489f07bf7694911769cf889fd07221683aa992100fff908ce6d91ed",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x584143404243404107204155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest560.json b/GeneralStateTests/stRandom/randomStatetest560.json
index 81674fe76..a755aba2b 100644
--- a/GeneralStateTests/stRandom/randomStatetest560.json
+++ b/GeneralStateTests/stRandom/randomStatetest560.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest560" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
             {
@@ -22,7 +22,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "57a9813176db0f5c519221d0d8c132b50ab7d92fa3d9287027dcf454696c3c93",
+                    "hash" : "0x57a9813176db0f5c519221d0d8c132b50ab7d92fa3d9287027dcf454696c3c93",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -32,7 +32,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "57a9813176db0f5c519221d0d8c132b50ab7d92fa3d9287027dcf454696c3c93",
+                    "hash" : "0x57a9813176db0f5c519221d0d8c132b50ab7d92fa3d9287027dcf454696c3c93",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -42,7 +42,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "57a9813176db0f5c519221d0d8c132b50ab7d92fa3d9287027dcf454696c3c93",
+                    "hash" : "0x57a9813176db0f5c519221d0d8c132b50ab7d92fa3d9287027dcf454696c3c93",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -52,7 +52,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "57a9813176db0f5c519221d0d8c132b50ab7d92fa3d9287027dcf454696c3c93",
+                    "hash" : "0x57a9813176db0f5c519221d0d8c132b50ab7d92fa3d9287027dcf454696c3c93",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,7 +62,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "57a9813176db0f5c519221d0d8c132b50ab7d92fa3d9287027dcf454696c3c93",
+                    "hash" : "0x57a9813176db0f5c519221d0d8c132b50ab7d92fa3d9287027dcf454696c3c93",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -73,23 +73,23 @@
         },
         "postStateRoot" : "57a9813176db0f5c519221d0d8c132b50ab7d92fa3d9287027dcf454696c3c93",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c35059a17f0000000000000000000000000000000000000000000000000000000000000001f38f07bf60005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -104,10 +104,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "50481116"
+                "0x030247dc"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest561.json b/GeneralStateTests/stRandom/randomStatetest561.json
index 1726bb311..dbe72686b 100644
--- a/GeneralStateTests/stRandom/randomStatetest561.json
+++ b/GeneralStateTests/stRandom/randomStatetest561.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest561" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a67548dadefa8903f1b3a8497d85ee6aba30fe10859d7d554a4d5f94406537ab",
+                    "hash" : "0xa67548dadefa8903f1b3a8497d85ee6aba30fe10859d7d554a4d5f94406537ab",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a67548dadefa8903f1b3a8497d85ee6aba30fe10859d7d554a4d5f94406537ab",
+                    "hash" : "0xa67548dadefa8903f1b3a8497d85ee6aba30fe10859d7d554a4d5f94406537ab",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a67548dadefa8903f1b3a8497d85ee6aba30fe10859d7d554a4d5f94406537ab",
+                    "hash" : "0xa67548dadefa8903f1b3a8497d85ee6aba30fe10859d7d554a4d5f94406537ab",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a67548dadefa8903f1b3a8497d85ee6aba30fe10859d7d554a4d5f94406537ab",
+                    "hash" : "0xa67548dadefa8903f1b3a8497d85ee6aba30fe10859d7d554a4d5f94406537ab",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a67548dadefa8903f1b3a8497d85ee6aba30fe10859d7d554a4d5f94406537ab",
+                    "hash" : "0xa67548dadefa8903f1b3a8497d85ee6aba30fe10859d7d554a4d5f94406537ab",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "3f52e053a4e0e4ebd4579a81c51682b3accaa707b5b50db58a7eaa0fc5d98b33",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x4145424544414055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest562.json b/GeneralStateTests/stRandom/randomStatetest562.json
index 475eca849..c1ade775a 100644
--- a/GeneralStateTests/stRandom/randomStatetest562.json
+++ b/GeneralStateTests/stRandom/randomStatetest562.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest562" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "fe6e569b97acd94e53ee5ff7f687b912625f587fc7b4efefba311fe07df2a9c5",
+                    "hash" : "0xfe6e569b97acd94e53ee5ff7f687b912625f587fc7b4efefba311fe07df2a9c5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "fe6e569b97acd94e53ee5ff7f687b912625f587fc7b4efefba311fe07df2a9c5",
+                    "hash" : "0xfe6e569b97acd94e53ee5ff7f687b912625f587fc7b4efefba311fe07df2a9c5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "fe6e569b97acd94e53ee5ff7f687b912625f587fc7b4efefba311fe07df2a9c5",
+                    "hash" : "0xfe6e569b97acd94e53ee5ff7f687b912625f587fc7b4efefba311fe07df2a9c5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "fe6e569b97acd94e53ee5ff7f687b912625f587fc7b4efefba311fe07df2a9c5",
+                    "hash" : "0xfe6e569b97acd94e53ee5ff7f687b912625f587fc7b4efefba311fe07df2a9c5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "fe6e569b97acd94e53ee5ff7f687b912625f587fc7b4efefba311fe07df2a9c5",
+                    "hash" : "0xfe6e569b97acd94e53ee5ff7f687b912625f587fc7b4efefba311fe07df2a9c5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "fe6e569b97acd94e53ee5ff7f687b912625f587fc7b4efefba311fe07df2a9c5",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000000000000000000000000001937fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350a094448744",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,8 +96,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x591bc129"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest563.json b/GeneralStateTests/stRandom/randomStatetest563.json
index 4091306f2..cdcad58ed 100644
--- a/GeneralStateTests/stRandom/randomStatetest563.json
+++ b/GeneralStateTests/stRandom/randomStatetest563.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest563" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "0e20a3eb1ed620f84ba16992f75adeca330f8b2c2c1790fc8b57346d3c44a9eb",
+                    "hash" : "0x0e20a3eb1ed620f84ba16992f75adeca330f8b2c2c1790fc8b57346d3c44a9eb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "0e20a3eb1ed620f84ba16992f75adeca330f8b2c2c1790fc8b57346d3c44a9eb",
+                    "hash" : "0x0e20a3eb1ed620f84ba16992f75adeca330f8b2c2c1790fc8b57346d3c44a9eb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "0e20a3eb1ed620f84ba16992f75adeca330f8b2c2c1790fc8b57346d3c44a9eb",
+                    "hash" : "0x0e20a3eb1ed620f84ba16992f75adeca330f8b2c2c1790fc8b57346d3c44a9eb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "0e20a3eb1ed620f84ba16992f75adeca330f8b2c2c1790fc8b57346d3c44a9eb",
+                    "hash" : "0x0e20a3eb1ed620f84ba16992f75adeca330f8b2c2c1790fc8b57346d3c44a9eb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0e20a3eb1ed620f84ba16992f75adeca330f8b2c2c1790fc8b57346d3c44a9eb",
+                    "hash" : "0x0e20a3eb1ed620f84ba16992f75adeca330f8b2c2c1790fc8b57346d3c44a9eb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "0e20a3eb1ed620f84ba16992f75adeca330f8b2c2c1790fc8b57346d3c44a9eb",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe418b7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b50461098038315ba267",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1283542119"
+                "0x4c814c67"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest564.json b/GeneralStateTests/stRandom/randomStatetest564.json
index 3689d8c17..7e6d56250 100644
--- a/GeneralStateTests/stRandom/randomStatetest564.json
+++ b/GeneralStateTests/stRandom/randomStatetest564.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest564" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "2f60c3c775a535cab4c171c937018759a0cac0f9485d90a72c9a739becf406c7",
+                    "hash" : "0x2f60c3c775a535cab4c171c937018759a0cac0f9485d90a72c9a739becf406c7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "2f60c3c775a535cab4c171c937018759a0cac0f9485d90a72c9a739becf406c7",
+                    "hash" : "0x2f60c3c775a535cab4c171c937018759a0cac0f9485d90a72c9a739becf406c7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2f60c3c775a535cab4c171c937018759a0cac0f9485d90a72c9a739becf406c7",
+                    "hash" : "0x2f60c3c775a535cab4c171c937018759a0cac0f9485d90a72c9a739becf406c7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "2f60c3c775a535cab4c171c937018759a0cac0f9485d90a72c9a739becf406c7",
+                    "hash" : "0x2f60c3c775a535cab4c171c937018759a0cac0f9485d90a72c9a739becf406c7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "2f60c3c775a535cab4c171c937018759a0cac0f9485d90a72c9a739becf406c7",
+                    "hash" : "0x2f60c3c775a535cab4c171c937018759a0cac0f9485d90a72c9a739becf406c7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "2f60c3c775a535cab4c171c937018759a0cac0f9485d90a72c9a739becf406c7",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x5b7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe4550081655",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "286796184"
+                "0x11182998"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest565.json b/GeneralStateTests/stRandom/randomStatetest565.json
index 12c082858..6d6f2e0eb 100644
--- a/GeneralStateTests/stRandom/randomStatetest565.json
+++ b/GeneralStateTests/stRandom/randomStatetest565.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest565" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "97aa08cd6d0b13b54c19e7b6f22643344a9e43fd6508f4f028137a3a2a1c42f9",
+                    "hash" : "0x97aa08cd6d0b13b54c19e7b6f22643344a9e43fd6508f4f028137a3a2a1c42f9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "97aa08cd6d0b13b54c19e7b6f22643344a9e43fd6508f4f028137a3a2a1c42f9",
+                    "hash" : "0x97aa08cd6d0b13b54c19e7b6f22643344a9e43fd6508f4f028137a3a2a1c42f9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "97aa08cd6d0b13b54c19e7b6f22643344a9e43fd6508f4f028137a3a2a1c42f9",
+                    "hash" : "0x97aa08cd6d0b13b54c19e7b6f22643344a9e43fd6508f4f028137a3a2a1c42f9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "97aa08cd6d0b13b54c19e7b6f22643344a9e43fd6508f4f028137a3a2a1c42f9",
+                    "hash" : "0x97aa08cd6d0b13b54c19e7b6f22643344a9e43fd6508f4f028137a3a2a1c42f9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "97aa08cd6d0b13b54c19e7b6f22643344a9e43fd6508f4f028137a3a2a1c42f9",
+                    "hash" : "0x97aa08cd6d0b13b54c19e7b6f22643344a9e43fd6508f4f028137a3a2a1c42f9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "97aa08cd6d0b13b54c19e7b6f22643344a9e43fd6508f4f028137a3a2a1c42f9",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350137f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000010000000000000000000000000000000000000000923760005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "684525926"
+                "0x28cd0966"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest566.json b/GeneralStateTests/stRandom/randomStatetest566.json
index 79e7f4a3b..e60088cb8 100644
--- a/GeneralStateTests/stRandom/randomStatetest566.json
+++ b/GeneralStateTests/stRandom/randomStatetest566.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest566" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "da9ba6a63835b74e053ed244ee764e193863ac80eac5d74c597213f341f63dc2",
+                    "hash" : "0xda9ba6a63835b74e053ed244ee764e193863ac80eac5d74c597213f341f63dc2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "da9ba6a63835b74e053ed244ee764e193863ac80eac5d74c597213f341f63dc2",
+                    "hash" : "0xda9ba6a63835b74e053ed244ee764e193863ac80eac5d74c597213f341f63dc2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "da9ba6a63835b74e053ed244ee764e193863ac80eac5d74c597213f341f63dc2",
+                    "hash" : "0xda9ba6a63835b74e053ed244ee764e193863ac80eac5d74c597213f341f63dc2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "da9ba6a63835b74e053ed244ee764e193863ac80eac5d74c597213f341f63dc2",
+                    "hash" : "0xda9ba6a63835b74e053ed244ee764e193863ac80eac5d74c597213f341f63dc2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "da9ba6a63835b74e053ed244ee764e193863ac80eac5d74c597213f341f63dc2",
+                    "hash" : "0xda9ba6a63835b74e053ed244ee764e193863ac80eac5d74c597213f341f63dc2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "da9ba6a63835b74e053ed244ee764e193863ac80eac5d74c597213f341f63dc2",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x9a7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000000117f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff427f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b593963332578665734360005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "565778672"
+                "0x21b918f0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest567.json b/GeneralStateTests/stRandom/randomStatetest567.json
index f7dced70f..906918721 100644
--- a/GeneralStateTests/stRandom/randomStatetest567.json
+++ b/GeneralStateTests/stRandom/randomStatetest567.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest567" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d2a415a9f1f0c6293af9e5e47f963d989f96b88d16e8db6556ec8733d76b0655",
+                    "hash" : "0xd2a415a9f1f0c6293af9e5e47f963d989f96b88d16e8db6556ec8733d76b0655",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d2a415a9f1f0c6293af9e5e47f963d989f96b88d16e8db6556ec8733d76b0655",
+                    "hash" : "0xd2a415a9f1f0c6293af9e5e47f963d989f96b88d16e8db6556ec8733d76b0655",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "d2a415a9f1f0c6293af9e5e47f963d989f96b88d16e8db6556ec8733d76b0655",
+                    "hash" : "0xd2a415a9f1f0c6293af9e5e47f963d989f96b88d16e8db6556ec8733d76b0655",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "d2a415a9f1f0c6293af9e5e47f963d989f96b88d16e8db6556ec8733d76b0655",
+                    "hash" : "0xd2a415a9f1f0c6293af9e5e47f963d989f96b88d16e8db6556ec8733d76b0655",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d2a415a9f1f0c6293af9e5e47f963d989f96b88d16e8db6556ec8733d76b0655",
+                    "hash" : "0xd2a415a9f1f0c6293af9e5e47f963d989f96b88d16e8db6556ec8733d76b0655",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "d2a415a9f1f0c6293af9e5e47f963d989f96b88d16e8db6556ec8733d76b0655",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017e7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe906697998df1160b",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "600472398"
+                "0x23ca7b4e"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest568.json b/GeneralStateTests/stRandom/randomStatetest568.json
index 368cf988c..c4a89fc41 100644
--- a/GeneralStateTests/stRandom/randomStatetest568.json
+++ b/GeneralStateTests/stRandom/randomStatetest568.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest568" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "5b075ffffa6101dc17e8d958afc7fd21a23f561fd05ce80593438b4d08c73d7a",
+                    "hash" : "0x5b075ffffa6101dc17e8d958afc7fd21a23f561fd05ce80593438b4d08c73d7a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "5b075ffffa6101dc17e8d958afc7fd21a23f561fd05ce80593438b4d08c73d7a",
+                    "hash" : "0x5b075ffffa6101dc17e8d958afc7fd21a23f561fd05ce80593438b4d08c73d7a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "1b1421bd444bf0a73bbcb81f6737f29388c648ba3d1a7783cfb63023867b84b8",
+                    "hash" : "0x1b1421bd444bf0a73bbcb81f6737f29388c648ba3d1a7783cfb63023867b84b8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "1b1421bd444bf0a73bbcb81f6737f29388c648ba3d1a7783cfb63023867b84b8",
+                    "hash" : "0x1b1421bd444bf0a73bbcb81f6737f29388c648ba3d1a7783cfb63023867b84b8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "5b075ffffa6101dc17e8d958afc7fd21a23f561fd05ce80593438b4d08c73d7a",
+                    "hash" : "0x5b075ffffa6101dc17e8d958afc7fd21a23f561fd05ce80593438b4d08c73d7a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "1b1421bd444bf0a73bbcb81f6737f29388c648ba3d1a7783cfb63023867b84b8",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x42444545454042415a8554f355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest569.json b/GeneralStateTests/stRandom/randomStatetest569.json
index 1311d3b9e..53779b452 100644
--- a/GeneralStateTests/stRandom/randomStatetest569.json
+++ b/GeneralStateTests/stRandom/randomStatetest569.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest569" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "61be519aff25f0c4f5eaede65d1ee274fd776b8736dd5628bda0a155bb3adc7c",
+                    "hash" : "0x61be519aff25f0c4f5eaede65d1ee274fd776b8736dd5628bda0a155bb3adc7c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "61be519aff25f0c4f5eaede65d1ee274fd776b8736dd5628bda0a155bb3adc7c",
+                    "hash" : "0x61be519aff25f0c4f5eaede65d1ee274fd776b8736dd5628bda0a155bb3adc7c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "61be519aff25f0c4f5eaede65d1ee274fd776b8736dd5628bda0a155bb3adc7c",
+                    "hash" : "0x61be519aff25f0c4f5eaede65d1ee274fd776b8736dd5628bda0a155bb3adc7c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "61be519aff25f0c4f5eaede65d1ee274fd776b8736dd5628bda0a155bb3adc7c",
+                    "hash" : "0x61be519aff25f0c4f5eaede65d1ee274fd776b8736dd5628bda0a155bb3adc7c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "61be519aff25f0c4f5eaede65d1ee274fd776b8736dd5628bda0a155bb3adc7c",
+                    "hash" : "0x61be519aff25f0c4f5eaede65d1ee274fd776b8736dd5628bda0a155bb3adc7c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "61be519aff25f0c4f5eaede65d1ee274fd776b8736dd5628bda0a155bb3adc7c",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe427f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5097f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe8e0781816fff31986c0a773c9b014460005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1737878734"
+                "0x6795ecce"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest57.json b/GeneralStateTests/stRandom/randomStatetest57.json
index 7fc6e18f1..3bfa98e0f 100644
--- a/GeneralStateTests/stRandom/randomStatetest57.json
+++ b/GeneralStateTests/stRandom/randomStatetest57.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest57" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "fe3bb11ce4456526f0cfbf5b5c2eb8965906325bb9911dbabb777c31ab954403",
+                    "hash" : "0xfe3bb11ce4456526f0cfbf5b5c2eb8965906325bb9911dbabb777c31ab954403",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "fe3bb11ce4456526f0cfbf5b5c2eb8965906325bb9911dbabb777c31ab954403",
+                    "hash" : "0xfe3bb11ce4456526f0cfbf5b5c2eb8965906325bb9911dbabb777c31ab954403",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "fe3bb11ce4456526f0cfbf5b5c2eb8965906325bb9911dbabb777c31ab954403",
+                    "hash" : "0xfe3bb11ce4456526f0cfbf5b5c2eb8965906325bb9911dbabb777c31ab954403",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "fe3bb11ce4456526f0cfbf5b5c2eb8965906325bb9911dbabb777c31ab954403",
+                    "hash" : "0xfe3bb11ce4456526f0cfbf5b5c2eb8965906325bb9911dbabb777c31ab954403",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "fe3bb11ce4456526f0cfbf5b5c2eb8965906325bb9911dbabb777c31ab954403",
+                    "hash" : "0xfe3bb11ce4456526f0cfbf5b5c2eb8965906325bb9911dbabb777c31ab954403",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "fe3bb11ce4456526f0cfbf5b5c2eb8965906325bb9911dbabb777c31ab954403",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c350417ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe097f000000000000000000000000000000000000000000000000000000000000c350819055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "277972730"
+                "0x109186fa"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest570.json b/GeneralStateTests/stRandom/randomStatetest570.json
index 8b4a8ebdb..418e5425c 100644
--- a/GeneralStateTests/stRandom/randomStatetest570.json
+++ b/GeneralStateTests/stRandom/randomStatetest570.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest570" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "ca64cde7e4599592bb368f39e3614f10eeb6e7e37ee5c1a6d8b810008433ba2d",
+                    "hash" : "0xca64cde7e4599592bb368f39e3614f10eeb6e7e37ee5c1a6d8b810008433ba2d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "ca64cde7e4599592bb368f39e3614f10eeb6e7e37ee5c1a6d8b810008433ba2d",
+                    "hash" : "0xca64cde7e4599592bb368f39e3614f10eeb6e7e37ee5c1a6d8b810008433ba2d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "ca64cde7e4599592bb368f39e3614f10eeb6e7e37ee5c1a6d8b810008433ba2d",
+                    "hash" : "0xca64cde7e4599592bb368f39e3614f10eeb6e7e37ee5c1a6d8b810008433ba2d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ca64cde7e4599592bb368f39e3614f10eeb6e7e37ee5c1a6d8b810008433ba2d",
+                    "hash" : "0xca64cde7e4599592bb368f39e3614f10eeb6e7e37ee5c1a6d8b810008433ba2d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "ca64cde7e4599592bb368f39e3614f10eeb6e7e37ee5c1a6d8b810008433ba2d",
+                    "hash" : "0xca64cde7e4599592bb368f39e3614f10eeb6e7e37ee5c1a6d8b810008433ba2d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "ca64cde7e4599592bb368f39e3614f10eeb6e7e37ee5c1a6d8b810008433ba2d",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000001000000000000000000000000000000000000000041406f91956111508460735b825f545807805560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "236440956"
+                "0x0e17cd7c"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest571.json b/GeneralStateTests/stRandom/randomStatetest571.json
index d73f80c30..be3b9b4e9 100644
--- a/GeneralStateTests/stRandom/randomStatetest571.json
+++ b/GeneralStateTests/stRandom/randomStatetest571.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest571" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "caceb4f090d351957e1f07b1e8ee3b28d8ff6cf37776187f349abcce13be2af1",
+                    "hash" : "0xcaceb4f090d351957e1f07b1e8ee3b28d8ff6cf37776187f349abcce13be2af1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "caceb4f090d351957e1f07b1e8ee3b28d8ff6cf37776187f349abcce13be2af1",
+                    "hash" : "0xcaceb4f090d351957e1f07b1e8ee3b28d8ff6cf37776187f349abcce13be2af1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3fc8d24bb9a5f1b7d3d51bf41295c7a94c5679c302d624ae15a9313b32f4fa8a",
+                    "hash" : "0x3fc8d24bb9a5f1b7d3d51bf41295c7a94c5679c302d624ae15a9313b32f4fa8a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3fc8d24bb9a5f1b7d3d51bf41295c7a94c5679c302d624ae15a9313b32f4fa8a",
+                    "hash" : "0x3fc8d24bb9a5f1b7d3d51bf41295c7a94c5679c302d624ae15a9313b32f4fa8a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "caceb4f090d351957e1f07b1e8ee3b28d8ff6cf37776187f349abcce13be2af1",
+                    "hash" : "0xcaceb4f090d351957e1f07b1e8ee3b28d8ff6cf37776187f349abcce13be2af1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "3fc8d24bb9a5f1b7d3d51bf41295c7a94c5679c302d624ae15a9313b32f4fa8a",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000015b7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b53c6508766c8b6b403a60005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1402161028"
+                "0x53934784"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest572.json b/GeneralStateTests/stRandom/randomStatetest572.json
index 9ed2599f4..828d16fc9 100644
--- a/GeneralStateTests/stRandom/randomStatetest572.json
+++ b/GeneralStateTests/stRandom/randomStatetest572.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest572" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
             {
@@ -22,7 +22,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b7807ea76423b6d539a5f44ab0a3b01046986dfb8a0d1a910d658335f91bd098",
+                    "hash" : "0xb7807ea76423b6d539a5f44ab0a3b01046986dfb8a0d1a910d658335f91bd098",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -32,7 +32,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b7807ea76423b6d539a5f44ab0a3b01046986dfb8a0d1a910d658335f91bd098",
+                    "hash" : "0xb7807ea76423b6d539a5f44ab0a3b01046986dfb8a0d1a910d658335f91bd098",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -42,7 +42,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "99238bd7c7286d4f8af2f99dbeeb264eab9c2e5eb3f7e90181d44fbde7f34712",
+                    "hash" : "0x99238bd7c7286d4f8af2f99dbeeb264eab9c2e5eb3f7e90181d44fbde7f34712",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -52,7 +52,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "99238bd7c7286d4f8af2f99dbeeb264eab9c2e5eb3f7e90181d44fbde7f34712",
+                    "hash" : "0x99238bd7c7286d4f8af2f99dbeeb264eab9c2e5eb3f7e90181d44fbde7f34712",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,7 +62,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b7807ea76423b6d539a5f44ab0a3b01046986dfb8a0d1a910d658335f91bd098",
+                    "hash" : "0xb7807ea76423b6d539a5f44ab0a3b01046986dfb8a0d1a910d658335f91bd098",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -73,23 +73,23 @@
         },
         "postStateRoot" : "99238bd7c7286d4f8af2f99dbeeb264eab9c2e5eb3f7e90181d44fbde7f34712",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x457f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe097f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5440ba13b38",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -104,10 +104,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1943383964"
+                "0x73d5af9c"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest573.json b/GeneralStateTests/stRandom/randomStatetest573.json
index 293035c63..bc53c32cc 100644
--- a/GeneralStateTests/stRandom/randomStatetest573.json
+++ b/GeneralStateTests/stRandom/randomStatetest573.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest573" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9f0735add7612c06e51b8e53a857ff6a4fc74171d6681ae40baa764eba0cb4f0",
+                    "hash" : "0x9f0735add7612c06e51b8e53a857ff6a4fc74171d6681ae40baa764eba0cb4f0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9f0735add7612c06e51b8e53a857ff6a4fc74171d6681ae40baa764eba0cb4f0",
+                    "hash" : "0x9f0735add7612c06e51b8e53a857ff6a4fc74171d6681ae40baa764eba0cb4f0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9f0735add7612c06e51b8e53a857ff6a4fc74171d6681ae40baa764eba0cb4f0",
+                    "hash" : "0x9f0735add7612c06e51b8e53a857ff6a4fc74171d6681ae40baa764eba0cb4f0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9f0735add7612c06e51b8e53a857ff6a4fc74171d6681ae40baa764eba0cb4f0",
+                    "hash" : "0x9f0735add7612c06e51b8e53a857ff6a4fc74171d6681ae40baa764eba0cb4f0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9f0735add7612c06e51b8e53a857ff6a4fc74171d6681ae40baa764eba0cb4f0",
+                    "hash" : "0x9f0735add7612c06e51b8e53a857ff6a4fc74171d6681ae40baa764eba0cb4f0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "9f0735add7612c06e51b8e53a857ff6a4fc74171d6681ae40baa764eba0cb4f0",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000140523c6d91f24568a3393490820630181a",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "2037953415"
+                "0x7978b387"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest574.json b/GeneralStateTests/stRandom/randomStatetest574.json
index 521f98009..5ff096404 100644
--- a/GeneralStateTests/stRandom/randomStatetest574.json
+++ b/GeneralStateTests/stRandom/randomStatetest574.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest574" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c04e73cee83437964f7841a23889fec2b99b82dc87d66f069599862766d24a56",
+                    "hash" : "0xc04e73cee83437964f7841a23889fec2b99b82dc87d66f069599862766d24a56",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c04e73cee83437964f7841a23889fec2b99b82dc87d66f069599862766d24a56",
+                    "hash" : "0xc04e73cee83437964f7841a23889fec2b99b82dc87d66f069599862766d24a56",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "c04e73cee83437964f7841a23889fec2b99b82dc87d66f069599862766d24a56",
+                    "hash" : "0xc04e73cee83437964f7841a23889fec2b99b82dc87d66f069599862766d24a56",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c04e73cee83437964f7841a23889fec2b99b82dc87d66f069599862766d24a56",
+                    "hash" : "0xc04e73cee83437964f7841a23889fec2b99b82dc87d66f069599862766d24a56",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c04e73cee83437964f7841a23889fec2b99b82dc87d66f069599862766d24a56",
+                    "hash" : "0xc04e73cee83437964f7841a23889fec2b99b82dc87d66f069599862766d24a56",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "c04e73cee83437964f7841a23889fec2b99b82dc87d66f069599862766d24a56",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001047f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff046d369354827d7433a335af5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1595303022"
+                "0x5f16646e"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest575.json b/GeneralStateTests/stRandom/randomStatetest575.json
index 10a5c266b..bfeb16321 100644
--- a/GeneralStateTests/stRandom/randomStatetest575.json
+++ b/GeneralStateTests/stRandom/randomStatetest575.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest575" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "5c778496277721dc7ac26f5c33a0cfec443e512a8d8cbc1b6c4e527f1c7e1741",
+                    "hash" : "0x5c778496277721dc7ac26f5c33a0cfec443e512a8d8cbc1b6c4e527f1c7e1741",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "5c778496277721dc7ac26f5c33a0cfec443e512a8d8cbc1b6c4e527f1c7e1741",
+                    "hash" : "0x5c778496277721dc7ac26f5c33a0cfec443e512a8d8cbc1b6c4e527f1c7e1741",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5c778496277721dc7ac26f5c33a0cfec443e512a8d8cbc1b6c4e527f1c7e1741",
+                    "hash" : "0x5c778496277721dc7ac26f5c33a0cfec443e512a8d8cbc1b6c4e527f1c7e1741",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5c778496277721dc7ac26f5c33a0cfec443e512a8d8cbc1b6c4e527f1c7e1741",
+                    "hash" : "0x5c778496277721dc7ac26f5c33a0cfec443e512a8d8cbc1b6c4e527f1c7e1741",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "5c778496277721dc7ac26f5c33a0cfec443e512a8d8cbc1b6c4e527f1c7e1741",
+                    "hash" : "0x5c778496277721dc7ac26f5c33a0cfec443e512a8d8cbc1b6c4e527f1c7e1741",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "5c778496277721dc7ac26f5c33a0cfec443e512a8d8cbc1b6c4e527f1c7e1741",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b595949655558f6771c7798d047d7b5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "181388892"
+                "0x0acfc65c"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest576.json b/GeneralStateTests/stRandom/randomStatetest576.json
index faf0d82b5..5040a0ee3 100644
--- a/GeneralStateTests/stRandom/randomStatetest576.json
+++ b/GeneralStateTests/stRandom/randomStatetest576.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest576" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b9eb731c28b05ecb2edf808265c21744852ae3061758f9351393b9174682d96e",
+                    "hash" : "0xb9eb731c28b05ecb2edf808265c21744852ae3061758f9351393b9174682d96e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b9eb731c28b05ecb2edf808265c21744852ae3061758f9351393b9174682d96e",
+                    "hash" : "0xb9eb731c28b05ecb2edf808265c21744852ae3061758f9351393b9174682d96e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b9eb731c28b05ecb2edf808265c21744852ae3061758f9351393b9174682d96e",
+                    "hash" : "0xb9eb731c28b05ecb2edf808265c21744852ae3061758f9351393b9174682d96e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b9eb731c28b05ecb2edf808265c21744852ae3061758f9351393b9174682d96e",
+                    "hash" : "0xb9eb731c28b05ecb2edf808265c21744852ae3061758f9351393b9174682d96e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b9eb731c28b05ecb2edf808265c21744852ae3061758f9351393b9174682d96e",
+                    "hash" : "0xb9eb731c28b05ecb2edf808265c21744852ae3061758f9351393b9174682d96e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "b9eb731c28b05ecb2edf808265c21744852ae3061758f9351393b9174682d96e",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f0000000000000000000000000000000000000000000000000000000000000000447f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000000086053a0b43890710810651116e1555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,8 +96,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x2dcb28af"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest577.json b/GeneralStateTests/stRandom/randomStatetest577.json
index 897e62588..1381fe2f3 100644
--- a/GeneralStateTests/stRandom/randomStatetest577.json
+++ b/GeneralStateTests/stRandom/randomStatetest577.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest577" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7a21ae0069d20397bb649a8bcb10e0061d06884ffb33e03ceea9a1c55864a054",
+                    "hash" : "0x7a21ae0069d20397bb649a8bcb10e0061d06884ffb33e03ceea9a1c55864a054",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7a21ae0069d20397bb649a8bcb10e0061d06884ffb33e03ceea9a1c55864a054",
+                    "hash" : "0x7a21ae0069d20397bb649a8bcb10e0061d06884ffb33e03ceea9a1c55864a054",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "163335902014459959a25a8fcb030af9691b4a5139a28845031856c22a166150",
+                    "hash" : "0x163335902014459959a25a8fcb030af9691b4a5139a28845031856c22a166150",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "163335902014459959a25a8fcb030af9691b4a5139a28845031856c22a166150",
+                    "hash" : "0x163335902014459959a25a8fcb030af9691b4a5139a28845031856c22a166150",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7a21ae0069d20397bb649a8bcb10e0061d06884ffb33e03ceea9a1c55864a054",
+                    "hash" : "0x7a21ae0069d20397bb649a8bcb10e0061d06884ffb33e03ceea9a1c55864a054",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "b5aeeeeb6122543c3148c6a1642160daf324dc501ba38cb0c1c15472571d804b",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x45414344434244413155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest578.json b/GeneralStateTests/stRandom/randomStatetest578.json
index ae4a71756..269e9a615 100644
--- a/GeneralStateTests/stRandom/randomStatetest578.json
+++ b/GeneralStateTests/stRandom/randomStatetest578.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest578" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f0d52079d7b8754341bed4b5db05d2f3af137f83438f638a188b406d33cc8c58",
+                    "hash" : "0xf0d52079d7b8754341bed4b5db05d2f3af137f83438f638a188b406d33cc8c58",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f0d52079d7b8754341bed4b5db05d2f3af137f83438f638a188b406d33cc8c58",
+                    "hash" : "0xf0d52079d7b8754341bed4b5db05d2f3af137f83438f638a188b406d33cc8c58",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f0d52079d7b8754341bed4b5db05d2f3af137f83438f638a188b406d33cc8c58",
+                    "hash" : "0xf0d52079d7b8754341bed4b5db05d2f3af137f83438f638a188b406d33cc8c58",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f0d52079d7b8754341bed4b5db05d2f3af137f83438f638a188b406d33cc8c58",
+                    "hash" : "0xf0d52079d7b8754341bed4b5db05d2f3af137f83438f638a188b406d33cc8c58",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f0d52079d7b8754341bed4b5db05d2f3af137f83438f638a188b406d33cc8c58",
+                    "hash" : "0xf0d52079d7b8754341bed4b5db05d2f3af137f83438f638a188b406d33cc8c58",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "67230074006cf0475a284a552238e611525750b787814f9ebdfa25f176f5ac6e",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c350457f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff4255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "399078357"
+                "0x17c973d5"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest579.json b/GeneralStateTests/stRandom/randomStatetest579.json
index 4f9cfb6fd..92339a681 100644
--- a/GeneralStateTests/stRandom/randomStatetest579.json
+++ b/GeneralStateTests/stRandom/randomStatetest579.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest579" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "16ffd202e368dc61157e0f816f1bc72aad3322589650a7c2af920c53db7ace74",
+                    "hash" : "0x16ffd202e368dc61157e0f816f1bc72aad3322589650a7c2af920c53db7ace74",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "16ffd202e368dc61157e0f816f1bc72aad3322589650a7c2af920c53db7ace74",
+                    "hash" : "0x16ffd202e368dc61157e0f816f1bc72aad3322589650a7c2af920c53db7ace74",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "25f892418fe7e1ae2d2e5ad784206760c69df950cd5e6ad1cad656d6114c2045",
+                    "hash" : "0x25f892418fe7e1ae2d2e5ad784206760c69df950cd5e6ad1cad656d6114c2045",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "25f892418fe7e1ae2d2e5ad784206760c69df950cd5e6ad1cad656d6114c2045",
+                    "hash" : "0x25f892418fe7e1ae2d2e5ad784206760c69df950cd5e6ad1cad656d6114c2045",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "16ffd202e368dc61157e0f816f1bc72aad3322589650a7c2af920c53db7ace74",
+                    "hash" : "0x16ffd202e368dc61157e0f816f1bc72aad3322589650a7c2af920c53db7ace74",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "25f892418fe7e1ae2d2e5ad784206760c69df950cd5e6ad1cad656d6114c2045",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c350f2075b67c755",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1929468879"
+                "0x73015bcf"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest58.json b/GeneralStateTests/stRandom/randomStatetest58.json
index ff2e93ebb..d3313c8d4 100644
--- a/GeneralStateTests/stRandom/randomStatetest58.json
+++ b/GeneralStateTests/stRandom/randomStatetest58.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest58" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "38658a4c7f87af6d01d2cbb5535e789423324c3012493330e0ca0dcc88cfd039",
+                    "hash" : "0x38658a4c7f87af6d01d2cbb5535e789423324c3012493330e0ca0dcc88cfd039",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "38658a4c7f87af6d01d2cbb5535e789423324c3012493330e0ca0dcc88cfd039",
+                    "hash" : "0x38658a4c7f87af6d01d2cbb5535e789423324c3012493330e0ca0dcc88cfd039",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "38658a4c7f87af6d01d2cbb5535e789423324c3012493330e0ca0dcc88cfd039",
+                    "hash" : "0x38658a4c7f87af6d01d2cbb5535e789423324c3012493330e0ca0dcc88cfd039",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "38658a4c7f87af6d01d2cbb5535e789423324c3012493330e0ca0dcc88cfd039",
+                    "hash" : "0x38658a4c7f87af6d01d2cbb5535e789423324c3012493330e0ca0dcc88cfd039",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "38658a4c7f87af6d01d2cbb5535e789423324c3012493330e0ca0dcc88cfd039",
+                    "hash" : "0x38658a4c7f87af6d01d2cbb5535e789423324c3012493330e0ca0dcc88cfd039",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "38658a4c7f87af6d01d2cbb5535e789423324c3012493330e0ca0dcc88cfd039",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350367ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe096902947d567838719e97f30160005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "520154270"
+                "0x1f00ec9e"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest580.json b/GeneralStateTests/stRandom/randomStatetest580.json
index a7ac7015b..2f96f4261 100644
--- a/GeneralStateTests/stRandom/randomStatetest580.json
+++ b/GeneralStateTests/stRandom/randomStatetest580.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest580" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "fb32a0660bf4ce6df3bf89548a2033d4b69e7d5403314653c05cb087a033981a",
+                    "hash" : "0xfb32a0660bf4ce6df3bf89548a2033d4b69e7d5403314653c05cb087a033981a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "fb32a0660bf4ce6df3bf89548a2033d4b69e7d5403314653c05cb087a033981a",
+                    "hash" : "0xfb32a0660bf4ce6df3bf89548a2033d4b69e7d5403314653c05cb087a033981a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "fb32a0660bf4ce6df3bf89548a2033d4b69e7d5403314653c05cb087a033981a",
+                    "hash" : "0xfb32a0660bf4ce6df3bf89548a2033d4b69e7d5403314653c05cb087a033981a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "fb32a0660bf4ce6df3bf89548a2033d4b69e7d5403314653c05cb087a033981a",
+                    "hash" : "0xfb32a0660bf4ce6df3bf89548a2033d4b69e7d5403314653c05cb087a033981a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "fb32a0660bf4ce6df3bf89548a2033d4b69e7d5403314653c05cb087a033981a",
+                    "hash" : "0xfb32a0660bf4ce6df3bf89548a2033d4b69e7d5403314653c05cb087a033981a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "fb32a0660bf4ce6df3bf89548a2033d4b69e7d5403314653c05cb087a033981a",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000000000000000000000000000457f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000006f4640879d18777b953a209836379a305560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "741737505"
+                "0x2c360421"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest581.json b/GeneralStateTests/stRandom/randomStatetest581.json
index 40619faa7..7d9a04fba 100644
--- a/GeneralStateTests/stRandom/randomStatetest581.json
+++ b/GeneralStateTests/stRandom/randomStatetest581.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest581" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d9ae844ed4fde2c8a6bc0bd0b85f51a204bf702a6402e9685e064d7eac450345",
+                    "hash" : "0xd9ae844ed4fde2c8a6bc0bd0b85f51a204bf702a6402e9685e064d7eac450345",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d9ae844ed4fde2c8a6bc0bd0b85f51a204bf702a6402e9685e064d7eac450345",
+                    "hash" : "0xd9ae844ed4fde2c8a6bc0bd0b85f51a204bf702a6402e9685e064d7eac450345",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "d3fbc8e77ebe7322fa9959282a5d47153a941a2e6af71e591492b84eb24d52af",
+                    "hash" : "0xd3fbc8e77ebe7322fa9959282a5d47153a941a2e6af71e591492b84eb24d52af",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "d3fbc8e77ebe7322fa9959282a5d47153a941a2e6af71e591492b84eb24d52af",
+                    "hash" : "0xd3fbc8e77ebe7322fa9959282a5d47153a941a2e6af71e591492b84eb24d52af",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d9ae844ed4fde2c8a6bc0bd0b85f51a204bf702a6402e9685e064d7eac450345",
+                    "hash" : "0xd9ae844ed4fde2c8a6bc0bd0b85f51a204bf702a6402e9685e064d7eac450345",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "339fdbd5dbc1ce5d5ec495fc334259a50c8b9ec9490d7019a10cfb45301d6011",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000000000000000000000000000000000000000000001037f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff44920907ff7e7d701260005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1563515411"
+                "0x5d315a13"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest582.json b/GeneralStateTests/stRandom/randomStatetest582.json
index d4caafc29..6af5089c8 100644
--- a/GeneralStateTests/stRandom/randomStatetest582.json
+++ b/GeneralStateTests/stRandom/randomStatetest582.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest582" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "cb0b378007773f83910fc6d961638b346e88bd701d4bb53909f668245000c803",
+                    "hash" : "0xcb0b378007773f83910fc6d961638b346e88bd701d4bb53909f668245000c803",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "cb0b378007773f83910fc6d961638b346e88bd701d4bb53909f668245000c803",
+                    "hash" : "0xcb0b378007773f83910fc6d961638b346e88bd701d4bb53909f668245000c803",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "cb0b378007773f83910fc6d961638b346e88bd701d4bb53909f668245000c803",
+                    "hash" : "0xcb0b378007773f83910fc6d961638b346e88bd701d4bb53909f668245000c803",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "cb0b378007773f83910fc6d961638b346e88bd701d4bb53909f668245000c803",
+                    "hash" : "0xcb0b378007773f83910fc6d961638b346e88bd701d4bb53909f668245000c803",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "cb0b378007773f83910fc6d961638b346e88bd701d4bb53909f668245000c803",
+                    "hash" : "0xcb0b378007773f83910fc6d961638b346e88bd701d4bb53909f668245000c803",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "cb0b378007773f83910fc6d961638b346e88bd701d4bb53909f668245000c803",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5417f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000045086201771880f35560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1969973721"
+                "0x756b69d9"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest583.json b/GeneralStateTests/stRandom/randomStatetest583.json
index 880296ff0..d6ddba198 100644
--- a/GeneralStateTests/stRandom/randomStatetest583.json
+++ b/GeneralStateTests/stRandom/randomStatetest583.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest583" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
             {
@@ -24,7 +24,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "fcf3cdf39852d7d72a5df5518835ee722da3bc6b8c6789e02e79c470c44df3c5",
+                    "hash" : "0xfcf3cdf39852d7d72a5df5518835ee722da3bc6b8c6789e02e79c470c44df3c5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "fcf3cdf39852d7d72a5df5518835ee722da3bc6b8c6789e02e79c470c44df3c5",
+                    "hash" : "0xfcf3cdf39852d7d72a5df5518835ee722da3bc6b8c6789e02e79c470c44df3c5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "fcf3cdf39852d7d72a5df5518835ee722da3bc6b8c6789e02e79c470c44df3c5",
+                    "hash" : "0xfcf3cdf39852d7d72a5df5518835ee722da3bc6b8c6789e02e79c470c44df3c5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "fcf3cdf39852d7d72a5df5518835ee722da3bc6b8c6789e02e79c470c44df3c5",
+                    "hash" : "0xfcf3cdf39852d7d72a5df5518835ee722da3bc6b8c6789e02e79c470c44df3c5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -64,7 +64,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "fcf3cdf39852d7d72a5df5518835ee722da3bc6b8c6789e02e79c470c44df3c5",
+                    "hash" : "0xfcf3cdf39852d7d72a5df5518835ee722da3bc6b8c6789e02e79c470c44df3c5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -75,23 +75,23 @@
         },
         "postStateRoot" : "fcf3cdf39852d7d72a5df5518835ee722da3bc6b8c6789e02e79c470c44df3c5",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5425162327c5536a36af3809c3a8f396660005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -106,10 +106,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1472402212"
+                "0x57c31324"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest584.json b/GeneralStateTests/stRandom/randomStatetest584.json
index 9da010df3..658d0116c 100644
--- a/GeneralStateTests/stRandom/randomStatetest584.json
+++ b/GeneralStateTests/stRandom/randomStatetest584.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest584" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "5a39131896212a9849d03dc260d50d42d876c8cc5bf483b0b5176992979a3e66",
+                    "hash" : "0x5a39131896212a9849d03dc260d50d42d876c8cc5bf483b0b5176992979a3e66",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "5a39131896212a9849d03dc260d50d42d876c8cc5bf483b0b5176992979a3e66",
+                    "hash" : "0x5a39131896212a9849d03dc260d50d42d876c8cc5bf483b0b5176992979a3e66",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5a39131896212a9849d03dc260d50d42d876c8cc5bf483b0b5176992979a3e66",
+                    "hash" : "0x5a39131896212a9849d03dc260d50d42d876c8cc5bf483b0b5176992979a3e66",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5a39131896212a9849d03dc260d50d42d876c8cc5bf483b0b5176992979a3e66",
+                    "hash" : "0x5a39131896212a9849d03dc260d50d42d876c8cc5bf483b0b5176992979a3e66",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "5a39131896212a9849d03dc260d50d42d876c8cc5bf483b0b5176992979a3e66",
+                    "hash" : "0x5a39131896212a9849d03dc260d50d42d876c8cc5bf483b0b5176992979a3e66",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "5a39131896212a9849d03dc260d50d42d876c8cc5bf483b0b5176992979a3e66",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe96921909335560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "352685837"
+                "0x15058f0d"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest585.json b/GeneralStateTests/stRandom/randomStatetest585.json
index f6852ba20..28848cf6b 100644
--- a/GeneralStateTests/stRandom/randomStatetest585.json
+++ b/GeneralStateTests/stRandom/randomStatetest585.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest585" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f1c347fdb630a79c4abbea6110b2ec2be15f193f4fb48c4032a3216705a50462",
+                    "hash" : "0xf1c347fdb630a79c4abbea6110b2ec2be15f193f4fb48c4032a3216705a50462",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f1c347fdb630a79c4abbea6110b2ec2be15f193f4fb48c4032a3216705a50462",
+                    "hash" : "0xf1c347fdb630a79c4abbea6110b2ec2be15f193f4fb48c4032a3216705a50462",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f1c347fdb630a79c4abbea6110b2ec2be15f193f4fb48c4032a3216705a50462",
+                    "hash" : "0xf1c347fdb630a79c4abbea6110b2ec2be15f193f4fb48c4032a3216705a50462",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f1c347fdb630a79c4abbea6110b2ec2be15f193f4fb48c4032a3216705a50462",
+                    "hash" : "0xf1c347fdb630a79c4abbea6110b2ec2be15f193f4fb48c4032a3216705a50462",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f1c347fdb630a79c4abbea6110b2ec2be15f193f4fb48c4032a3216705a50462",
+                    "hash" : "0xf1c347fdb630a79c4abbea6110b2ec2be15f193f4fb48c4032a3216705a50462",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "f1c347fdb630a79c4abbea6110b2ec2be15f193f4fb48c4032a3216705a50462",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe55",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "380785530"
+                "0x16b2537a"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest586.json b/GeneralStateTests/stRandom/randomStatetest586.json
index 8efc6083f..0b9d72e5d 100644
--- a/GeneralStateTests/stRandom/randomStatetest586.json
+++ b/GeneralStateTests/stRandom/randomStatetest586.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest586" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "0bbba50dc67a22c800afca3681235e773e0a483d958e94d96a048237c13c069e",
+                    "hash" : "0x0bbba50dc67a22c800afca3681235e773e0a483d958e94d96a048237c13c069e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "0bbba50dc67a22c800afca3681235e773e0a483d958e94d96a048237c13c069e",
+                    "hash" : "0x0bbba50dc67a22c800afca3681235e773e0a483d958e94d96a048237c13c069e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "0bbba50dc67a22c800afca3681235e773e0a483d958e94d96a048237c13c069e",
+                    "hash" : "0x0bbba50dc67a22c800afca3681235e773e0a483d958e94d96a048237c13c069e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "0bbba50dc67a22c800afca3681235e773e0a483d958e94d96a048237c13c069e",
+                    "hash" : "0x0bbba50dc67a22c800afca3681235e773e0a483d958e94d96a048237c13c069e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0bbba50dc67a22c800afca3681235e773e0a483d958e94d96a048237c13c069e",
+                    "hash" : "0x0bbba50dc67a22c800afca3681235e773e0a483d958e94d96a048237c13c069e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "0bbba50dc67a22c800afca3681235e773e0a483d958e94d96a048237c13c069e",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000013760005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1708929612"
+                "0x65dc324c"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest587.json b/GeneralStateTests/stRandom/randomStatetest587.json
index 38786685d..44973ad0a 100644
--- a/GeneralStateTests/stRandom/randomStatetest587.json
+++ b/GeneralStateTests/stRandom/randomStatetest587.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest587" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "ab2be72f36118857a8fc55a6d65fb9a4d9326154ede03074eacdb938bebfd38c",
+                    "hash" : "0xab2be72f36118857a8fc55a6d65fb9a4d9326154ede03074eacdb938bebfd38c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "ab2be72f36118857a8fc55a6d65fb9a4d9326154ede03074eacdb938bebfd38c",
+                    "hash" : "0xab2be72f36118857a8fc55a6d65fb9a4d9326154ede03074eacdb938bebfd38c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "ab2be72f36118857a8fc55a6d65fb9a4d9326154ede03074eacdb938bebfd38c",
+                    "hash" : "0xab2be72f36118857a8fc55a6d65fb9a4d9326154ede03074eacdb938bebfd38c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ab2be72f36118857a8fc55a6d65fb9a4d9326154ede03074eacdb938bebfd38c",
+                    "hash" : "0xab2be72f36118857a8fc55a6d65fb9a4d9326154ede03074eacdb938bebfd38c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "ab2be72f36118857a8fc55a6d65fb9a4d9326154ede03074eacdb938bebfd38c",
+                    "hash" : "0xab2be72f36118857a8fc55a6d65fb9a4d9326154ede03074eacdb938bebfd38c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "ab2be72f36118857a8fc55a6d65fb9a4d9326154ede03074eacdb938bebfd38c",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350117f0000000000000000000000000000000000000000000000000000000000000001457f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b56f8b7152a3958a923c1665b27557089a5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "291521552"
+                "0x11604410"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest588.json b/GeneralStateTests/stRandom/randomStatetest588.json
index 3e428b1d4..5d667d3ad 100644
--- a/GeneralStateTests/stRandom/randomStatetest588.json
+++ b/GeneralStateTests/stRandom/randomStatetest588.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest588" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "316fb0f5d9884ff898ad6dc22f5c98a58ac96b64d3f861db2f837337e1b0e36c",
+                    "hash" : "0x316fb0f5d9884ff898ad6dc22f5c98a58ac96b64d3f861db2f837337e1b0e36c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "316fb0f5d9884ff898ad6dc22f5c98a58ac96b64d3f861db2f837337e1b0e36c",
+                    "hash" : "0x316fb0f5d9884ff898ad6dc22f5c98a58ac96b64d3f861db2f837337e1b0e36c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "316fb0f5d9884ff898ad6dc22f5c98a58ac96b64d3f861db2f837337e1b0e36c",
+                    "hash" : "0x316fb0f5d9884ff898ad6dc22f5c98a58ac96b64d3f861db2f837337e1b0e36c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "316fb0f5d9884ff898ad6dc22f5c98a58ac96b64d3f861db2f837337e1b0e36c",
+                    "hash" : "0x316fb0f5d9884ff898ad6dc22f5c98a58ac96b64d3f861db2f837337e1b0e36c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "316fb0f5d9884ff898ad6dc22f5c98a58ac96b64d3f861db2f837337e1b0e36c",
+                    "hash" : "0x316fb0f5d9884ff898ad6dc22f5c98a58ac96b64d3f861db2f837337e1b0e36c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "c5234e931572e9a3fe85ccb630ba6773ba26df20b6fe467616fec63b7146da75",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff41437f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff43063760005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1725348983"
+                "0x66d6bc77"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest589.json b/GeneralStateTests/stRandom/randomStatetest589.json
index 4fbc8515d..5c7d52ae7 100644
--- a/GeneralStateTests/stRandom/randomStatetest589.json
+++ b/GeneralStateTests/stRandom/randomStatetest589.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest589" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "23bb4bd52c3e5cc3fee02d368f964f87b150387d4ef54939fa02bb001dd359d1",
+                    "hash" : "0x23bb4bd52c3e5cc3fee02d368f964f87b150387d4ef54939fa02bb001dd359d1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "23bb4bd52c3e5cc3fee02d368f964f87b150387d4ef54939fa02bb001dd359d1",
+                    "hash" : "0x23bb4bd52c3e5cc3fee02d368f964f87b150387d4ef54939fa02bb001dd359d1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "23bb4bd52c3e5cc3fee02d368f964f87b150387d4ef54939fa02bb001dd359d1",
+                    "hash" : "0x23bb4bd52c3e5cc3fee02d368f964f87b150387d4ef54939fa02bb001dd359d1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "23bb4bd52c3e5cc3fee02d368f964f87b150387d4ef54939fa02bb001dd359d1",
+                    "hash" : "0x23bb4bd52c3e5cc3fee02d368f964f87b150387d4ef54939fa02bb001dd359d1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "23bb4bd52c3e5cc3fee02d368f964f87b150387d4ef54939fa02bb001dd359d1",
+                    "hash" : "0x23bb4bd52c3e5cc3fee02d368f964f87b150387d4ef54939fa02bb001dd359d1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "23bb4bd52c3e5cc3fee02d368f964f87b150387d4ef54939fa02bb001dd359d1",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x427f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff583481f36a85646d53671639175b940860005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1485632"
+                "0x16ab40"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest59.json b/GeneralStateTests/stRandom/randomStatetest59.json
index aba0431a3..3cdf874e8 100644
--- a/GeneralStateTests/stRandom/randomStatetest59.json
+++ b/GeneralStateTests/stRandom/randomStatetest59.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest59" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c043c5bcd60744adcbb4d54193d1eabbe2e61932d1580eb21c478b99b4359ed8",
+                    "hash" : "0xc043c5bcd60744adcbb4d54193d1eabbe2e61932d1580eb21c478b99b4359ed8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c043c5bcd60744adcbb4d54193d1eabbe2e61932d1580eb21c478b99b4359ed8",
+                    "hash" : "0xc043c5bcd60744adcbb4d54193d1eabbe2e61932d1580eb21c478b99b4359ed8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "c043c5bcd60744adcbb4d54193d1eabbe2e61932d1580eb21c478b99b4359ed8",
+                    "hash" : "0xc043c5bcd60744adcbb4d54193d1eabbe2e61932d1580eb21c478b99b4359ed8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c043c5bcd60744adcbb4d54193d1eabbe2e61932d1580eb21c478b99b4359ed8",
+                    "hash" : "0xc043c5bcd60744adcbb4d54193d1eabbe2e61932d1580eb21c478b99b4359ed8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c043c5bcd60744adcbb4d54193d1eabbe2e61932d1580eb21c478b99b4359ed8",
+                    "hash" : "0xc043c5bcd60744adcbb4d54193d1eabbe2e61932d1580eb21c478b99b4359ed8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "c043c5bcd60744adcbb4d54193d1eabbe2e61932d1580eb21c478b99b4359ed8",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0208673a06756406548b9955",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "630320886"
+                "0x2591eef6"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest590.json b/GeneralStateTests/stRandom/randomStatetest590.json
index 3bd8a8218..4eba3f769 100644
--- a/GeneralStateTests/stRandom/randomStatetest590.json
+++ b/GeneralStateTests/stRandom/randomStatetest590.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest590" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f4261660f8ad1eb378dd3842658b12fd59572fd59d60ff7e2e516832845d7455",
+                    "hash" : "0xf4261660f8ad1eb378dd3842658b12fd59572fd59d60ff7e2e516832845d7455",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f4261660f8ad1eb378dd3842658b12fd59572fd59d60ff7e2e516832845d7455",
+                    "hash" : "0xf4261660f8ad1eb378dd3842658b12fd59572fd59d60ff7e2e516832845d7455",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f4261660f8ad1eb378dd3842658b12fd59572fd59d60ff7e2e516832845d7455",
+                    "hash" : "0xf4261660f8ad1eb378dd3842658b12fd59572fd59d60ff7e2e516832845d7455",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f4261660f8ad1eb378dd3842658b12fd59572fd59d60ff7e2e516832845d7455",
+                    "hash" : "0xf4261660f8ad1eb378dd3842658b12fd59572fd59d60ff7e2e516832845d7455",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f4261660f8ad1eb378dd3842658b12fd59572fd59d60ff7e2e516832845d7455",
+                    "hash" : "0xf4261660f8ad1eb378dd3842658b12fd59572fd59d60ff7e2e516832845d7455",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "f4261660f8ad1eb378dd3842658b12fd59572fd59d60ff7e2e516832845d7455",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x447f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000006fa05a3119539f6760654232763893405560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "54450742"
+                "0x033eda36"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest591.json b/GeneralStateTests/stRandom/randomStatetest591.json
index 3d97828d1..10948ea9d 100644
--- a/GeneralStateTests/stRandom/randomStatetest591.json
+++ b/GeneralStateTests/stRandom/randomStatetest591.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest591" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "ebdefee8bd9e253302d37859d54a3092777148cc475158ccbe54fd900cf8531c",
+                    "hash" : "0xebdefee8bd9e253302d37859d54a3092777148cc475158ccbe54fd900cf8531c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "ebdefee8bd9e253302d37859d54a3092777148cc475158ccbe54fd900cf8531c",
+                    "hash" : "0xebdefee8bd9e253302d37859d54a3092777148cc475158ccbe54fd900cf8531c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "576f7d7b1a8ec643bb0405183cf6c183ecf088a60820306bc4d48c91ad1e34bb",
+                    "hash" : "0x576f7d7b1a8ec643bb0405183cf6c183ecf088a60820306bc4d48c91ad1e34bb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "576f7d7b1a8ec643bb0405183cf6c183ecf088a60820306bc4d48c91ad1e34bb",
+                    "hash" : "0x576f7d7b1a8ec643bb0405183cf6c183ecf088a60820306bc4d48c91ad1e34bb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "ebdefee8bd9e253302d37859d54a3092777148cc475158ccbe54fd900cf8531c",
+                    "hash" : "0xebdefee8bd9e253302d37859d54a3092777148cc475158ccbe54fd900cf8531c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "576f7d7b1a8ec643bb0405183cf6c183ecf088a60820306bc4d48c91ad1e34bb",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x4444424131424055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest592.json b/GeneralStateTests/stRandom/randomStatetest592.json
index b3f3d8f34..57b2d88a6 100644
--- a/GeneralStateTests/stRandom/randomStatetest592.json
+++ b/GeneralStateTests/stRandom/randomStatetest592.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest592" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b2ad099dcc79bdf1075ab0a17556364350bf8b6691ca4f5065dba6bfabde9fde",
+                    "hash" : "0xb2ad099dcc79bdf1075ab0a17556364350bf8b6691ca4f5065dba6bfabde9fde",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b2ad099dcc79bdf1075ab0a17556364350bf8b6691ca4f5065dba6bfabde9fde",
+                    "hash" : "0xb2ad099dcc79bdf1075ab0a17556364350bf8b6691ca4f5065dba6bfabde9fde",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b2ad099dcc79bdf1075ab0a17556364350bf8b6691ca4f5065dba6bfabde9fde",
+                    "hash" : "0xb2ad099dcc79bdf1075ab0a17556364350bf8b6691ca4f5065dba6bfabde9fde",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b2ad099dcc79bdf1075ab0a17556364350bf8b6691ca4f5065dba6bfabde9fde",
+                    "hash" : "0xb2ad099dcc79bdf1075ab0a17556364350bf8b6691ca4f5065dba6bfabde9fde",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b2ad099dcc79bdf1075ab0a17556364350bf8b6691ca4f5065dba6bfabde9fde",
+                    "hash" : "0xb2ad099dcc79bdf1075ab0a17556364350bf8b6691ca4f5065dba6bfabde9fde",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "b2ad099dcc79bdf1075ab0a17556364350bf8b6691ca4f5065dba6bfabde9fde",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0960005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1664737509"
+                "0x6339e0e5"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest593.json b/GeneralStateTests/stRandom/randomStatetest593.json
index f1232ccea..2124b5b16 100644
--- a/GeneralStateTests/stRandom/randomStatetest593.json
+++ b/GeneralStateTests/stRandom/randomStatetest593.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest593" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9fa079d0bf7ed236b74d931320f40c10377c0546c7b5bd59eb7cc57c9042635b",
+                    "hash" : "0x9fa079d0bf7ed236b74d931320f40c10377c0546c7b5bd59eb7cc57c9042635b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9fa079d0bf7ed236b74d931320f40c10377c0546c7b5bd59eb7cc57c9042635b",
+                    "hash" : "0x9fa079d0bf7ed236b74d931320f40c10377c0546c7b5bd59eb7cc57c9042635b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9fa079d0bf7ed236b74d931320f40c10377c0546c7b5bd59eb7cc57c9042635b",
+                    "hash" : "0x9fa079d0bf7ed236b74d931320f40c10377c0546c7b5bd59eb7cc57c9042635b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9fa079d0bf7ed236b74d931320f40c10377c0546c7b5bd59eb7cc57c9042635b",
+                    "hash" : "0x9fa079d0bf7ed236b74d931320f40c10377c0546c7b5bd59eb7cc57c9042635b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9fa079d0bf7ed236b74d931320f40c10377c0546c7b5bd59eb7cc57c9042635b",
+                    "hash" : "0x9fa079d0bf7ed236b74d931320f40c10377c0546c7b5bd59eb7cc57c9042635b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "9fa079d0bf7ed236b74d931320f40c10377c0546c7b5bd59eb7cc57c9042635b",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f0000000000000000000000000000000000000000000000000000000000000001407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350427f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b56f81106e9d739b9e608e8b9c8308977c5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "791780514"
+                "0x2f319ca2"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest594.json b/GeneralStateTests/stRandom/randomStatetest594.json
index d16a62f47..2d5d01070 100644
--- a/GeneralStateTests/stRandom/randomStatetest594.json
+++ b/GeneralStateTests/stRandom/randomStatetest594.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest594" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "0a9d9e310775fabc4ea825f9ffe3ba22120adb9bc6d65990e4cbad50616513de",
+                    "hash" : "0x0a9d9e310775fabc4ea825f9ffe3ba22120adb9bc6d65990e4cbad50616513de",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "0a9d9e310775fabc4ea825f9ffe3ba22120adb9bc6d65990e4cbad50616513de",
+                    "hash" : "0x0a9d9e310775fabc4ea825f9ffe3ba22120adb9bc6d65990e4cbad50616513de",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "0a9d9e310775fabc4ea825f9ffe3ba22120adb9bc6d65990e4cbad50616513de",
+                    "hash" : "0x0a9d9e310775fabc4ea825f9ffe3ba22120adb9bc6d65990e4cbad50616513de",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "0a9d9e310775fabc4ea825f9ffe3ba22120adb9bc6d65990e4cbad50616513de",
+                    "hash" : "0x0a9d9e310775fabc4ea825f9ffe3ba22120adb9bc6d65990e4cbad50616513de",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0a9d9e310775fabc4ea825f9ffe3ba22120adb9bc6d65990e4cbad50616513de",
+                    "hash" : "0x0a9d9e310775fabc4ea825f9ffe3ba22120adb9bc6d65990e4cbad50616513de",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "01f4c03556b539c434410ca0d28c85b6b71b0b8511ded2d1502911918d2bad06",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000010000000000000000000000000000000000000000457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe950955",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1174931516"
+                "0x4608083c"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest595.json b/GeneralStateTests/stRandom/randomStatetest595.json
index 34f45954f..8270fee55 100644
--- a/GeneralStateTests/stRandom/randomStatetest595.json
+++ b/GeneralStateTests/stRandom/randomStatetest595.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest595" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "4babdb0b6b8a816784084f6ee5c5c45bd57b74c101066e837a5b8a948c63660b",
+                    "hash" : "0x4babdb0b6b8a816784084f6ee5c5c45bd57b74c101066e837a5b8a948c63660b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "4babdb0b6b8a816784084f6ee5c5c45bd57b74c101066e837a5b8a948c63660b",
+                    "hash" : "0x4babdb0b6b8a816784084f6ee5c5c45bd57b74c101066e837a5b8a948c63660b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4babdb0b6b8a816784084f6ee5c5c45bd57b74c101066e837a5b8a948c63660b",
+                    "hash" : "0x4babdb0b6b8a816784084f6ee5c5c45bd57b74c101066e837a5b8a948c63660b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4babdb0b6b8a816784084f6ee5c5c45bd57b74c101066e837a5b8a948c63660b",
+                    "hash" : "0x4babdb0b6b8a816784084f6ee5c5c45bd57b74c101066e837a5b8a948c63660b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "4babdb0b6b8a816784084f6ee5c5c45bd57b74c101066e837a5b8a948c63660b",
+                    "hash" : "0x4babdb0b6b8a816784084f6ee5c5c45bd57b74c101066e837a5b8a948c63660b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "4babdb0b6b8a816784084f6ee5c5c45bd57b74c101066e837a5b8a948c63660b",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe030960005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "783787881"
+                "0x2eb7a769"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest596.json b/GeneralStateTests/stRandom/randomStatetest596.json
index d12731216..ef4eee11a 100644
--- a/GeneralStateTests/stRandom/randomStatetest596.json
+++ b/GeneralStateTests/stRandom/randomStatetest596.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest596" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "17b1ec78d084127e1f8b5713056b43d3c0b0460d8188165bb6279c13ba996ac1",
+                    "hash" : "0x17b1ec78d084127e1f8b5713056b43d3c0b0460d8188165bb6279c13ba996ac1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "17b1ec78d084127e1f8b5713056b43d3c0b0460d8188165bb6279c13ba996ac1",
+                    "hash" : "0x17b1ec78d084127e1f8b5713056b43d3c0b0460d8188165bb6279c13ba996ac1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "98cf158e9172debe166cb63e40968745833a537289a040728c0302725312bf17",
+                    "hash" : "0x98cf158e9172debe166cb63e40968745833a537289a040728c0302725312bf17",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "98cf158e9172debe166cb63e40968745833a537289a040728c0302725312bf17",
+                    "hash" : "0x98cf158e9172debe166cb63e40968745833a537289a040728c0302725312bf17",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "17b1ec78d084127e1f8b5713056b43d3c0b0460d8188165bb6279c13ba996ac1",
+                    "hash" : "0x17b1ec78d084127e1f8b5713056b43d3c0b0460d8188165bb6279c13ba996ac1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "98cf158e9172debe166cb63e40968745833a537289a040728c0302725312bf17",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001317f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000006f7066a3507f6e0906539456383065205560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "765064321"
+                "0x2d99f481"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest597.json b/GeneralStateTests/stRandom/randomStatetest597.json
index 302ce4748..178febebf 100644
--- a/GeneralStateTests/stRandom/randomStatetest597.json
+++ b/GeneralStateTests/stRandom/randomStatetest597.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest597" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "5fa1c5ec4d844c9b52a412710cd5a21585ec367319aa37c7cfbf8d1207f46afb",
+                    "hash" : "0x5fa1c5ec4d844c9b52a412710cd5a21585ec367319aa37c7cfbf8d1207f46afb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "5fa1c5ec4d844c9b52a412710cd5a21585ec367319aa37c7cfbf8d1207f46afb",
+                    "hash" : "0x5fa1c5ec4d844c9b52a412710cd5a21585ec367319aa37c7cfbf8d1207f46afb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5fa1c5ec4d844c9b52a412710cd5a21585ec367319aa37c7cfbf8d1207f46afb",
+                    "hash" : "0x5fa1c5ec4d844c9b52a412710cd5a21585ec367319aa37c7cfbf8d1207f46afb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5fa1c5ec4d844c9b52a412710cd5a21585ec367319aa37c7cfbf8d1207f46afb",
+                    "hash" : "0x5fa1c5ec4d844c9b52a412710cd5a21585ec367319aa37c7cfbf8d1207f46afb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "5fa1c5ec4d844c9b52a412710cd5a21585ec367319aa37c7cfbf8d1207f46afb",
+                    "hash" : "0x5fa1c5ec4d844c9b52a412710cd5a21585ec367319aa37c7cfbf8d1207f46afb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "5fa1c5ec4d844c9b52a412710cd5a21585ec367319aa37c7cfbf8d1207f46afb",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5967f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff3a7e737d40070a156482930a0875",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,8 +96,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x70062d18"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest598.json b/GeneralStateTests/stRandom/randomStatetest598.json
index 28c41fd93..1eb952a1f 100644
--- a/GeneralStateTests/stRandom/randomStatetest598.json
+++ b/GeneralStateTests/stRandom/randomStatetest598.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest598" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f79ccaad3e136eac2d50c837cd8463dc0ec966e69e9864e3d032671c0605683b",
+                    "hash" : "0xf79ccaad3e136eac2d50c837cd8463dc0ec966e69e9864e3d032671c0605683b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f79ccaad3e136eac2d50c837cd8463dc0ec966e69e9864e3d032671c0605683b",
+                    "hash" : "0xf79ccaad3e136eac2d50c837cd8463dc0ec966e69e9864e3d032671c0605683b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f79ccaad3e136eac2d50c837cd8463dc0ec966e69e9864e3d032671c0605683b",
+                    "hash" : "0xf79ccaad3e136eac2d50c837cd8463dc0ec966e69e9864e3d032671c0605683b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f79ccaad3e136eac2d50c837cd8463dc0ec966e69e9864e3d032671c0605683b",
+                    "hash" : "0xf79ccaad3e136eac2d50c837cd8463dc0ec966e69e9864e3d032671c0605683b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f79ccaad3e136eac2d50c837cd8463dc0ec966e69e9864e3d032671c0605683b",
+                    "hash" : "0xf79ccaad3e136eac2d50c837cd8463dc0ec966e69e9864e3d032671c0605683b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "f79ccaad3e136eac2d50c837cd8463dc0ec966e69e9864e3d032671c0605683b",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000407f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f48069f886d448a696184f3659803305560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1517627839"
+                "0x5a7529bf"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest599.json b/GeneralStateTests/stRandom/randomStatetest599.json
index 04059c172..b41580346 100644
--- a/GeneralStateTests/stRandom/randomStatetest599.json
+++ b/GeneralStateTests/stRandom/randomStatetest599.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest599" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a6d0e453f53257bdf638168cf08866f7bae1331d93c36349167af3943107a4bb",
+                    "hash" : "0xa6d0e453f53257bdf638168cf08866f7bae1331d93c36349167af3943107a4bb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a6d0e453f53257bdf638168cf08866f7bae1331d93c36349167af3943107a4bb",
+                    "hash" : "0xa6d0e453f53257bdf638168cf08866f7bae1331d93c36349167af3943107a4bb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a6d0e453f53257bdf638168cf08866f7bae1331d93c36349167af3943107a4bb",
+                    "hash" : "0xa6d0e453f53257bdf638168cf08866f7bae1331d93c36349167af3943107a4bb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a6d0e453f53257bdf638168cf08866f7bae1331d93c36349167af3943107a4bb",
+                    "hash" : "0xa6d0e453f53257bdf638168cf08866f7bae1331d93c36349167af3943107a4bb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a6d0e453f53257bdf638168cf08866f7bae1331d93c36349167af3943107a4bb",
+                    "hash" : "0xa6d0e453f53257bdf638168cf08866f7bae1331d93c36349167af3943107a4bb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "a6d0e453f53257bdf638168cf08866f7bae1331d93c36349167af3943107a4bb",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f8d6c60440a44449372068a976a83825560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1108427958"
+                "0x421144b6"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest6.json b/GeneralStateTests/stRandom/randomStatetest6.json
index 81bc27582..497397e43 100644
--- a/GeneralStateTests/stRandom/randomStatetest6.json
+++ b/GeneralStateTests/stRandom/randomStatetest6.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest6" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "558fab7086ee6b74783c2b9fe5ce43f60abef999aedf63ba3d78d0f44b4c8bc7",
+                    "hash" : "0x558fab7086ee6b74783c2b9fe5ce43f60abef999aedf63ba3d78d0f44b4c8bc7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "558fab7086ee6b74783c2b9fe5ce43f60abef999aedf63ba3d78d0f44b4c8bc7",
+                    "hash" : "0x558fab7086ee6b74783c2b9fe5ce43f60abef999aedf63ba3d78d0f44b4c8bc7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "558fab7086ee6b74783c2b9fe5ce43f60abef999aedf63ba3d78d0f44b4c8bc7",
+                    "hash" : "0x558fab7086ee6b74783c2b9fe5ce43f60abef999aedf63ba3d78d0f44b4c8bc7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "558fab7086ee6b74783c2b9fe5ce43f60abef999aedf63ba3d78d0f44b4c8bc7",
+                    "hash" : "0x558fab7086ee6b74783c2b9fe5ce43f60abef999aedf63ba3d78d0f44b4c8bc7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "558fab7086ee6b74783c2b9fe5ce43f60abef999aedf63ba3d78d0f44b4c8bc7",
+                    "hash" : "0x558fab7086ee6b74783c2b9fe5ce43f60abef999aedf63ba3d78d0f44b4c8bc7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "558fab7086ee6b74783c2b9fe5ce43f60abef999aedf63ba3d78d0f44b4c8bc7",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b54143416f1732797105f237768fe506871ac8535560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "841471566"
+                "0x3227d64e"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest60.json b/GeneralStateTests/stRandom/randomStatetest60.json
index 0dcd432c0..6108a0771 100644
--- a/GeneralStateTests/stRandom/randomStatetest60.json
+++ b/GeneralStateTests/stRandom/randomStatetest60.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest60" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b3ce88e60340330e29bf79d12cdc3f6738ac4889480699b8ade9a2d98b144906",
+                    "hash" : "0xb3ce88e60340330e29bf79d12cdc3f6738ac4889480699b8ade9a2d98b144906",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b3ce88e60340330e29bf79d12cdc3f6738ac4889480699b8ade9a2d98b144906",
+                    "hash" : "0xb3ce88e60340330e29bf79d12cdc3f6738ac4889480699b8ade9a2d98b144906",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b3ce88e60340330e29bf79d12cdc3f6738ac4889480699b8ade9a2d98b144906",
+                    "hash" : "0xb3ce88e60340330e29bf79d12cdc3f6738ac4889480699b8ade9a2d98b144906",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b3ce88e60340330e29bf79d12cdc3f6738ac4889480699b8ade9a2d98b144906",
+                    "hash" : "0xb3ce88e60340330e29bf79d12cdc3f6738ac4889480699b8ade9a2d98b144906",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b3ce88e60340330e29bf79d12cdc3f6738ac4889480699b8ade9a2d98b144906",
+                    "hash" : "0xb3ce88e60340330e29bf79d12cdc3f6738ac4889480699b8ade9a2d98b144906",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "b3ce88e60340330e29bf79d12cdc3f6738ac4889480699b8ade9a2d98b144906",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x427f0000000000000000000000000000000000000000000000000000000000000000427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff437f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f969001091aa15b8b9b75459d015a045560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1423842991"
+                "0x54de1eaf"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest600.json b/GeneralStateTests/stRandom/randomStatetest600.json
index b989f6ec5..cd565c1b0 100644
--- a/GeneralStateTests/stRandom/randomStatetest600.json
+++ b/GeneralStateTests/stRandom/randomStatetest600.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest600" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "8c749e6d5bb17782bc4dbb14cabf01da45384a74a48c39e221ad570a7624beae",
+                    "hash" : "0x8c749e6d5bb17782bc4dbb14cabf01da45384a74a48c39e221ad570a7624beae",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "8c749e6d5bb17782bc4dbb14cabf01da45384a74a48c39e221ad570a7624beae",
+                    "hash" : "0x8c749e6d5bb17782bc4dbb14cabf01da45384a74a48c39e221ad570a7624beae",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "8c749e6d5bb17782bc4dbb14cabf01da45384a74a48c39e221ad570a7624beae",
+                    "hash" : "0x8c749e6d5bb17782bc4dbb14cabf01da45384a74a48c39e221ad570a7624beae",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "8c749e6d5bb17782bc4dbb14cabf01da45384a74a48c39e221ad570a7624beae",
+                    "hash" : "0x8c749e6d5bb17782bc4dbb14cabf01da45384a74a48c39e221ad570a7624beae",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "8c749e6d5bb17782bc4dbb14cabf01da45384a74a48c39e221ad570a7624beae",
+                    "hash" : "0x8c749e6d5bb17782bc4dbb14cabf01da45384a74a48c39e221ad570a7624beae",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "8c749e6d5bb17782bc4dbb14cabf01da45384a74a48c39e221ad570a7624beae",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c35043457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f0b6f37208e76a402927039198c96990760005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "181662108"
+                "0x0ad3f19c"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest601.json b/GeneralStateTests/stRandom/randomStatetest601.json
index 1fcd21fb0..20ceb0944 100644
--- a/GeneralStateTests/stRandom/randomStatetest601.json
+++ b/GeneralStateTests/stRandom/randomStatetest601.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest601" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "886793cb795aad67bef8747046a71428c332fac253236d4002e142f08f31602b",
+                    "hash" : "0x886793cb795aad67bef8747046a71428c332fac253236d4002e142f08f31602b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "886793cb795aad67bef8747046a71428c332fac253236d4002e142f08f31602b",
+                    "hash" : "0x886793cb795aad67bef8747046a71428c332fac253236d4002e142f08f31602b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "886793cb795aad67bef8747046a71428c332fac253236d4002e142f08f31602b",
+                    "hash" : "0x886793cb795aad67bef8747046a71428c332fac253236d4002e142f08f31602b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "886793cb795aad67bef8747046a71428c332fac253236d4002e142f08f31602b",
+                    "hash" : "0x886793cb795aad67bef8747046a71428c332fac253236d4002e142f08f31602b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "886793cb795aad67bef8747046a71428c332fac253236d4002e142f08f31602b",
+                    "hash" : "0x886793cb795aad67bef8747046a71428c332fac253236d4002e142f08f31602b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "886793cb795aad67bef8747046a71428c332fac253236d4002e142f08f31602b",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350377f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000000b3a09785b1084418866100af0868a3455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "2056709657"
+                "0x7a96e619"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest602.json b/GeneralStateTests/stRandom/randomStatetest602.json
index 0fa27f506..ad37e23b3 100644
--- a/GeneralStateTests/stRandom/randomStatetest602.json
+++ b/GeneralStateTests/stRandom/randomStatetest602.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest602" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b71834e308232e0df4f8c88ed977640e19418e5e746f40add2de2dfd73ff1fe6",
+                    "hash" : "0xb71834e308232e0df4f8c88ed977640e19418e5e746f40add2de2dfd73ff1fe6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b71834e308232e0df4f8c88ed977640e19418e5e746f40add2de2dfd73ff1fe6",
+                    "hash" : "0xb71834e308232e0df4f8c88ed977640e19418e5e746f40add2de2dfd73ff1fe6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b71834e308232e0df4f8c88ed977640e19418e5e746f40add2de2dfd73ff1fe6",
+                    "hash" : "0xb71834e308232e0df4f8c88ed977640e19418e5e746f40add2de2dfd73ff1fe6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b71834e308232e0df4f8c88ed977640e19418e5e746f40add2de2dfd73ff1fe6",
+                    "hash" : "0xb71834e308232e0df4f8c88ed977640e19418e5e746f40add2de2dfd73ff1fe6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b71834e308232e0df4f8c88ed977640e19418e5e746f40add2de2dfd73ff1fe6",
+                    "hash" : "0xb71834e308232e0df4f8c88ed977640e19418e5e746f40add2de2dfd73ff1fe6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "b71834e308232e0df4f8c88ed977640e19418e5e746f40add2de2dfd73ff1fe6",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff60005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,8 +96,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x25d01724"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest603.json b/GeneralStateTests/stRandom/randomStatetest603.json
index 95ad9f060..b0ee7e291 100644
--- a/GeneralStateTests/stRandom/randomStatetest603.json
+++ b/GeneralStateTests/stRandom/randomStatetest603.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest603" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "0cb3664a7e870e09ef92986586d0b74814092512196d7e5d03456730321d9c87",
+                    "hash" : "0x0cb3664a7e870e09ef92986586d0b74814092512196d7e5d03456730321d9c87",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "0cb3664a7e870e09ef92986586d0b74814092512196d7e5d03456730321d9c87",
+                    "hash" : "0x0cb3664a7e870e09ef92986586d0b74814092512196d7e5d03456730321d9c87",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "0cb3664a7e870e09ef92986586d0b74814092512196d7e5d03456730321d9c87",
+                    "hash" : "0x0cb3664a7e870e09ef92986586d0b74814092512196d7e5d03456730321d9c87",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "0cb3664a7e870e09ef92986586d0b74814092512196d7e5d03456730321d9c87",
+                    "hash" : "0x0cb3664a7e870e09ef92986586d0b74814092512196d7e5d03456730321d9c87",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0cb3664a7e870e09ef92986586d0b74814092512196d7e5d03456730321d9c87",
+                    "hash" : "0x0cb3664a7e870e09ef92986586d0b74814092512196d7e5d03456730321d9c87",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "0cb3664a7e870e09ef92986586d0b74814092512196d7e5d03456730321d9c87",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5427f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5086f655860560745326476a03cdc3606345560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "603781106"
+                "0x23fcf7f2"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest604.json b/GeneralStateTests/stRandom/randomStatetest604.json
index 953e3ac3b..240b22185 100644
--- a/GeneralStateTests/stRandom/randomStatetest604.json
+++ b/GeneralStateTests/stRandom/randomStatetest604.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest604" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "67efa528c356e2c886ec0e40f4f3b03c865ab3f858834d9eb8e6c471e0634121",
+                    "hash" : "0x67efa528c356e2c886ec0e40f4f3b03c865ab3f858834d9eb8e6c471e0634121",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "67efa528c356e2c886ec0e40f4f3b03c865ab3f858834d9eb8e6c471e0634121",
+                    "hash" : "0x67efa528c356e2c886ec0e40f4f3b03c865ab3f858834d9eb8e6c471e0634121",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "67efa528c356e2c886ec0e40f4f3b03c865ab3f858834d9eb8e6c471e0634121",
+                    "hash" : "0x67efa528c356e2c886ec0e40f4f3b03c865ab3f858834d9eb8e6c471e0634121",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "67efa528c356e2c886ec0e40f4f3b03c865ab3f858834d9eb8e6c471e0634121",
+                    "hash" : "0x67efa528c356e2c886ec0e40f4f3b03c865ab3f858834d9eb8e6c471e0634121",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "67efa528c356e2c886ec0e40f4f3b03c865ab3f858834d9eb8e6c471e0634121",
+                    "hash" : "0x67efa528c356e2c886ec0e40f4f3b03c865ab3f858834d9eb8e6c471e0634121",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "67efa528c356e2c886ec0e40f4f3b03c865ab3f858834d9eb8e6c471e0634121",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000437f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe44a4418a83039c0587363b0518204006065a06",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1287981996"
+                "0x4cc50bac"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest605.json b/GeneralStateTests/stRandom/randomStatetest605.json
index ef36ce7e0..7356778ed 100644
--- a/GeneralStateTests/stRandom/randomStatetest605.json
+++ b/GeneralStateTests/stRandom/randomStatetest605.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest605" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6cbbf62049884eacf9ab1b1fe5f16fbc6c9f9cf75b76f4d36cf6a622eac0d31a",
+                    "hash" : "0x6cbbf62049884eacf9ab1b1fe5f16fbc6c9f9cf75b76f4d36cf6a622eac0d31a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6cbbf62049884eacf9ab1b1fe5f16fbc6c9f9cf75b76f4d36cf6a622eac0d31a",
+                    "hash" : "0x6cbbf62049884eacf9ab1b1fe5f16fbc6c9f9cf75b76f4d36cf6a622eac0d31a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6cbbf62049884eacf9ab1b1fe5f16fbc6c9f9cf75b76f4d36cf6a622eac0d31a",
+                    "hash" : "0x6cbbf62049884eacf9ab1b1fe5f16fbc6c9f9cf75b76f4d36cf6a622eac0d31a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6cbbf62049884eacf9ab1b1fe5f16fbc6c9f9cf75b76f4d36cf6a622eac0d31a",
+                    "hash" : "0x6cbbf62049884eacf9ab1b1fe5f16fbc6c9f9cf75b76f4d36cf6a622eac0d31a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6cbbf62049884eacf9ab1b1fe5f16fbc6c9f9cf75b76f4d36cf6a622eac0d31a",
+                    "hash" : "0x6cbbf62049884eacf9ab1b1fe5f16fbc6c9f9cf75b76f4d36cf6a622eac0d31a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "6cbbf62049884eacf9ab1b1fe5f16fbc6c9f9cf75b76f4d36cf6a622eac0d31a",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c350437f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff905803850855",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1694516474"
+                "0x650044fa"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest606.json b/GeneralStateTests/stRandom/randomStatetest606.json
index fd271b508..eed5167af 100644
--- a/GeneralStateTests/stRandom/randomStatetest606.json
+++ b/GeneralStateTests/stRandom/randomStatetest606.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest606" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "550ba36d2a794d89f312d797141bf7960cdfdf798dcc06ab18ef498acf3593a4",
+                    "hash" : "0x550ba36d2a794d89f312d797141bf7960cdfdf798dcc06ab18ef498acf3593a4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "550ba36d2a794d89f312d797141bf7960cdfdf798dcc06ab18ef498acf3593a4",
+                    "hash" : "0x550ba36d2a794d89f312d797141bf7960cdfdf798dcc06ab18ef498acf3593a4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "550ba36d2a794d89f312d797141bf7960cdfdf798dcc06ab18ef498acf3593a4",
+                    "hash" : "0x550ba36d2a794d89f312d797141bf7960cdfdf798dcc06ab18ef498acf3593a4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "550ba36d2a794d89f312d797141bf7960cdfdf798dcc06ab18ef498acf3593a4",
+                    "hash" : "0x550ba36d2a794d89f312d797141bf7960cdfdf798dcc06ab18ef498acf3593a4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "550ba36d2a794d89f312d797141bf7960cdfdf798dcc06ab18ef498acf3593a4",
+                    "hash" : "0x550ba36d2a794d89f312d797141bf7960cdfdf798dcc06ab18ef498acf3593a4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "550ba36d2a794d89f312d797141bf7960cdfdf798dcc06ab18ef498acf3593a4",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff097f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff40557cf03c31a361388d89ea8065866f",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1096221049"
+                "0x41570179"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest607.json b/GeneralStateTests/stRandom/randomStatetest607.json
index ab34fd92e..1d03d3533 100644
--- a/GeneralStateTests/stRandom/randomStatetest607.json
+++ b/GeneralStateTests/stRandom/randomStatetest607.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest607" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "ae37c48ba8611a7f4c36376412496e9dee42d40829ace0be727e9f42dca1d727",
+                    "hash" : "0xae37c48ba8611a7f4c36376412496e9dee42d40829ace0be727e9f42dca1d727",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "ae37c48ba8611a7f4c36376412496e9dee42d40829ace0be727e9f42dca1d727",
+                    "hash" : "0xae37c48ba8611a7f4c36376412496e9dee42d40829ace0be727e9f42dca1d727",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "ae37c48ba8611a7f4c36376412496e9dee42d40829ace0be727e9f42dca1d727",
+                    "hash" : "0xae37c48ba8611a7f4c36376412496e9dee42d40829ace0be727e9f42dca1d727",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ae37c48ba8611a7f4c36376412496e9dee42d40829ace0be727e9f42dca1d727",
+                    "hash" : "0xae37c48ba8611a7f4c36376412496e9dee42d40829ace0be727e9f42dca1d727",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "ae37c48ba8611a7f4c36376412496e9dee42d40829ace0be727e9f42dca1d727",
+                    "hash" : "0xae37c48ba8611a7f4c36376412496e9dee42d40829ace0be727e9f42dca1d727",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "ae37c48ba8611a7f4c36376412496e9dee42d40829ace0be727e9f42dca1d727",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0955",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "275642360"
+                "0x106df7f8"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest608.json b/GeneralStateTests/stRandom/randomStatetest608.json
index ceba0911e..6d3b79b96 100644
--- a/GeneralStateTests/stRandom/randomStatetest608.json
+++ b/GeneralStateTests/stRandom/randomStatetest608.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest608" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a42aee2c18188fd45ceb23c8933373451d1b41f979fab734e3de2387f62a6468",
+                    "hash" : "0xa42aee2c18188fd45ceb23c8933373451d1b41f979fab734e3de2387f62a6468",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a42aee2c18188fd45ceb23c8933373451d1b41f979fab734e3de2387f62a6468",
+                    "hash" : "0xa42aee2c18188fd45ceb23c8933373451d1b41f979fab734e3de2387f62a6468",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a42aee2c18188fd45ceb23c8933373451d1b41f979fab734e3de2387f62a6468",
+                    "hash" : "0xa42aee2c18188fd45ceb23c8933373451d1b41f979fab734e3de2387f62a6468",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a42aee2c18188fd45ceb23c8933373451d1b41f979fab734e3de2387f62a6468",
+                    "hash" : "0xa42aee2c18188fd45ceb23c8933373451d1b41f979fab734e3de2387f62a6468",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a42aee2c18188fd45ceb23c8933373451d1b41f979fab734e3de2387f62a6468",
+                    "hash" : "0xa42aee2c18188fd45ceb23c8933373451d1b41f979fab734e3de2387f62a6468",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "a42aee2c18188fd45ceb23c8933373451d1b41f979fab734e3de2387f62a6468",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c350537fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0855",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "514995498"
+                "0x1eb2352a"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest609.json b/GeneralStateTests/stRandom/randomStatetest609.json
index 05e843119..14a24044b 100644
--- a/GeneralStateTests/stRandom/randomStatetest609.json
+++ b/GeneralStateTests/stRandom/randomStatetest609.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest609" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "65f9c92fa1a162b6bca6a3342ec84c62bb2a60d0eb1960412d58b4fcbf7aa5d6",
+                    "hash" : "0x65f9c92fa1a162b6bca6a3342ec84c62bb2a60d0eb1960412d58b4fcbf7aa5d6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "65f9c92fa1a162b6bca6a3342ec84c62bb2a60d0eb1960412d58b4fcbf7aa5d6",
+                    "hash" : "0x65f9c92fa1a162b6bca6a3342ec84c62bb2a60d0eb1960412d58b4fcbf7aa5d6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "65f9c92fa1a162b6bca6a3342ec84c62bb2a60d0eb1960412d58b4fcbf7aa5d6",
+                    "hash" : "0x65f9c92fa1a162b6bca6a3342ec84c62bb2a60d0eb1960412d58b4fcbf7aa5d6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "65f9c92fa1a162b6bca6a3342ec84c62bb2a60d0eb1960412d58b4fcbf7aa5d6",
+                    "hash" : "0x65f9c92fa1a162b6bca6a3342ec84c62bb2a60d0eb1960412d58b4fcbf7aa5d6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "65f9c92fa1a162b6bca6a3342ec84c62bb2a60d0eb1960412d58b4fcbf7aa5d6",
+                    "hash" : "0x65f9c92fa1a162b6bca6a3342ec84c62bb2a60d0eb1960412d58b4fcbf7aa5d6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "65f9c92fa1a162b6bca6a3342ec84c62bb2a60d0eb1960412d58b4fcbf7aa5d6",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000001a7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000001a736e628f796436739660005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1675392723"
+                "0x63dc76d3"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest61.json b/GeneralStateTests/stRandom/randomStatetest61.json
index e8e9c9f4c..4df1e82ba 100644
--- a/GeneralStateTests/stRandom/randomStatetest61.json
+++ b/GeneralStateTests/stRandom/randomStatetest61.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest61" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "41540586f45bf0480019f7e331be2809a482690e831017acac6844607e0b8462",
+                    "hash" : "0x41540586f45bf0480019f7e331be2809a482690e831017acac6844607e0b8462",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "41540586f45bf0480019f7e331be2809a482690e831017acac6844607e0b8462",
+                    "hash" : "0x41540586f45bf0480019f7e331be2809a482690e831017acac6844607e0b8462",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "41540586f45bf0480019f7e331be2809a482690e831017acac6844607e0b8462",
+                    "hash" : "0x41540586f45bf0480019f7e331be2809a482690e831017acac6844607e0b8462",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "41540586f45bf0480019f7e331be2809a482690e831017acac6844607e0b8462",
+                    "hash" : "0x41540586f45bf0480019f7e331be2809a482690e831017acac6844607e0b8462",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "41540586f45bf0480019f7e331be2809a482690e831017acac6844607e0b8462",
+                    "hash" : "0x41540586f45bf0480019f7e331be2809a482690e831017acac6844607e0b8462",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "41540586f45bf0480019f7e331be2809a482690e831017acac6844607e0b8462",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350407f00000000000000000000000100000000000000000000000000000000000000006b39427d9174167255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1754905925"
+                "0x6899bd45"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest610.json b/GeneralStateTests/stRandom/randomStatetest610.json
index a2af2daad..70132dd21 100644
--- a/GeneralStateTests/stRandom/randomStatetest610.json
+++ b/GeneralStateTests/stRandom/randomStatetest610.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest610" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e86df82c3d1346921eeef74d49a01635d4132a5f99e9bee19f52245a496fe778",
+                    "hash" : "0xe86df82c3d1346921eeef74d49a01635d4132a5f99e9bee19f52245a496fe778",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e86df82c3d1346921eeef74d49a01635d4132a5f99e9bee19f52245a496fe778",
+                    "hash" : "0xe86df82c3d1346921eeef74d49a01635d4132a5f99e9bee19f52245a496fe778",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e86df82c3d1346921eeef74d49a01635d4132a5f99e9bee19f52245a496fe778",
+                    "hash" : "0xe86df82c3d1346921eeef74d49a01635d4132a5f99e9bee19f52245a496fe778",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e86df82c3d1346921eeef74d49a01635d4132a5f99e9bee19f52245a496fe778",
+                    "hash" : "0xe86df82c3d1346921eeef74d49a01635d4132a5f99e9bee19f52245a496fe778",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e86df82c3d1346921eeef74d49a01635d4132a5f99e9bee19f52245a496fe778",
+                    "hash" : "0xe86df82c3d1346921eeef74d49a01635d4132a5f99e9bee19f52245a496fe778",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "e86df82c3d1346921eeef74d49a01635d4132a5f99e9bee19f52245a496fe778",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x417f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f01f353a2437e4384726497587b85565560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "2145229980"
+                "0x7fdd9c9c"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest611.json b/GeneralStateTests/stRandom/randomStatetest611.json
index 17a68566c..439e86375 100644
--- a/GeneralStateTests/stRandom/randomStatetest611.json
+++ b/GeneralStateTests/stRandom/randomStatetest611.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest611" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "4f684fdda7058333c43f71c4ab683a7cea14fddbe339d318d0252edd3710d2eb",
+                    "hash" : "0x4f684fdda7058333c43f71c4ab683a7cea14fddbe339d318d0252edd3710d2eb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "4f684fdda7058333c43f71c4ab683a7cea14fddbe339d318d0252edd3710d2eb",
+                    "hash" : "0x4f684fdda7058333c43f71c4ab683a7cea14fddbe339d318d0252edd3710d2eb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4f684fdda7058333c43f71c4ab683a7cea14fddbe339d318d0252edd3710d2eb",
+                    "hash" : "0x4f684fdda7058333c43f71c4ab683a7cea14fddbe339d318d0252edd3710d2eb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4f684fdda7058333c43f71c4ab683a7cea14fddbe339d318d0252edd3710d2eb",
+                    "hash" : "0x4f684fdda7058333c43f71c4ab683a7cea14fddbe339d318d0252edd3710d2eb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "4f684fdda7058333c43f71c4ab683a7cea14fddbe339d318d0252edd3710d2eb",
+                    "hash" : "0x4f684fdda7058333c43f71c4ab683a7cea14fddbe339d318d0252edd3710d2eb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "4f684fdda7058333c43f71c4ab683a7cea14fddbe339d318d0252edd3710d2eb",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c350417f0000000000000000000000000000000000000000000000000000000000000001437f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001357f00000000000000000000000000000000000000000000000000000000000000000b9b84a360005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "40953114"
+                "0x0270e51a"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest612.json b/GeneralStateTests/stRandom/randomStatetest612.json
index aa11f69e5..1faf4759e 100644
--- a/GeneralStateTests/stRandom/randomStatetest612.json
+++ b/GeneralStateTests/stRandom/randomStatetest612.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest612" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a18914d2342fffccec9a0c70ff0b1a5500ce02ea38a7fdddff0d1b811569cc99",
+                    "hash" : "0xa18914d2342fffccec9a0c70ff0b1a5500ce02ea38a7fdddff0d1b811569cc99",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a18914d2342fffccec9a0c70ff0b1a5500ce02ea38a7fdddff0d1b811569cc99",
+                    "hash" : "0xa18914d2342fffccec9a0c70ff0b1a5500ce02ea38a7fdddff0d1b811569cc99",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a18914d2342fffccec9a0c70ff0b1a5500ce02ea38a7fdddff0d1b811569cc99",
+                    "hash" : "0xa18914d2342fffccec9a0c70ff0b1a5500ce02ea38a7fdddff0d1b811569cc99",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a18914d2342fffccec9a0c70ff0b1a5500ce02ea38a7fdddff0d1b811569cc99",
+                    "hash" : "0xa18914d2342fffccec9a0c70ff0b1a5500ce02ea38a7fdddff0d1b811569cc99",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a18914d2342fffccec9a0c70ff0b1a5500ce02ea38a7fdddff0d1b811569cc99",
+                    "hash" : "0xa18914d2342fffccec9a0c70ff0b1a5500ce02ea38a7fdddff0d1b811569cc99",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "a18914d2342fffccec9a0c70ff0b1a5500ce02ea38a7fdddff0d1b811569cc99",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff437f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff095560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "721306946"
+                "0x2afe4542"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest613.json b/GeneralStateTests/stRandom/randomStatetest613.json
index dfa58bf58..d3e73666f 100644
--- a/GeneralStateTests/stRandom/randomStatetest613.json
+++ b/GeneralStateTests/stRandom/randomStatetest613.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest613" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1c8edc0742398202c51cce455d022314c226c13bb96a2f7208d27924c827f545",
+                    "hash" : "0x1c8edc0742398202c51cce455d022314c226c13bb96a2f7208d27924c827f545",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "1c8edc0742398202c51cce455d022314c226c13bb96a2f7208d27924c827f545",
+                    "hash" : "0x1c8edc0742398202c51cce455d022314c226c13bb96a2f7208d27924c827f545",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "1c8edc0742398202c51cce455d022314c226c13bb96a2f7208d27924c827f545",
+                    "hash" : "0x1c8edc0742398202c51cce455d022314c226c13bb96a2f7208d27924c827f545",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "1c8edc0742398202c51cce455d022314c226c13bb96a2f7208d27924c827f545",
+                    "hash" : "0x1c8edc0742398202c51cce455d022314c226c13bb96a2f7208d27924c827f545",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "1c8edc0742398202c51cce455d022314c226c13bb96a2f7208d27924c827f545",
+                    "hash" : "0x1c8edc0742398202c51cce455d022314c226c13bb96a2f7208d27924c827f545",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "a4c663b84425111046f928d3bff841b2ef61a39cf3b27a9a305a3a207b93a26f",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x43414043454445450855",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest614.json b/GeneralStateTests/stRandom/randomStatetest614.json
index 55bf85b2b..8e6877209 100644
--- a/GeneralStateTests/stRandom/randomStatetest614.json
+++ b/GeneralStateTests/stRandom/randomStatetest614.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest614" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "5b45ac469dce4e45fe7a489585c11b9c1c5ca2e2397b46b3a9d453d582185472",
+                    "hash" : "0x5b45ac469dce4e45fe7a489585c11b9c1c5ca2e2397b46b3a9d453d582185472",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "5b45ac469dce4e45fe7a489585c11b9c1c5ca2e2397b46b3a9d453d582185472",
+                    "hash" : "0x5b45ac469dce4e45fe7a489585c11b9c1c5ca2e2397b46b3a9d453d582185472",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "db6bbd496153c654003dd60c5f50a458b5b50a4064a9fde27e13a90f2a0618a1",
+                    "hash" : "0xdb6bbd496153c654003dd60c5f50a458b5b50a4064a9fde27e13a90f2a0618a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "db6bbd496153c654003dd60c5f50a458b5b50a4064a9fde27e13a90f2a0618a1",
+                    "hash" : "0xdb6bbd496153c654003dd60c5f50a458b5b50a4064a9fde27e13a90f2a0618a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "5b45ac469dce4e45fe7a489585c11b9c1c5ca2e2397b46b3a9d453d582185472",
+                    "hash" : "0x5b45ac469dce4e45fe7a489585c11b9c1c5ca2e2397b46b3a9d453d582185472",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "40b17be32cae0298eebbef580073aead35cad97c6532b719a95dac357a1ad0c8",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x42314441404342428595f25966869e4255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest615.json b/GeneralStateTests/stRandom/randomStatetest615.json
index a95b2fb22..cbd9cbc6b 100644
--- a/GeneralStateTests/stRandom/randomStatetest615.json
+++ b/GeneralStateTests/stRandom/randomStatetest615.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest615" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "3ca3f999fcac051a5b00a4f0b55d7412b408aa506065ad5120ec5209554d5db6",
+                    "hash" : "0x3ca3f999fcac051a5b00a4f0b55d7412b408aa506065ad5120ec5209554d5db6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "3ca3f999fcac051a5b00a4f0b55d7412b408aa506065ad5120ec5209554d5db6",
+                    "hash" : "0x3ca3f999fcac051a5b00a4f0b55d7412b408aa506065ad5120ec5209554d5db6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3ca3f999fcac051a5b00a4f0b55d7412b408aa506065ad5120ec5209554d5db6",
+                    "hash" : "0x3ca3f999fcac051a5b00a4f0b55d7412b408aa506065ad5120ec5209554d5db6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3ca3f999fcac051a5b00a4f0b55d7412b408aa506065ad5120ec5209554d5db6",
+                    "hash" : "0x3ca3f999fcac051a5b00a4f0b55d7412b408aa506065ad5120ec5209554d5db6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "3ca3f999fcac051a5b00a4f0b55d7412b408aa506065ad5120ec5209554d5db6",
+                    "hash" : "0x3ca3f999fcac051a5b00a4f0b55d7412b408aa506065ad5120ec5209554d5db6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "3ca3f999fcac051a5b00a4f0b55d7412b408aa506065ad5120ec5209554d5db6",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe837f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000001000000000000000000000000000000000000000009556c6f390a3054d7368a9a5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "2076977514"
+                "0x7bcc296a"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest616.json b/GeneralStateTests/stRandom/randomStatetest616.json
index 0af2d74a9..d1f16eeba 100644
--- a/GeneralStateTests/stRandom/randomStatetest616.json
+++ b/GeneralStateTests/stRandom/randomStatetest616.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest616" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "364e3cec153b43c9e2987a40d0b208d548ad90f392b26b59f67bdb2158cb0baf",
+                    "hash" : "0x364e3cec153b43c9e2987a40d0b208d548ad90f392b26b59f67bdb2158cb0baf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "364e3cec153b43c9e2987a40d0b208d548ad90f392b26b59f67bdb2158cb0baf",
+                    "hash" : "0x364e3cec153b43c9e2987a40d0b208d548ad90f392b26b59f67bdb2158cb0baf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "364e3cec153b43c9e2987a40d0b208d548ad90f392b26b59f67bdb2158cb0baf",
+                    "hash" : "0x364e3cec153b43c9e2987a40d0b208d548ad90f392b26b59f67bdb2158cb0baf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "364e3cec153b43c9e2987a40d0b208d548ad90f392b26b59f67bdb2158cb0baf",
+                    "hash" : "0x364e3cec153b43c9e2987a40d0b208d548ad90f392b26b59f67bdb2158cb0baf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "364e3cec153b43c9e2987a40d0b208d548ad90f392b26b59f67bdb2158cb0baf",
+                    "hash" : "0x364e3cec153b43c9e2987a40d0b208d548ad90f392b26b59f67bdb2158cb0baf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "364e3cec153b43c9e2987a40d0b208d548ad90f392b26b59f67bdb2158cb0baf",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000006f86a2409b991539f0423c0342363c3b5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1167366767"
+                "0x45949a6f"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest617.json b/GeneralStateTests/stRandom/randomStatetest617.json
index fcdaf5581..dc355a013 100644
--- a/GeneralStateTests/stRandom/randomStatetest617.json
+++ b/GeneralStateTests/stRandom/randomStatetest617.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest617" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6d6350d29f59ac2f63504290481a474739d0330c471643174ae1246075452b13",
+                    "hash" : "0x6d6350d29f59ac2f63504290481a474739d0330c471643174ae1246075452b13",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6d6350d29f59ac2f63504290481a474739d0330c471643174ae1246075452b13",
+                    "hash" : "0x6d6350d29f59ac2f63504290481a474739d0330c471643174ae1246075452b13",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9568e048f6b82a73139f3369be0eb360114686055cf5b98ef28e14263511fa07",
+                    "hash" : "0x9568e048f6b82a73139f3369be0eb360114686055cf5b98ef28e14263511fa07",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9568e048f6b82a73139f3369be0eb360114686055cf5b98ef28e14263511fa07",
+                    "hash" : "0x9568e048f6b82a73139f3369be0eb360114686055cf5b98ef28e14263511fa07",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6d6350d29f59ac2f63504290481a474739d0330c471643174ae1246075452b13",
+                    "hash" : "0x6d6350d29f59ac2f63504290481a474739d0330c471643174ae1246075452b13",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "9b6fbe6b2dac6d60bf796db6b1a46cdaba03e31363f7caa6bab39fb0b5b09d49",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x4343404443434144133642f2",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest618.json b/GeneralStateTests/stRandom/randomStatetest618.json
index 316e15154..61f8212a0 100644
--- a/GeneralStateTests/stRandom/randomStatetest618.json
+++ b/GeneralStateTests/stRandom/randomStatetest618.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest618" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "aae9f8742d1e957c2fc5d4d5cad80a2abb165c0f983268ab3b39c98ab04bd95a",
+                    "hash" : "0xaae9f8742d1e957c2fc5d4d5cad80a2abb165c0f983268ab3b39c98ab04bd95a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "aae9f8742d1e957c2fc5d4d5cad80a2abb165c0f983268ab3b39c98ab04bd95a",
+                    "hash" : "0xaae9f8742d1e957c2fc5d4d5cad80a2abb165c0f983268ab3b39c98ab04bd95a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "191a16671ba2726c09fde48c870f6f620519c8150f53b17a6e8e317a7c53c2b0",
+                    "hash" : "0x191a16671ba2726c09fde48c870f6f620519c8150f53b17a6e8e317a7c53c2b0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "191a16671ba2726c09fde48c870f6f620519c8150f53b17a6e8e317a7c53c2b0",
+                    "hash" : "0x191a16671ba2726c09fde48c870f6f620519c8150f53b17a6e8e317a7c53c2b0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "aae9f8742d1e957c2fc5d4d5cad80a2abb165c0f983268ab3b39c98ab04bd95a",
+                    "hash" : "0xaae9f8742d1e957c2fc5d4d5cad80a2abb165c0f983268ab3b39c98ab04bd95a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "7114ebb96d3623cd066573e441eee29b24e267c630b69628e81b23d770a68ba5",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000000427f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff437f00000000000000000000000100000000000000000000000000000000000000003bf1135a3a58",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1398079665"
+                "0x535500b1"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest619.json b/GeneralStateTests/stRandom/randomStatetest619.json
index f618e790a..220ac65e1 100644
--- a/GeneralStateTests/stRandom/randomStatetest619.json
+++ b/GeneralStateTests/stRandom/randomStatetest619.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest619" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "56822a7d2744037b783a4dca08a1be121b5c5e69ef5c26e51fc6f8269bbf447b",
+                    "hash" : "0x56822a7d2744037b783a4dca08a1be121b5c5e69ef5c26e51fc6f8269bbf447b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "56822a7d2744037b783a4dca08a1be121b5c5e69ef5c26e51fc6f8269bbf447b",
+                    "hash" : "0x56822a7d2744037b783a4dca08a1be121b5c5e69ef5c26e51fc6f8269bbf447b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "ef49f5ef1bbae21ea30bc496232a2d647f5e026cccf8e70e36cd0e6c46d6b704",
+                    "hash" : "0xef49f5ef1bbae21ea30bc496232a2d647f5e026cccf8e70e36cd0e6c46d6b704",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ef49f5ef1bbae21ea30bc496232a2d647f5e026cccf8e70e36cd0e6c46d6b704",
+                    "hash" : "0xef49f5ef1bbae21ea30bc496232a2d647f5e026cccf8e70e36cd0e6c46d6b704",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "56822a7d2744037b783a4dca08a1be121b5c5e69ef5c26e51fc6f8269bbf447b",
+                    "hash" : "0x56822a7d2744037b783a4dca08a1be121b5c5e69ef5c26e51fc6f8269bbf447b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "0cbb517cd4a34617ee1dbd32b93f117ab87b644ad085c8c41f4d946c462f6355",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff547f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000005543374560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "511599063"
+                "0x1e7e61d7"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest62.json b/GeneralStateTests/stRandom/randomStatetest62.json
index da03d82b4..5a59f9fb5 100644
--- a/GeneralStateTests/stRandom/randomStatetest62.json
+++ b/GeneralStateTests/stRandom/randomStatetest62.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest62" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "4023eac358d956eb9361cff7903cb494b476aefcac590ef7fc5911b1b771503d",
+                    "hash" : "0x4023eac358d956eb9361cff7903cb494b476aefcac590ef7fc5911b1b771503d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "4023eac358d956eb9361cff7903cb494b476aefcac590ef7fc5911b1b771503d",
+                    "hash" : "0x4023eac358d956eb9361cff7903cb494b476aefcac590ef7fc5911b1b771503d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4023eac358d956eb9361cff7903cb494b476aefcac590ef7fc5911b1b771503d",
+                    "hash" : "0x4023eac358d956eb9361cff7903cb494b476aefcac590ef7fc5911b1b771503d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4023eac358d956eb9361cff7903cb494b476aefcac590ef7fc5911b1b771503d",
+                    "hash" : "0x4023eac358d956eb9361cff7903cb494b476aefcac590ef7fc5911b1b771503d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "4023eac358d956eb9361cff7903cb494b476aefcac590ef7fc5911b1b771503d",
+                    "hash" : "0x4023eac358d956eb9361cff7903cb494b476aefcac590ef7fc5911b1b771503d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "4023eac358d956eb9361cff7903cb494b476aefcac590ef7fc5911b1b771503d",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff437f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000016f7268713013964a96ac5758043325015560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1228914584"
+                "0x493fbf98"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest620.json b/GeneralStateTests/stRandom/randomStatetest620.json
index 8e674293c..19d69c649 100644
--- a/GeneralStateTests/stRandom/randomStatetest620.json
+++ b/GeneralStateTests/stRandom/randomStatetest620.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest620" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "08937320168626944fee6134367b092b5115ef6ea95f8fc33f0806ec0b16c9eb",
+                    "hash" : "0x08937320168626944fee6134367b092b5115ef6ea95f8fc33f0806ec0b16c9eb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "08937320168626944fee6134367b092b5115ef6ea95f8fc33f0806ec0b16c9eb",
+                    "hash" : "0x08937320168626944fee6134367b092b5115ef6ea95f8fc33f0806ec0b16c9eb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "08937320168626944fee6134367b092b5115ef6ea95f8fc33f0806ec0b16c9eb",
+                    "hash" : "0x08937320168626944fee6134367b092b5115ef6ea95f8fc33f0806ec0b16c9eb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "08937320168626944fee6134367b092b5115ef6ea95f8fc33f0806ec0b16c9eb",
+                    "hash" : "0x08937320168626944fee6134367b092b5115ef6ea95f8fc33f0806ec0b16c9eb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "08937320168626944fee6134367b092b5115ef6ea95f8fc33f0806ec0b16c9eb",
+                    "hash" : "0x08937320168626944fee6134367b092b5115ef6ea95f8fc33f0806ec0b16c9eb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "08937320168626944fee6134367b092b5115ef6ea95f8fc33f0806ec0b16c9eb",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff427f0000000000000000000000010000000000000000000000000000000000000000457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f6c54a420327d73727d9d1a667bf3895560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1643601446"
+                "0x61f75e26"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest621.json b/GeneralStateTests/stRandom/randomStatetest621.json
index 78a9580c1..3a9950ff3 100644
--- a/GeneralStateTests/stRandom/randomStatetest621.json
+++ b/GeneralStateTests/stRandom/randomStatetest621.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest621" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a9f3ad2655a01162bef91942d3a7c8ae83d42735e8014a2db8c520e190db9a62",
+                    "hash" : "0xa9f3ad2655a01162bef91942d3a7c8ae83d42735e8014a2db8c520e190db9a62",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a9f3ad2655a01162bef91942d3a7c8ae83d42735e8014a2db8c520e190db9a62",
+                    "hash" : "0xa9f3ad2655a01162bef91942d3a7c8ae83d42735e8014a2db8c520e190db9a62",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a9f3ad2655a01162bef91942d3a7c8ae83d42735e8014a2db8c520e190db9a62",
+                    "hash" : "0xa9f3ad2655a01162bef91942d3a7c8ae83d42735e8014a2db8c520e190db9a62",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a9f3ad2655a01162bef91942d3a7c8ae83d42735e8014a2db8c520e190db9a62",
+                    "hash" : "0xa9f3ad2655a01162bef91942d3a7c8ae83d42735e8014a2db8c520e190db9a62",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a9f3ad2655a01162bef91942d3a7c8ae83d42735e8014a2db8c520e190db9a62",
+                    "hash" : "0xa9f3ad2655a01162bef91942d3a7c8ae83d42735e8014a2db8c520e190db9a62",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "a9f3ad2655a01162bef91942d3a7c8ae83d42735e8014a2db8c520e190db9a62",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f0000000000000000000000000000000000000000000000000000000000000000441a7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f3ba187a19366899e595220741232905b60005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "2143896087"
+                "0x7fc94217"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest622.json b/GeneralStateTests/stRandom/randomStatetest622.json
index 84711505a..74315e73c 100644
--- a/GeneralStateTests/stRandom/randomStatetest622.json
+++ b/GeneralStateTests/stRandom/randomStatetest622.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest622" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "bfcb40085f37aaf2374a26a6c9a75efc99a550d766e3d3d0fb9de6b3dce0da4f",
+                    "hash" : "0xbfcb40085f37aaf2374a26a6c9a75efc99a550d766e3d3d0fb9de6b3dce0da4f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "bfcb40085f37aaf2374a26a6c9a75efc99a550d766e3d3d0fb9de6b3dce0da4f",
+                    "hash" : "0xbfcb40085f37aaf2374a26a6c9a75efc99a550d766e3d3d0fb9de6b3dce0da4f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "bfcb40085f37aaf2374a26a6c9a75efc99a550d766e3d3d0fb9de6b3dce0da4f",
+                    "hash" : "0xbfcb40085f37aaf2374a26a6c9a75efc99a550d766e3d3d0fb9de6b3dce0da4f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "bfcb40085f37aaf2374a26a6c9a75efc99a550d766e3d3d0fb9de6b3dce0da4f",
+                    "hash" : "0xbfcb40085f37aaf2374a26a6c9a75efc99a550d766e3d3d0fb9de6b3dce0da4f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "bfcb40085f37aaf2374a26a6c9a75efc99a550d766e3d3d0fb9de6b3dce0da4f",
+                    "hash" : "0xbfcb40085f37aaf2374a26a6c9a75efc99a550d766e3d3d0fb9de6b3dce0da4f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "bfcb40085f37aaf2374a26a6c9a75efc99a550d766e3d3d0fb9de6b3dce0da4f",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe40357f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b540070b040a72f00494659e899510ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1566530546"
+                "0x5d5f5bf2"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest623.json b/GeneralStateTests/stRandom/randomStatetest623.json
index 8bd43eee3..a1773ccc8 100644
--- a/GeneralStateTests/stRandom/randomStatetest623.json
+++ b/GeneralStateTests/stRandom/randomStatetest623.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest623" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "4ae6265d21b6eada79d28edba9ecbb4239c7888ed6cfe75f503ef58dbb206695",
+                    "hash" : "0x4ae6265d21b6eada79d28edba9ecbb4239c7888ed6cfe75f503ef58dbb206695",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "4ae6265d21b6eada79d28edba9ecbb4239c7888ed6cfe75f503ef58dbb206695",
+                    "hash" : "0x4ae6265d21b6eada79d28edba9ecbb4239c7888ed6cfe75f503ef58dbb206695",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4ae6265d21b6eada79d28edba9ecbb4239c7888ed6cfe75f503ef58dbb206695",
+                    "hash" : "0x4ae6265d21b6eada79d28edba9ecbb4239c7888ed6cfe75f503ef58dbb206695",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4ae6265d21b6eada79d28edba9ecbb4239c7888ed6cfe75f503ef58dbb206695",
+                    "hash" : "0x4ae6265d21b6eada79d28edba9ecbb4239c7888ed6cfe75f503ef58dbb206695",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "4ae6265d21b6eada79d28edba9ecbb4239c7888ed6cfe75f503ef58dbb206695",
+                    "hash" : "0x4ae6265d21b6eada79d28edba9ecbb4239c7888ed6cfe75f503ef58dbb206695",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "de2b8601d7a0239d44f82d864b9be01cf5515a2a2ea35c5d08860270706075f9",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x434542454244402055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest624.json b/GeneralStateTests/stRandom/randomStatetest624.json
index 078b37310..7b92243c6 100644
--- a/GeneralStateTests/stRandom/randomStatetest624.json
+++ b/GeneralStateTests/stRandom/randomStatetest624.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest624" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "68ffa9dca5523569e248a9eea9d426c5a155f3a1e942187d6487ab3b5c8e949e",
+                    "hash" : "0x68ffa9dca5523569e248a9eea9d426c5a155f3a1e942187d6487ab3b5c8e949e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "68ffa9dca5523569e248a9eea9d426c5a155f3a1e942187d6487ab3b5c8e949e",
+                    "hash" : "0x68ffa9dca5523569e248a9eea9d426c5a155f3a1e942187d6487ab3b5c8e949e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "68ffa9dca5523569e248a9eea9d426c5a155f3a1e942187d6487ab3b5c8e949e",
+                    "hash" : "0x68ffa9dca5523569e248a9eea9d426c5a155f3a1e942187d6487ab3b5c8e949e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "68ffa9dca5523569e248a9eea9d426c5a155f3a1e942187d6487ab3b5c8e949e",
+                    "hash" : "0x68ffa9dca5523569e248a9eea9d426c5a155f3a1e942187d6487ab3b5c8e949e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "68ffa9dca5523569e248a9eea9d426c5a155f3a1e942187d6487ab3b5c8e949e",
+                    "hash" : "0x68ffa9dca5523569e248a9eea9d426c5a155f3a1e942187d6487ab3b5c8e949e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "68ffa9dca5523569e248a9eea9d426c5a155f3a1e942187d6487ab3b5c8e949e",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x43424244457943455409635939",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest625.json b/GeneralStateTests/stRandom/randomStatetest625.json
index d498564b1..25ed67dce 100644
--- a/GeneralStateTests/stRandom/randomStatetest625.json
+++ b/GeneralStateTests/stRandom/randomStatetest625.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest625" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b246fb668f7a50d98d195c8dcc8522f7042d3228e8ea22f908aa65e9334d66b7",
+                    "hash" : "0xb246fb668f7a50d98d195c8dcc8522f7042d3228e8ea22f908aa65e9334d66b7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b246fb668f7a50d98d195c8dcc8522f7042d3228e8ea22f908aa65e9334d66b7",
+                    "hash" : "0xb246fb668f7a50d98d195c8dcc8522f7042d3228e8ea22f908aa65e9334d66b7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b246fb668f7a50d98d195c8dcc8522f7042d3228e8ea22f908aa65e9334d66b7",
+                    "hash" : "0xb246fb668f7a50d98d195c8dcc8522f7042d3228e8ea22f908aa65e9334d66b7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b246fb668f7a50d98d195c8dcc8522f7042d3228e8ea22f908aa65e9334d66b7",
+                    "hash" : "0xb246fb668f7a50d98d195c8dcc8522f7042d3228e8ea22f908aa65e9334d66b7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b246fb668f7a50d98d195c8dcc8522f7042d3228e8ea22f908aa65e9334d66b7",
+                    "hash" : "0xb246fb668f7a50d98d195c8dcc8522f7042d3228e8ea22f908aa65e9334d66b7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "b246fb668f7a50d98d195c8dcc8522f7042d3228e8ea22f908aa65e9334d66b7",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000887f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa3015560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1618548956"
+                "0x607918dc"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest626.json b/GeneralStateTests/stRandom/randomStatetest626.json
index 718ba9532..2af967fb5 100644
--- a/GeneralStateTests/stRandom/randomStatetest626.json
+++ b/GeneralStateTests/stRandom/randomStatetest626.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest626" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "842ed2e7ebbadb1a081941031ca1c783f7bed31561d1ae3e5b57325aa0bc7ce4",
+                    "hash" : "0x842ed2e7ebbadb1a081941031ca1c783f7bed31561d1ae3e5b57325aa0bc7ce4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "842ed2e7ebbadb1a081941031ca1c783f7bed31561d1ae3e5b57325aa0bc7ce4",
+                    "hash" : "0x842ed2e7ebbadb1a081941031ca1c783f7bed31561d1ae3e5b57325aa0bc7ce4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "842ed2e7ebbadb1a081941031ca1c783f7bed31561d1ae3e5b57325aa0bc7ce4",
+                    "hash" : "0x842ed2e7ebbadb1a081941031ca1c783f7bed31561d1ae3e5b57325aa0bc7ce4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "842ed2e7ebbadb1a081941031ca1c783f7bed31561d1ae3e5b57325aa0bc7ce4",
+                    "hash" : "0x842ed2e7ebbadb1a081941031ca1c783f7bed31561d1ae3e5b57325aa0bc7ce4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "842ed2e7ebbadb1a081941031ca1c783f7bed31561d1ae3e5b57325aa0bc7ce4",
+                    "hash" : "0x842ed2e7ebbadb1a081941031ca1c783f7bed31561d1ae3e5b57325aa0bc7ce4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "842ed2e7ebbadb1a081941031ca1c783f7bed31561d1ae3e5b57325aa0bc7ce4",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350f4fd94058f06a255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1996511098"
+                "0x7700577a"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest627.json b/GeneralStateTests/stRandom/randomStatetest627.json
index 6a0cdac89..0d6273158 100644
--- a/GeneralStateTests/stRandom/randomStatetest627.json
+++ b/GeneralStateTests/stRandom/randomStatetest627.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest627" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a608ca53070e64dd3a8799f7ba3ef6d3778a7d5690164629300ff317fb562803",
+                    "hash" : "0xa608ca53070e64dd3a8799f7ba3ef6d3778a7d5690164629300ff317fb562803",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a608ca53070e64dd3a8799f7ba3ef6d3778a7d5690164629300ff317fb562803",
+                    "hash" : "0xa608ca53070e64dd3a8799f7ba3ef6d3778a7d5690164629300ff317fb562803",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2465a80afee3e3df91074e642a3d8d90911831d6f9e16172a938ed284649eb72",
+                    "hash" : "0x2465a80afee3e3df91074e642a3d8d90911831d6f9e16172a938ed284649eb72",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "2465a80afee3e3df91074e642a3d8d90911831d6f9e16172a938ed284649eb72",
+                    "hash" : "0x2465a80afee3e3df91074e642a3d8d90911831d6f9e16172a938ed284649eb72",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a608ca53070e64dd3a8799f7ba3ef6d3778a7d5690164629300ff317fb562803",
+                    "hash" : "0xa608ca53070e64dd3a8799f7ba3ef6d3778a7d5690164629300ff317fb562803",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "2052fa6d3366a78d35c34cbdf4b81d532697a05d52f3a32dffbfb22c08ad238b",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x424243434442424254f262707f3b55",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest628.json b/GeneralStateTests/stRandom/randomStatetest628.json
index 64307504d..03d182400 100644
--- a/GeneralStateTests/stRandom/randomStatetest628.json
+++ b/GeneralStateTests/stRandom/randomStatetest628.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest628" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f4d9cae516d3c6e871cb82a179804a99064f0f54c24c85a2db1711adbaba1355",
+                    "hash" : "0xf4d9cae516d3c6e871cb82a179804a99064f0f54c24c85a2db1711adbaba1355",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f4d9cae516d3c6e871cb82a179804a99064f0f54c24c85a2db1711adbaba1355",
+                    "hash" : "0xf4d9cae516d3c6e871cb82a179804a99064f0f54c24c85a2db1711adbaba1355",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b0d06d7f17ae4205bbae17bff580ed2ac8a1a57c9e8e0693bccc4c8495aa644c",
+                    "hash" : "0xb0d06d7f17ae4205bbae17bff580ed2ac8a1a57c9e8e0693bccc4c8495aa644c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b0d06d7f17ae4205bbae17bff580ed2ac8a1a57c9e8e0693bccc4c8495aa644c",
+                    "hash" : "0xb0d06d7f17ae4205bbae17bff580ed2ac8a1a57c9e8e0693bccc4c8495aa644c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f4d9cae516d3c6e871cb82a179804a99064f0f54c24c85a2db1711adbaba1355",
+                    "hash" : "0xf4d9cae516d3c6e871cb82a179804a99064f0f54c24c85a2db1711adbaba1355",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "b0d06d7f17ae4205bbae17bff580ed2ac8a1a57c9e8e0693bccc4c8495aa644c",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x41413155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest629.json b/GeneralStateTests/stRandom/randomStatetest629.json
index bbbfdc642..add80320f 100644
--- a/GeneralStateTests/stRandom/randomStatetest629.json
+++ b/GeneralStateTests/stRandom/randomStatetest629.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest629" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "dd8431091945f39a1d85ccf13e503f2c857a59193856122f16bc6b9e458b8438",
+                    "hash" : "0xdd8431091945f39a1d85ccf13e503f2c857a59193856122f16bc6b9e458b8438",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "dd8431091945f39a1d85ccf13e503f2c857a59193856122f16bc6b9e458b8438",
+                    "hash" : "0xdd8431091945f39a1d85ccf13e503f2c857a59193856122f16bc6b9e458b8438",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "dd8431091945f39a1d85ccf13e503f2c857a59193856122f16bc6b9e458b8438",
+                    "hash" : "0xdd8431091945f39a1d85ccf13e503f2c857a59193856122f16bc6b9e458b8438",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "dd8431091945f39a1d85ccf13e503f2c857a59193856122f16bc6b9e458b8438",
+                    "hash" : "0xdd8431091945f39a1d85ccf13e503f2c857a59193856122f16bc6b9e458b8438",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "dd8431091945f39a1d85ccf13e503f2c857a59193856122f16bc6b9e458b8438",
+                    "hash" : "0xdd8431091945f39a1d85ccf13e503f2c857a59193856122f16bc6b9e458b8438",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "dd8431091945f39a1d85ccf13e503f2c857a59193856122f16bc6b9e458b8438",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5347f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5116f427277147c617f4354a35a1a47977a5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1003338368"
+                "0x3bcdba80"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest63.json b/GeneralStateTests/stRandom/randomStatetest63.json
index e58a1f919..006561c5a 100644
--- a/GeneralStateTests/stRandom/randomStatetest63.json
+++ b/GeneralStateTests/stRandom/randomStatetest63.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest63" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "22d0e07f88a5177a002ea49e1385295d6829d7af413c768aa0667d0173ad9f35",
+                    "hash" : "0x22d0e07f88a5177a002ea49e1385295d6829d7af413c768aa0667d0173ad9f35",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "22d0e07f88a5177a002ea49e1385295d6829d7af413c768aa0667d0173ad9f35",
+                    "hash" : "0x22d0e07f88a5177a002ea49e1385295d6829d7af413c768aa0667d0173ad9f35",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "22d0e07f88a5177a002ea49e1385295d6829d7af413c768aa0667d0173ad9f35",
+                    "hash" : "0x22d0e07f88a5177a002ea49e1385295d6829d7af413c768aa0667d0173ad9f35",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "22d0e07f88a5177a002ea49e1385295d6829d7af413c768aa0667d0173ad9f35",
+                    "hash" : "0x22d0e07f88a5177a002ea49e1385295d6829d7af413c768aa0667d0173ad9f35",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "22d0e07f88a5177a002ea49e1385295d6829d7af413c768aa0667d0173ad9f35",
+                    "hash" : "0x22d0e07f88a5177a002ea49e1385295d6829d7af413c768aa0667d0173ad9f35",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "22d0e07f88a5177a002ea49e1385295d6829d7af413c768aa0667d0173ad9f35",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000006f977f157e088003767a86928e8252965560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "833723715"
+                "0x31b19d43"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest630.json b/GeneralStateTests/stRandom/randomStatetest630.json
index b2a928c7f..1c7bc7709 100644
--- a/GeneralStateTests/stRandom/randomStatetest630.json
+++ b/GeneralStateTests/stRandom/randomStatetest630.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest630" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d840c7a6d521b8f1ebb0c9526f0270753e6605b8be058ba89cb9979b23da00e0",
+                    "hash" : "0xd840c7a6d521b8f1ebb0c9526f0270753e6605b8be058ba89cb9979b23da00e0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d840c7a6d521b8f1ebb0c9526f0270753e6605b8be058ba89cb9979b23da00e0",
+                    "hash" : "0xd840c7a6d521b8f1ebb0c9526f0270753e6605b8be058ba89cb9979b23da00e0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "d840c7a6d521b8f1ebb0c9526f0270753e6605b8be058ba89cb9979b23da00e0",
+                    "hash" : "0xd840c7a6d521b8f1ebb0c9526f0270753e6605b8be058ba89cb9979b23da00e0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "d840c7a6d521b8f1ebb0c9526f0270753e6605b8be058ba89cb9979b23da00e0",
+                    "hash" : "0xd840c7a6d521b8f1ebb0c9526f0270753e6605b8be058ba89cb9979b23da00e0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d840c7a6d521b8f1ebb0c9526f0270753e6605b8be058ba89cb9979b23da00e0",
+                    "hash" : "0xd840c7a6d521b8f1ebb0c9526f0270753e6605b8be058ba89cb9979b23da00e0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "d840c7a6d521b8f1ebb0c9526f0270753e6605b8be058ba89cb9979b23da00e0",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000000000000000000000000001427f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f9461a46e61507a1206917b17137e7e5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "411786818"
+                "0x188b5e42"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest631.json b/GeneralStateTests/stRandom/randomStatetest631.json
index d7f8aaa67..1f1075d1f 100644
--- a/GeneralStateTests/stRandom/randomStatetest631.json
+++ b/GeneralStateTests/stRandom/randomStatetest631.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest631" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d0b79603ddaefb9d038449f334f543d84931fafb3f7c3ddd92e131f1b5605800",
+                    "hash" : "0xd0b79603ddaefb9d038449f334f543d84931fafb3f7c3ddd92e131f1b5605800",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d0b79603ddaefb9d038449f334f543d84931fafb3f7c3ddd92e131f1b5605800",
+                    "hash" : "0xd0b79603ddaefb9d038449f334f543d84931fafb3f7c3ddd92e131f1b5605800",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "d0b79603ddaefb9d038449f334f543d84931fafb3f7c3ddd92e131f1b5605800",
+                    "hash" : "0xd0b79603ddaefb9d038449f334f543d84931fafb3f7c3ddd92e131f1b5605800",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "d0b79603ddaefb9d038449f334f543d84931fafb3f7c3ddd92e131f1b5605800",
+                    "hash" : "0xd0b79603ddaefb9d038449f334f543d84931fafb3f7c3ddd92e131f1b5605800",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d0b79603ddaefb9d038449f334f543d84931fafb3f7c3ddd92e131f1b5605800",
+                    "hash" : "0xd0b79603ddaefb9d038449f334f543d84931fafb3f7c3ddd92e131f1b5605800",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "d0b79603ddaefb9d038449f334f543d84931fafb3f7c3ddd92e131f1b5605800",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000010000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c350383709658551993b760955",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1804331878"
+                "0x6b8beb66"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest632.json b/GeneralStateTests/stRandom/randomStatetest632.json
index 6a18e8e69..1ee25779f 100644
--- a/GeneralStateTests/stRandom/randomStatetest632.json
+++ b/GeneralStateTests/stRandom/randomStatetest632.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest632" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "905fa642806a48fa50e933dff10e4a5ab8a67e9ab59a82a56ca70d916722dca0",
+                    "hash" : "0x905fa642806a48fa50e933dff10e4a5ab8a67e9ab59a82a56ca70d916722dca0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "515cd8699abad08dcd173cae89e9e58b11fd822f7545dcf276f1eb40c1e4fd93",
+                    "hash" : "0x515cd8699abad08dcd173cae89e9e58b11fd822f7545dcf276f1eb40c1e4fd93",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "7cb038e6078df23e57b705eab4969c36f24e8ca8a13cf781d22410a029823245",
+                    "hash" : "0x7cb038e6078df23e57b705eab4969c36f24e8ca8a13cf781d22410a029823245",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "7cb038e6078df23e57b705eab4969c36f24e8ca8a13cf781d22410a029823245",
+                    "hash" : "0x7cb038e6078df23e57b705eab4969c36f24e8ca8a13cf781d22410a029823245",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "515cd8699abad08dcd173cae89e9e58b11fd822f7545dcf276f1eb40c1e4fd93",
+                    "hash" : "0x515cd8699abad08dcd173cae89e9e58b11fd822f7545dcf276f1eb40c1e4fd93",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "3ec3270c32b915349f7f0be6bc50eab148c225596906df7ead581b41267a9262",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x434243434444424350303614f20a",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest633.json b/GeneralStateTests/stRandom/randomStatetest633.json
index 71f5146a6..f4dfcee91 100644
--- a/GeneralStateTests/stRandom/randomStatetest633.json
+++ b/GeneralStateTests/stRandom/randomStatetest633.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest633" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a04c0953986ae19dbaa7797ebe5890fc1c9cdcb9e64397e984e32cf0f8d30cbf",
+                    "hash" : "0xa04c0953986ae19dbaa7797ebe5890fc1c9cdcb9e64397e984e32cf0f8d30cbf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a04c0953986ae19dbaa7797ebe5890fc1c9cdcb9e64397e984e32cf0f8d30cbf",
+                    "hash" : "0xa04c0953986ae19dbaa7797ebe5890fc1c9cdcb9e64397e984e32cf0f8d30cbf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a04c0953986ae19dbaa7797ebe5890fc1c9cdcb9e64397e984e32cf0f8d30cbf",
+                    "hash" : "0xa04c0953986ae19dbaa7797ebe5890fc1c9cdcb9e64397e984e32cf0f8d30cbf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a04c0953986ae19dbaa7797ebe5890fc1c9cdcb9e64397e984e32cf0f8d30cbf",
+                    "hash" : "0xa04c0953986ae19dbaa7797ebe5890fc1c9cdcb9e64397e984e32cf0f8d30cbf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a04c0953986ae19dbaa7797ebe5890fc1c9cdcb9e64397e984e32cf0f8d30cbf",
+                    "hash" : "0xa04c0953986ae19dbaa7797ebe5890fc1c9cdcb9e64397e984e32cf0f8d30cbf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "a04c0953986ae19dbaa7797ebe5890fc1c9cdcb9e64397e984e32cf0f8d30cbf",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b56f82941340756317567250f1573a89765560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1358306105"
+                "0x50f61b39"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest634.json b/GeneralStateTests/stRandom/randomStatetest634.json
index 17c2839c4..1072f78e5 100644
--- a/GeneralStateTests/stRandom/randomStatetest634.json
+++ b/GeneralStateTests/stRandom/randomStatetest634.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest634" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "719065d925597cdd3398fbd80b452c722ad40feefa55ae15aae3b410093edb1c",
+                    "hash" : "0x719065d925597cdd3398fbd80b452c722ad40feefa55ae15aae3b410093edb1c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "719065d925597cdd3398fbd80b452c722ad40feefa55ae15aae3b410093edb1c",
+                    "hash" : "0x719065d925597cdd3398fbd80b452c722ad40feefa55ae15aae3b410093edb1c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "719065d925597cdd3398fbd80b452c722ad40feefa55ae15aae3b410093edb1c",
+                    "hash" : "0x719065d925597cdd3398fbd80b452c722ad40feefa55ae15aae3b410093edb1c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "719065d925597cdd3398fbd80b452c722ad40feefa55ae15aae3b410093edb1c",
+                    "hash" : "0x719065d925597cdd3398fbd80b452c722ad40feefa55ae15aae3b410093edb1c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "719065d925597cdd3398fbd80b452c722ad40feefa55ae15aae3b410093edb1c",
+                    "hash" : "0x719065d925597cdd3398fbd80b452c722ad40feefa55ae15aae3b410093edb1c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "719065d925597cdd3398fbd80b452c722ad40feefa55ae15aae3b410093edb1c",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x43424044454245343af399e4a4734555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest635.json b/GeneralStateTests/stRandom/randomStatetest635.json
index 17e9c48fe..adb10c589 100644
--- a/GeneralStateTests/stRandom/randomStatetest635.json
+++ b/GeneralStateTests/stRandom/randomStatetest635.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest635" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "5dc2da3c6747e194c7f660b2000504730dd2e381c30e74f18db28e63a5bc5583",
+                    "hash" : "0x5dc2da3c6747e194c7f660b2000504730dd2e381c30e74f18db28e63a5bc5583",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "5dc2da3c6747e194c7f660b2000504730dd2e381c30e74f18db28e63a5bc5583",
+                    "hash" : "0x5dc2da3c6747e194c7f660b2000504730dd2e381c30e74f18db28e63a5bc5583",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b010df03a8f3e5d887163e5a995c0f01b0b190bd572aeb9e12d2c3a927e76c34",
+                    "hash" : "0xb010df03a8f3e5d887163e5a995c0f01b0b190bd572aeb9e12d2c3a927e76c34",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b010df03a8f3e5d887163e5a995c0f01b0b190bd572aeb9e12d2c3a927e76c34",
+                    "hash" : "0xb010df03a8f3e5d887163e5a995c0f01b0b190bd572aeb9e12d2c3a927e76c34",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "5dc2da3c6747e194c7f660b2000504730dd2e381c30e74f18db28e63a5bc5583",
+                    "hash" : "0x5dc2da3c6747e194c7f660b2000504730dd2e381c30e74f18db28e63a5bc5583",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "b010df03a8f3e5d887163e5a995c0f01b0b190bd572aeb9e12d2c3a927e76c34",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6a5b7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe66f2707d83713b6b8f320855",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1615246365"
+                "0x6046b41d"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest636.json b/GeneralStateTests/stRandom/randomStatetest636.json
index 5a02a6aca..e481e75a6 100644
--- a/GeneralStateTests/stRandom/randomStatetest636.json
+++ b/GeneralStateTests/stRandom/randomStatetest636.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest636" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
             {
@@ -22,7 +22,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b2598fdc91f328e9280e73e5596155060caa4860444d07a76564b6f024df984d",
+                    "hash" : "0xb2598fdc91f328e9280e73e5596155060caa4860444d07a76564b6f024df984d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -32,7 +32,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b2598fdc91f328e9280e73e5596155060caa4860444d07a76564b6f024df984d",
+                    "hash" : "0xb2598fdc91f328e9280e73e5596155060caa4860444d07a76564b6f024df984d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -42,7 +42,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a7aeef9ab7238851dfa47129375aa65f74af5af05173785252a9bc4e69a3d052",
+                    "hash" : "0xa7aeef9ab7238851dfa47129375aa65f74af5af05173785252a9bc4e69a3d052",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -52,7 +52,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a7aeef9ab7238851dfa47129375aa65f74af5af05173785252a9bc4e69a3d052",
+                    "hash" : "0xa7aeef9ab7238851dfa47129375aa65f74af5af05173785252a9bc4e69a3d052",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,7 +62,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b2598fdc91f328e9280e73e5596155060caa4860444d07a76564b6f024df984d",
+                    "hash" : "0xb2598fdc91f328e9280e73e5596155060caa4860444d07a76564b6f024df984d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -73,23 +73,23 @@
         },
         "postStateRoot" : "a7aeef9ab7238851dfa47129375aa65f74af5af05173785252a9bc4e69a3d052",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x74619921c0750ac3268e7a6703ca2bf6c43308e6fc36607561af1ca16db843f7a2e05bfc2e46afc179930b7a8724a04f9f561bdc65bba0ad5797dde0a28d5e8aca56e1510b724f676a6d33dee473d74664561e49e3d86338c8dcf260f06cbfa6283966d2d0f2591f54088e6f36545c0d90fcdea10d5629629ffb1b16626c339f6490829f1b1675f0f2f62b0b7c9d3f070fafd53f99f90f31e19e81d3db688929213e34affc41116e6ae6f54ad5c2062b27a9fbec78a52f7a26c6347408631a6c0efcf33fe576953a4043e846b686471403f38a615a0a8e601d600a600e60146301019a5173095e7baea6a6c7c4c2dfeb977efac326af552d8763314bc0fef1600c7eb69785d3593d3a8552018a4faba5b591975e8b8056ebc01f5ce5f5f7c04eca9062b458a835649be8fbaa906f3c4d8f92f8c27517f0addd45e050bfcf55792d8bf87c39d39ed9b1ef6c8c070d8da4a624ce548b37d03ae8107ca6da49be4adffc9f5ae896c52b936a18bed4bd9fcbae531274706e9e9b9030619a40714bb4b22e7bef8cf7b01551327188ee4bb6247118d0e95549a92f7dd9305484cc054e5f206d70d008699a85896061427b05ae2a7f16230f66ab4dd548e03b0972010f5afff39a4f9a90e55e91584e86629f3e8775f53da16fceedd834103a50dbe72a6634e4dbf374c70e6bd041628dc8b30de3c3d7aa0e7bb48df927c78ed30b286e249c2cbe79fb55956f492e413e771d0cd63f7357ab1e9a38026a4ba9278427812728699a2c747189",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -104,8 +104,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x74ff9009"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest637.json b/GeneralStateTests/stRandom/randomStatetest637.json
index 7ac0c6635..9eefdf83a 100644
--- a/GeneralStateTests/stRandom/randomStatetest637.json
+++ b/GeneralStateTests/stRandom/randomStatetest637.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest637" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c93dc65eefdda98819e9c03d6333850a10a87e310545632992480f216a00165b",
+                    "hash" : "0xc93dc65eefdda98819e9c03d6333850a10a87e310545632992480f216a00165b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c93dc65eefdda98819e9c03d6333850a10a87e310545632992480f216a00165b",
+                    "hash" : "0xc93dc65eefdda98819e9c03d6333850a10a87e310545632992480f216a00165b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "c93dc65eefdda98819e9c03d6333850a10a87e310545632992480f216a00165b",
+                    "hash" : "0xc93dc65eefdda98819e9c03d6333850a10a87e310545632992480f216a00165b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c93dc65eefdda98819e9c03d6333850a10a87e310545632992480f216a00165b",
+                    "hash" : "0xc93dc65eefdda98819e9c03d6333850a10a87e310545632992480f216a00165b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c93dc65eefdda98819e9c03d6333850a10a87e310545632992480f216a00165b",
+                    "hash" : "0xc93dc65eefdda98819e9c03d6333850a10a87e310545632992480f216a00165b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "c93dc65eefdda98819e9c03d6333850a10a87e310545632992480f216a00165b",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f44931064138e9df1768334028c20147160005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1479766116"
+                "0x58337064"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest638.json b/GeneralStateTests/stRandom/randomStatetest638.json
index bbae2f8b2..75f0cadeb 100644
--- a/GeneralStateTests/stRandom/randomStatetest638.json
+++ b/GeneralStateTests/stRandom/randomStatetest638.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest638" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "5160cf6b8a0365da3cba5646d6fce4b4da792520672fbff4356573987a9719d4",
+                    "hash" : "0x5160cf6b8a0365da3cba5646d6fce4b4da792520672fbff4356573987a9719d4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "5160cf6b8a0365da3cba5646d6fce4b4da792520672fbff4356573987a9719d4",
+                    "hash" : "0x5160cf6b8a0365da3cba5646d6fce4b4da792520672fbff4356573987a9719d4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5160cf6b8a0365da3cba5646d6fce4b4da792520672fbff4356573987a9719d4",
+                    "hash" : "0x5160cf6b8a0365da3cba5646d6fce4b4da792520672fbff4356573987a9719d4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5160cf6b8a0365da3cba5646d6fce4b4da792520672fbff4356573987a9719d4",
+                    "hash" : "0x5160cf6b8a0365da3cba5646d6fce4b4da792520672fbff4356573987a9719d4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "5160cf6b8a0365da3cba5646d6fce4b4da792520672fbff4356573987a9719d4",
+                    "hash" : "0x5160cf6b8a0365da3cba5646d6fce4b4da792520672fbff4356573987a9719d4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "5160cf6b8a0365da3cba5646d6fce4b4da792520672fbff4356573987a9719d4",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0960005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "2032022422"
+                "0x791e3396"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest639.json b/GeneralStateTests/stRandom/randomStatetest639.json
index 4a544006f..8d37f3e4f 100644
--- a/GeneralStateTests/stRandom/randomStatetest639.json
+++ b/GeneralStateTests/stRandom/randomStatetest639.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest639" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
             {
@@ -22,7 +22,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "8d726d976981f915dbe889c1e79e72d5c55fcb13d2eeb57d901107d4720cd426",
+                    "hash" : "0x8d726d976981f915dbe889c1e79e72d5c55fcb13d2eeb57d901107d4720cd426",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -32,7 +32,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "8d726d976981f915dbe889c1e79e72d5c55fcb13d2eeb57d901107d4720cd426",
+                    "hash" : "0x8d726d976981f915dbe889c1e79e72d5c55fcb13d2eeb57d901107d4720cd426",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -42,7 +42,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "11c813319b717de8aba2fae8e1cbe909f598de11761430d52f35b85165d3ad13",
+                    "hash" : "0x11c813319b717de8aba2fae8e1cbe909f598de11761430d52f35b85165d3ad13",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -52,7 +52,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "11c813319b717de8aba2fae8e1cbe909f598de11761430d52f35b85165d3ad13",
+                    "hash" : "0x11c813319b717de8aba2fae8e1cbe909f598de11761430d52f35b85165d3ad13",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -62,7 +62,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "8d726d976981f915dbe889c1e79e72d5c55fcb13d2eeb57d901107d4720cd426",
+                    "hash" : "0x8d726d976981f915dbe889c1e79e72d5c55fcb13d2eeb57d901107d4720cd426",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -73,23 +73,23 @@
         },
         "postStateRoot" : "11c813319b717de8aba2fae8e1cbe909f598de11761430d52f35b85165d3ad13",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x6e993d78e80807a0d34bdbfa4e0afa9d7eab95e6f8772a548229700e2dcc612ac9ceeb898af8436680a2e1074df8ced0137964d71c8fe8a10fb58f8706ea3ee1b54a0848e742ca357e3d023460c161b1f5a17c48da2ae1e6987c52223414746fab0e39130693d15a48d39b5130096a7c1570c4fb89343ef5d10e912decba682bf205de79e84c573c9e2b0ffbd4d6117e40046b4c2d77156ada28960d9bb97f56d243429aa245c32e1f800a686ebe298dd08349d864486d7a1569b5aae495776bb5e71206cd09f54d1cd713966557567542184c74b95cc0d8ac3d0e05d0264b8d42a3563826123fc0d964521b61b86374591a821818672ef0dea05d259bc4f98c34418d9e7a677173b211649c07df7670aca688053842de6157c4fb5e678adc0611fcc20a1d836ec69b9370d09b83f1b0293a1b102d6d73978584b14fb2ab517001867e6545dd2dc3438f9c7828f6d3c6e4da98113ce2486c1ad028dc9947b28590071b977e651d352b078cb96b27f9ff7252c9f3ce9e5151ae7af1064ab8a5d92ed543b9d59c341f85bb22aa2fa7d7ee7310ac8f519e66da165b9efe3663657b1e28f4eb3e7338391339af5346d12c14bbc0863c26d7e999776c7939cefac542ed69f518bbef5461c0df385004f5411c3faaa65c7b6abf900ca1ef1f40bb938f727695a1ca14012ba07cc01548f3df75544b11bb52b7693bed7e2fc1537b2f8d63c4db4c3d8fc72b6f5f7e7b4d1ec8c1ac89230936975d19626788f03504a8c9acf66437d6d885607778bee6fe54742ddc9a7d8373dbfe2e21aacf8816944c02ef983260156009600960186329ec801e73095e7baea6a6c7c4c2dfeb977efac326af552d876356837182f175259fc2ea2df7d720fb0914ed44bcb12b8ff15e712ef67d868fe7fba6b46fac671a45bcace82fa83b87b8744835ac63d2b6cf3d157d7526909f9c4d1efbf68d780af1c0f2dabbfc53d2c71dc461bf7f788e3a9c48cd1df8d146a7df97125985162ecd37b059204323d066cb4709a3a1715f7c4a9fb905c26ba87933ef2499d3447d5cd4df27a6205c8a1ce06719c3e065e66ab80222ff7ed1f72f533a1160330dbd8dcd0489ec2dac84d7522a4d8732c5ae9e08d9a251682fb33fa08ecc05197d897a1d5f28328caa78ca6cd6b86fd08a1748fa959665861d18c25a3cae79732fe4fb3ad8b48c17c8efeeb5ec22be8b20ec4eae2955d65b9a6c1415c23047aa8f2c29aeddd78765c1bc3eda63416d84cdb9b8d7942020db3b1ed861a966475eb6ef9f9920692a879ee6bf9d0a1dd9d386",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -104,8 +104,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x49c00898"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest64.json b/GeneralStateTests/stRandom/randomStatetest64.json
index 08ed403c0..b07dba651 100644
--- a/GeneralStateTests/stRandom/randomStatetest64.json
+++ b/GeneralStateTests/stRandom/randomStatetest64.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest64" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b29e8990e320cfa0ffb7d9fb8685620f29e93e9d5be41cec67cc91a192c43b50",
+                    "hash" : "0xb29e8990e320cfa0ffb7d9fb8685620f29e93e9d5be41cec67cc91a192c43b50",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "968269aaaea4454bd94fa6c7617316e8528a1ab3adcda46d932812dcd16c0a74",
+                    "hash" : "0x968269aaaea4454bd94fa6c7617316e8528a1ab3adcda46d932812dcd16c0a74",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b29e8990e320cfa0ffb7d9fb8685620f29e93e9d5be41cec67cc91a192c43b50",
+                    "hash" : "0xb29e8990e320cfa0ffb7d9fb8685620f29e93e9d5be41cec67cc91a192c43b50",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b29e8990e320cfa0ffb7d9fb8685620f29e93e9d5be41cec67cc91a192c43b50",
+                    "hash" : "0xb29e8990e320cfa0ffb7d9fb8685620f29e93e9d5be41cec67cc91a192c43b50",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "968269aaaea4454bd94fa6c7617316e8528a1ab3adcda46d932812dcd16c0a74",
+                    "hash" : "0x968269aaaea4454bd94fa6c7617316e8528a1ab3adcda46d932812dcd16c0a74",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "b29e8990e320cfa0ffb7d9fb8685620f29e93e9d5be41cec67cc91a192c43b50",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x427f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe087f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b50a5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "873959833"
+                "0x34179199"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest640.json b/GeneralStateTests/stRandom/randomStatetest640.json
index ddd97b955..3af5d84ef 100644
--- a/GeneralStateTests/stRandom/randomStatetest640.json
+++ b/GeneralStateTests/stRandom/randomStatetest640.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest640" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "31fef3f415e32007a44dafc952f408ea27e3508450c6bea84d1b24c5a3033240",
+                    "hash" : "0x31fef3f415e32007a44dafc952f408ea27e3508450c6bea84d1b24c5a3033240",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "31fef3f415e32007a44dafc952f408ea27e3508450c6bea84d1b24c5a3033240",
+                    "hash" : "0x31fef3f415e32007a44dafc952f408ea27e3508450c6bea84d1b24c5a3033240",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "31fef3f415e32007a44dafc952f408ea27e3508450c6bea84d1b24c5a3033240",
+                    "hash" : "0x31fef3f415e32007a44dafc952f408ea27e3508450c6bea84d1b24c5a3033240",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "31fef3f415e32007a44dafc952f408ea27e3508450c6bea84d1b24c5a3033240",
+                    "hash" : "0x31fef3f415e32007a44dafc952f408ea27e3508450c6bea84d1b24c5a3033240",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "31fef3f415e32007a44dafc952f408ea27e3508450c6bea84d1b24c5a3033240",
+                    "hash" : "0x31fef3f415e32007a44dafc952f408ea27e3508450c6bea84d1b24c5a3033240",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "31fef3f415e32007a44dafc952f408ea27e3508450c6bea84d1b24c5a3033240",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000807f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff50885560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "6954369"
+                "0x6a1d81"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest641.json b/GeneralStateTests/stRandom/randomStatetest641.json
index 540c827c6..d3fd96f09 100644
--- a/GeneralStateTests/stRandom/randomStatetest641.json
+++ b/GeneralStateTests/stRandom/randomStatetest641.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest641" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "3822329c9cb2cf135d6051498b840a029d24f464147c29d1d3048eeb3f9529c6",
+                    "hash" : "0x3822329c9cb2cf135d6051498b840a029d24f464147c29d1d3048eeb3f9529c6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "3822329c9cb2cf135d6051498b840a029d24f464147c29d1d3048eeb3f9529c6",
+                    "hash" : "0x3822329c9cb2cf135d6051498b840a029d24f464147c29d1d3048eeb3f9529c6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3822329c9cb2cf135d6051498b840a029d24f464147c29d1d3048eeb3f9529c6",
+                    "hash" : "0x3822329c9cb2cf135d6051498b840a029d24f464147c29d1d3048eeb3f9529c6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3822329c9cb2cf135d6051498b840a029d24f464147c29d1d3048eeb3f9529c6",
+                    "hash" : "0x3822329c9cb2cf135d6051498b840a029d24f464147c29d1d3048eeb3f9529c6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "3822329c9cb2cf135d6051498b840a029d24f464147c29d1d3048eeb3f9529c6",
+                    "hash" : "0x3822329c9cb2cf135d6051498b840a029d24f464147c29d1d3048eeb3f9529c6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "3822329c9cb2cf135d6051498b840a029d24f464147c29d1d3048eeb3f9529c6",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f29199c9aa4054170f1a15a55056f965560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "252246116"
+                "0x0f08f864"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest65.json b/GeneralStateTests/stRandom/randomStatetest65.json
index 3bbe2adda..63b1dca69 100644
--- a/GeneralStateTests/stRandom/randomStatetest65.json
+++ b/GeneralStateTests/stRandom/randomStatetest65.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest65" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b13e5e48bcc39f600612eee695318c9e874cc8ea5c2f8f37f0d698a896da9d80",
+                    "hash" : "0xb13e5e48bcc39f600612eee695318c9e874cc8ea5c2f8f37f0d698a896da9d80",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b13e5e48bcc39f600612eee695318c9e874cc8ea5c2f8f37f0d698a896da9d80",
+                    "hash" : "0xb13e5e48bcc39f600612eee695318c9e874cc8ea5c2f8f37f0d698a896da9d80",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3cdc601d568e045ed9d83f169c5a1683836ee11894c5a6a226d9879fcf879a80",
+                    "hash" : "0x3cdc601d568e045ed9d83f169c5a1683836ee11894c5a6a226d9879fcf879a80",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3cdc601d568e045ed9d83f169c5a1683836ee11894c5a6a226d9879fcf879a80",
+                    "hash" : "0x3cdc601d568e045ed9d83f169c5a1683836ee11894c5a6a226d9879fcf879a80",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b13e5e48bcc39f600612eee695318c9e874cc8ea5c2f8f37f0d698a896da9d80",
+                    "hash" : "0xb13e5e48bcc39f600612eee695318c9e874cc8ea5c2f8f37f0d698a896da9d80",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "5e8b98839349311642cd834ed8e7880dbf5e10c56674b59beffac05e3a377abd",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x45404043424344444286f26355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest66.json b/GeneralStateTests/stRandom/randomStatetest66.json
index ae5ffccc6..58f4f2dcb 100644
--- a/GeneralStateTests/stRandom/randomStatetest66.json
+++ b/GeneralStateTests/stRandom/randomStatetest66.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest66" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "79a164a288ae0a9152437fefa94256cf5f837de0f172829afd3fe291c6acf379",
+                    "hash" : "0x79a164a288ae0a9152437fefa94256cf5f837de0f172829afd3fe291c6acf379",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "79a164a288ae0a9152437fefa94256cf5f837de0f172829afd3fe291c6acf379",
+                    "hash" : "0x79a164a288ae0a9152437fefa94256cf5f837de0f172829afd3fe291c6acf379",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "79a164a288ae0a9152437fefa94256cf5f837de0f172829afd3fe291c6acf379",
+                    "hash" : "0x79a164a288ae0a9152437fefa94256cf5f837de0f172829afd3fe291c6acf379",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "79a164a288ae0a9152437fefa94256cf5f837de0f172829afd3fe291c6acf379",
+                    "hash" : "0x79a164a288ae0a9152437fefa94256cf5f837de0f172829afd3fe291c6acf379",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "79a164a288ae0a9152437fefa94256cf5f837de0f172829afd3fe291c6acf379",
+                    "hash" : "0x79a164a288ae0a9152437fefa94256cf5f837de0f172829afd3fe291c6acf379",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "79a164a288ae0a9152437fefa94256cf5f837de0f172829afd3fe291c6acf379",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x457fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe097f000000000000000000000001000000000000000000000000000000000000000055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "794190030"
+                "0x2f5660ce"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest67.json b/GeneralStateTests/stRandom/randomStatetest67.json
index 2fafa5080..c1bf06540 100644
--- a/GeneralStateTests/stRandom/randomStatetest67.json
+++ b/GeneralStateTests/stRandom/randomStatetest67.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest67" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b2f85992b546c4cfef759259b80c36c6e336d5f8849819e76c1493e991811edc",
+                    "hash" : "0xb2f85992b546c4cfef759259b80c36c6e336d5f8849819e76c1493e991811edc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b2f85992b546c4cfef759259b80c36c6e336d5f8849819e76c1493e991811edc",
+                    "hash" : "0xb2f85992b546c4cfef759259b80c36c6e336d5f8849819e76c1493e991811edc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b2f85992b546c4cfef759259b80c36c6e336d5f8849819e76c1493e991811edc",
+                    "hash" : "0xb2f85992b546c4cfef759259b80c36c6e336d5f8849819e76c1493e991811edc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b2f85992b546c4cfef759259b80c36c6e336d5f8849819e76c1493e991811edc",
+                    "hash" : "0xb2f85992b546c4cfef759259b80c36c6e336d5f8849819e76c1493e991811edc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b2f85992b546c4cfef759259b80c36c6e336d5f8849819e76c1493e991811edc",
+                    "hash" : "0xb2f85992b546c4cfef759259b80c36c6e336d5f8849819e76c1493e991811edc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "b2f85992b546c4cfef759259b80c36c6e336d5f8849819e76c1493e991811edc",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000016f699776659a06a27607a2166d5373315560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "2113087573"
+                "0x7df32855"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest68.json b/GeneralStateTests/stRandom/randomStatetest68.json
index 3018757b9..9dd2f849b 100644
--- a/GeneralStateTests/stRandom/randomStatetest68.json
+++ b/GeneralStateTests/stRandom/randomStatetest68.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest68" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e51e7523b966a480e432cdd171646148589c372a005dd6a0a475ff128ca057e7",
+                    "hash" : "0xe51e7523b966a480e432cdd171646148589c372a005dd6a0a475ff128ca057e7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e51e7523b966a480e432cdd171646148589c372a005dd6a0a475ff128ca057e7",
+                    "hash" : "0xe51e7523b966a480e432cdd171646148589c372a005dd6a0a475ff128ca057e7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e51e7523b966a480e432cdd171646148589c372a005dd6a0a475ff128ca057e7",
+                    "hash" : "0xe51e7523b966a480e432cdd171646148589c372a005dd6a0a475ff128ca057e7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e51e7523b966a480e432cdd171646148589c372a005dd6a0a475ff128ca057e7",
+                    "hash" : "0xe51e7523b966a480e432cdd171646148589c372a005dd6a0a475ff128ca057e7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e51e7523b966a480e432cdd171646148589c372a005dd6a0a475ff128ca057e7",
+                    "hash" : "0xe51e7523b966a480e432cdd171646148589c372a005dd6a0a475ff128ca057e7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "e51e7523b966a480e432cdd171646148589c372a005dd6a0a475ff128ca057e7",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x45424043404545456b689f9b7055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest69.json b/GeneralStateTests/stRandom/randomStatetest69.json
index f9ba47dc5..b12004fde 100644
--- a/GeneralStateTests/stRandom/randomStatetest69.json
+++ b/GeneralStateTests/stRandom/randomStatetest69.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest69" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "8e69afa957219d573ae0378b83f0469a7cca823debe950b8814c6afc51f398ab",
+                    "hash" : "0x8e69afa957219d573ae0378b83f0469a7cca823debe950b8814c6afc51f398ab",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "8e69afa957219d573ae0378b83f0469a7cca823debe950b8814c6afc51f398ab",
+                    "hash" : "0x8e69afa957219d573ae0378b83f0469a7cca823debe950b8814c6afc51f398ab",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "8e69afa957219d573ae0378b83f0469a7cca823debe950b8814c6afc51f398ab",
+                    "hash" : "0x8e69afa957219d573ae0378b83f0469a7cca823debe950b8814c6afc51f398ab",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "8e69afa957219d573ae0378b83f0469a7cca823debe950b8814c6afc51f398ab",
+                    "hash" : "0x8e69afa957219d573ae0378b83f0469a7cca823debe950b8814c6afc51f398ab",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "8e69afa957219d573ae0378b83f0469a7cca823debe950b8814c6afc51f398ab",
+                    "hash" : "0x8e69afa957219d573ae0378b83f0469a7cca823debe950b8814c6afc51f398ab",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "8e69afa957219d573ae0378b83f0469a7cca823debe950b8814c6afc51f398ab",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe43596f15a0770a7676611a6595057b768b645560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "795619675"
+                "0x2f6c315b"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest7.json b/GeneralStateTests/stRandom/randomStatetest7.json
index 85e91184d..98b853e04 100644
--- a/GeneralStateTests/stRandom/randomStatetest7.json
+++ b/GeneralStateTests/stRandom/randomStatetest7.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest7" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "df4b7ba2bbcedccfabcabc186f9b8930d621319cce791f183c607b584f78c53d",
+                    "hash" : "0xdf4b7ba2bbcedccfabcabc186f9b8930d621319cce791f183c607b584f78c53d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "df4b7ba2bbcedccfabcabc186f9b8930d621319cce791f183c607b584f78c53d",
+                    "hash" : "0xdf4b7ba2bbcedccfabcabc186f9b8930d621319cce791f183c607b584f78c53d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "df4b7ba2bbcedccfabcabc186f9b8930d621319cce791f183c607b584f78c53d",
+                    "hash" : "0xdf4b7ba2bbcedccfabcabc186f9b8930d621319cce791f183c607b584f78c53d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "df4b7ba2bbcedccfabcabc186f9b8930d621319cce791f183c607b584f78c53d",
+                    "hash" : "0xdf4b7ba2bbcedccfabcabc186f9b8930d621319cce791f183c607b584f78c53d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "df4b7ba2bbcedccfabcabc186f9b8930d621319cce791f183c607b584f78c53d",
+                    "hash" : "0xdf4b7ba2bbcedccfabcabc186f9b8930d621319cce791f183c607b584f78c53d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "df4b7ba2bbcedccfabcabc186f9b8930d621319cce791f183c607b584f78c53d",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff557ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe40437f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe163119185560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "826837032"
+                "0x31488828"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest70.json b/GeneralStateTests/stRandom/randomStatetest70.json
index 230ee7ea8..59bebd02b 100644
--- a/GeneralStateTests/stRandom/randomStatetest70.json
+++ b/GeneralStateTests/stRandom/randomStatetest70.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest70" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "719065d925597cdd3398fbd80b452c722ad40feefa55ae15aae3b410093edb1c",
+                    "hash" : "0x719065d925597cdd3398fbd80b452c722ad40feefa55ae15aae3b410093edb1c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "719065d925597cdd3398fbd80b452c722ad40feefa55ae15aae3b410093edb1c",
+                    "hash" : "0x719065d925597cdd3398fbd80b452c722ad40feefa55ae15aae3b410093edb1c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "719065d925597cdd3398fbd80b452c722ad40feefa55ae15aae3b410093edb1c",
+                    "hash" : "0x719065d925597cdd3398fbd80b452c722ad40feefa55ae15aae3b410093edb1c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "719065d925597cdd3398fbd80b452c722ad40feefa55ae15aae3b410093edb1c",
+                    "hash" : "0x719065d925597cdd3398fbd80b452c722ad40feefa55ae15aae3b410093edb1c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "719065d925597cdd3398fbd80b452c722ad40feefa55ae15aae3b410093edb1c",
+                    "hash" : "0x719065d925597cdd3398fbd80b452c722ad40feefa55ae15aae3b410093edb1c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "719065d925597cdd3398fbd80b452c722ad40feefa55ae15aae3b410093edb1c",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x43424044454245343af399e4a4734555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest71.json b/GeneralStateTests/stRandom/randomStatetest71.json
index da02815a7..424febcd4 100644
--- a/GeneralStateTests/stRandom/randomStatetest71.json
+++ b/GeneralStateTests/stRandom/randomStatetest71.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest71" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1d26a7ab5313803e81f6245501dc2c43f16d210d148a053d5f65cace9b941221",
+                    "hash" : "0x1d26a7ab5313803e81f6245501dc2c43f16d210d148a053d5f65cace9b941221",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "1d26a7ab5313803e81f6245501dc2c43f16d210d148a053d5f65cace9b941221",
+                    "hash" : "0x1d26a7ab5313803e81f6245501dc2c43f16d210d148a053d5f65cace9b941221",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "1d26a7ab5313803e81f6245501dc2c43f16d210d148a053d5f65cace9b941221",
+                    "hash" : "0x1d26a7ab5313803e81f6245501dc2c43f16d210d148a053d5f65cace9b941221",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "1d26a7ab5313803e81f6245501dc2c43f16d210d148a053d5f65cace9b941221",
+                    "hash" : "0x1d26a7ab5313803e81f6245501dc2c43f16d210d148a053d5f65cace9b941221",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "1d26a7ab5313803e81f6245501dc2c43f16d210d148a053d5f65cace9b941221",
+                    "hash" : "0x1d26a7ab5313803e81f6245501dc2c43f16d210d148a053d5f65cace9b941221",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "1d26a7ab5313803e81f6245501dc2c43f16d210d148a053d5f65cace9b941221",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x45415a42409140435a53821af355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest72.json b/GeneralStateTests/stRandom/randomStatetest72.json
index 874d340ba..3d6b9cb9e 100644
--- a/GeneralStateTests/stRandom/randomStatetest72.json
+++ b/GeneralStateTests/stRandom/randomStatetest72.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest72" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "92cbb047161785b64b135b84317e4172222e8460510e8d10983eb040f9007336",
+                    "hash" : "0x92cbb047161785b64b135b84317e4172222e8460510e8d10983eb040f9007336",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "92cbb047161785b64b135b84317e4172222e8460510e8d10983eb040f9007336",
+                    "hash" : "0x92cbb047161785b64b135b84317e4172222e8460510e8d10983eb040f9007336",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "92cbb047161785b64b135b84317e4172222e8460510e8d10983eb040f9007336",
+                    "hash" : "0x92cbb047161785b64b135b84317e4172222e8460510e8d10983eb040f9007336",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "92cbb047161785b64b135b84317e4172222e8460510e8d10983eb040f9007336",
+                    "hash" : "0x92cbb047161785b64b135b84317e4172222e8460510e8d10983eb040f9007336",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "92cbb047161785b64b135b84317e4172222e8460510e8d10983eb040f9007336",
+                    "hash" : "0x92cbb047161785b64b135b84317e4172222e8460510e8d10983eb040f9007336",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "92cbb047161785b64b135b84317e4172222e8460510e8d10983eb040f9007336",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff417f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe65688dff579830091304",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,8 +96,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x5ded2cc8"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest73.json b/GeneralStateTests/stRandom/randomStatetest73.json
index 0f1f2a8ca..2bf402a30 100644
--- a/GeneralStateTests/stRandom/randomStatetest73.json
+++ b/GeneralStateTests/stRandom/randomStatetest73.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest73" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "16e85ecf147841f5c4b64ea70e4adc1dd5031eb717edc68072707855a3192afb",
+                    "hash" : "0x16e85ecf147841f5c4b64ea70e4adc1dd5031eb717edc68072707855a3192afb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "16e85ecf147841f5c4b64ea70e4adc1dd5031eb717edc68072707855a3192afb",
+                    "hash" : "0x16e85ecf147841f5c4b64ea70e4adc1dd5031eb717edc68072707855a3192afb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "16e85ecf147841f5c4b64ea70e4adc1dd5031eb717edc68072707855a3192afb",
+                    "hash" : "0x16e85ecf147841f5c4b64ea70e4adc1dd5031eb717edc68072707855a3192afb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "16e85ecf147841f5c4b64ea70e4adc1dd5031eb717edc68072707855a3192afb",
+                    "hash" : "0x16e85ecf147841f5c4b64ea70e4adc1dd5031eb717edc68072707855a3192afb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "16e85ecf147841f5c4b64ea70e4adc1dd5031eb717edc68072707855a3192afb",
+                    "hash" : "0x16e85ecf147841f5c4b64ea70e4adc1dd5031eb717edc68072707855a3192afb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "16e85ecf147841f5c4b64ea70e4adc1dd5031eb717edc68072707855a3192afb",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5b573198d729b711671056e0a055534613855",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "84268071"
+                "0x0505d427"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest74.json b/GeneralStateTests/stRandom/randomStatetest74.json
index 06271d99f..ef7a3f3f3 100644
--- a/GeneralStateTests/stRandom/randomStatetest74.json
+++ b/GeneralStateTests/stRandom/randomStatetest74.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest74" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "5dde2c51aa7875a87e74b8ff7181b85b5529feffc2929a60dfc96e67047c3cd2",
+                    "hash" : "0x5dde2c51aa7875a87e74b8ff7181b85b5529feffc2929a60dfc96e67047c3cd2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "5dde2c51aa7875a87e74b8ff7181b85b5529feffc2929a60dfc96e67047c3cd2",
+                    "hash" : "0x5dde2c51aa7875a87e74b8ff7181b85b5529feffc2929a60dfc96e67047c3cd2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5dde2c51aa7875a87e74b8ff7181b85b5529feffc2929a60dfc96e67047c3cd2",
+                    "hash" : "0x5dde2c51aa7875a87e74b8ff7181b85b5529feffc2929a60dfc96e67047c3cd2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5dde2c51aa7875a87e74b8ff7181b85b5529feffc2929a60dfc96e67047c3cd2",
+                    "hash" : "0x5dde2c51aa7875a87e74b8ff7181b85b5529feffc2929a60dfc96e67047c3cd2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "5dde2c51aa7875a87e74b8ff7181b85b5529feffc2929a60dfc96e67047c3cd2",
+                    "hash" : "0x5dde2c51aa7875a87e74b8ff7181b85b5529feffc2929a60dfc96e67047c3cd2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "5dde2c51aa7875a87e74b8ff7181b85b5529feffc2929a60dfc96e67047c3cd2",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x427ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff3a7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000006f141097788a7b5a72139c07076f18425560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1223108496"
+                "0x48e72790"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest75.json b/GeneralStateTests/stRandom/randomStatetest75.json
index 797cd3c5a..a5bdaf333 100644
--- a/GeneralStateTests/stRandom/randomStatetest75.json
+++ b/GeneralStateTests/stRandom/randomStatetest75.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest75" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a09de35189aad01b988b05a7047c5fe8c2d6f394d856f8a67b1494dae5cd3328",
+                    "hash" : "0xa09de35189aad01b988b05a7047c5fe8c2d6f394d856f8a67b1494dae5cd3328",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a09de35189aad01b988b05a7047c5fe8c2d6f394d856f8a67b1494dae5cd3328",
+                    "hash" : "0xa09de35189aad01b988b05a7047c5fe8c2d6f394d856f8a67b1494dae5cd3328",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a09de35189aad01b988b05a7047c5fe8c2d6f394d856f8a67b1494dae5cd3328",
+                    "hash" : "0xa09de35189aad01b988b05a7047c5fe8c2d6f394d856f8a67b1494dae5cd3328",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a09de35189aad01b988b05a7047c5fe8c2d6f394d856f8a67b1494dae5cd3328",
+                    "hash" : "0xa09de35189aad01b988b05a7047c5fe8c2d6f394d856f8a67b1494dae5cd3328",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a09de35189aad01b988b05a7047c5fe8c2d6f394d856f8a67b1494dae5cd3328",
+                    "hash" : "0xa09de35189aad01b988b05a7047c5fe8c2d6f394d856f8a67b1494dae5cd3328",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "a09de35189aad01b988b05a7047c5fe8c2d6f394d856f8a67b1494dae5cd3328",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000006f5893504553386c7d154001779287765560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "180160312"
+                "0x0abd0738"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest76.json b/GeneralStateTests/stRandom/randomStatetest76.json
index 970b60449..7df897e8e 100644
--- a/GeneralStateTests/stRandom/randomStatetest76.json
+++ b/GeneralStateTests/stRandom/randomStatetest76.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest76" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6f9e4f3207c706b3d75005ab3c2448668689b1364ec5cbbe3b89f906f654a235",
+                    "hash" : "0x6f9e4f3207c706b3d75005ab3c2448668689b1364ec5cbbe3b89f906f654a235",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6f9e4f3207c706b3d75005ab3c2448668689b1364ec5cbbe3b89f906f654a235",
+                    "hash" : "0x6f9e4f3207c706b3d75005ab3c2448668689b1364ec5cbbe3b89f906f654a235",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6f9e4f3207c706b3d75005ab3c2448668689b1364ec5cbbe3b89f906f654a235",
+                    "hash" : "0x6f9e4f3207c706b3d75005ab3c2448668689b1364ec5cbbe3b89f906f654a235",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6f9e4f3207c706b3d75005ab3c2448668689b1364ec5cbbe3b89f906f654a235",
+                    "hash" : "0x6f9e4f3207c706b3d75005ab3c2448668689b1364ec5cbbe3b89f906f654a235",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6f9e4f3207c706b3d75005ab3c2448668689b1364ec5cbbe3b89f906f654a235",
+                    "hash" : "0x6f9e4f3207c706b3d75005ab3c2448668689b1364ec5cbbe3b89f906f654a235",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "6f9e4f3207c706b3d75005ab3c2448668689b1364ec5cbbe3b89f906f654a235",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x437f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe407f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000001375560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1774884589"
+                "0x69ca96ed"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest77.json b/GeneralStateTests/stRandom/randomStatetest77.json
index b5d5b65ba..05409d792 100644
--- a/GeneralStateTests/stRandom/randomStatetest77.json
+++ b/GeneralStateTests/stRandom/randomStatetest77.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest77" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "5b1c7d52d997261f0d7df6e346861678954c39775e7d315c2403cd362d80d953",
+                    "hash" : "0x5b1c7d52d997261f0d7df6e346861678954c39775e7d315c2403cd362d80d953",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "5b1c7d52d997261f0d7df6e346861678954c39775e7d315c2403cd362d80d953",
+                    "hash" : "0x5b1c7d52d997261f0d7df6e346861678954c39775e7d315c2403cd362d80d953",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5b1c7d52d997261f0d7df6e346861678954c39775e7d315c2403cd362d80d953",
+                    "hash" : "0x5b1c7d52d997261f0d7df6e346861678954c39775e7d315c2403cd362d80d953",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5b1c7d52d997261f0d7df6e346861678954c39775e7d315c2403cd362d80d953",
+                    "hash" : "0x5b1c7d52d997261f0d7df6e346861678954c39775e7d315c2403cd362d80d953",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "5b1c7d52d997261f0d7df6e346861678954c39775e7d315c2403cd362d80d953",
+                    "hash" : "0x5b1c7d52d997261f0d7df6e346861678954c39775e7d315c2403cd362d80d953",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "5b1c7d52d997261f0d7df6e346861678954c39775e7d315c2403cd362d80d953",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000141937f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000006f79a06df1a08d05373216d3721903415560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1249250523"
+                "0x4a760cdb"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest78.json b/GeneralStateTests/stRandom/randomStatetest78.json
index 48eb1c390..b2f447f2b 100644
--- a/GeneralStateTests/stRandom/randomStatetest78.json
+++ b/GeneralStateTests/stRandom/randomStatetest78.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest78" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "919463d8f7cd3da2e857914d046de2c08fc6c0be11ee2988525c071b3c818623",
+                    "hash" : "0x919463d8f7cd3da2e857914d046de2c08fc6c0be11ee2988525c071b3c818623",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "919463d8f7cd3da2e857914d046de2c08fc6c0be11ee2988525c071b3c818623",
+                    "hash" : "0x919463d8f7cd3da2e857914d046de2c08fc6c0be11ee2988525c071b3c818623",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "919463d8f7cd3da2e857914d046de2c08fc6c0be11ee2988525c071b3c818623",
+                    "hash" : "0x919463d8f7cd3da2e857914d046de2c08fc6c0be11ee2988525c071b3c818623",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "919463d8f7cd3da2e857914d046de2c08fc6c0be11ee2988525c071b3c818623",
+                    "hash" : "0x919463d8f7cd3da2e857914d046de2c08fc6c0be11ee2988525c071b3c818623",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "919463d8f7cd3da2e857914d046de2c08fc6c0be11ee2988525c071b3c818623",
+                    "hash" : "0x919463d8f7cd3da2e857914d046de2c08fc6c0be11ee2988525c071b3c818623",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "919463d8f7cd3da2e857914d046de2c08fc6c0be11ee2988525c071b3c818623",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5437f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1174648789aa349e0915aa5911",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "181540957"
+                "0x0ad2185d"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest79.json b/GeneralStateTests/stRandom/randomStatetest79.json
index 2ea6ba170..8dcf4ce7f 100644
--- a/GeneralStateTests/stRandom/randomStatetest79.json
+++ b/GeneralStateTests/stRandom/randomStatetest79.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest79" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "97499f70b917caca4d2bb5a004c928ff41bb4b2b2c71a61fafb719167cacac13",
+                    "hash" : "0x97499f70b917caca4d2bb5a004c928ff41bb4b2b2c71a61fafb719167cacac13",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "97499f70b917caca4d2bb5a004c928ff41bb4b2b2c71a61fafb719167cacac13",
+                    "hash" : "0x97499f70b917caca4d2bb5a004c928ff41bb4b2b2c71a61fafb719167cacac13",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "97499f70b917caca4d2bb5a004c928ff41bb4b2b2c71a61fafb719167cacac13",
+                    "hash" : "0x97499f70b917caca4d2bb5a004c928ff41bb4b2b2c71a61fafb719167cacac13",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "97499f70b917caca4d2bb5a004c928ff41bb4b2b2c71a61fafb719167cacac13",
+                    "hash" : "0x97499f70b917caca4d2bb5a004c928ff41bb4b2b2c71a61fafb719167cacac13",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "97499f70b917caca4d2bb5a004c928ff41bb4b2b2c71a61fafb719167cacac13",
+                    "hash" : "0x97499f70b917caca4d2bb5a004c928ff41bb4b2b2c71a61fafb719167cacac13",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "97499f70b917caca4d2bb5a004c928ff41bb4b2b2c71a61fafb719167cacac13",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe40447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f6b0656903a860a0242881274078b435560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "359785134"
+                "0x1571e2ae"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest8.json b/GeneralStateTests/stRandom/randomStatetest8.json
index 8ffbd9baa..418dab843 100644
--- a/GeneralStateTests/stRandom/randomStatetest8.json
+++ b/GeneralStateTests/stRandom/randomStatetest8.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest8" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "dd36edb7c2627ff90019a325bb9c1a7b850fd616664877cfe766a89460b93b9f",
+                    "hash" : "0xdd36edb7c2627ff90019a325bb9c1a7b850fd616664877cfe766a89460b93b9f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "2c28553fbaece8e535762a3852a4ddee5117417cfdf5a27337ddf9abcd05c9fa",
+                    "hash" : "0x2c28553fbaece8e535762a3852a4ddee5117417cfdf5a27337ddf9abcd05c9fa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "dd36edb7c2627ff90019a325bb9c1a7b850fd616664877cfe766a89460b93b9f",
+                    "hash" : "0xdd36edb7c2627ff90019a325bb9c1a7b850fd616664877cfe766a89460b93b9f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "dd36edb7c2627ff90019a325bb9c1a7b850fd616664877cfe766a89460b93b9f",
+                    "hash" : "0xdd36edb7c2627ff90019a325bb9c1a7b850fd616664877cfe766a89460b93b9f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "2c28553fbaece8e535762a3852a4ddee5117417cfdf5a27337ddf9abcd05c9fa",
+                    "hash" : "0x2c28553fbaece8e535762a3852a4ddee5117417cfdf5a27337ddf9abcd05c9fa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "adae6101cc3684325c86df084771e077a5f7bfd2ff635af9705037b48be86a01",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x45454041444344330a78066e6da197ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest80.json b/GeneralStateTests/stRandom/randomStatetest80.json
index d597f2591..4dcf28de5 100644
--- a/GeneralStateTests/stRandom/randomStatetest80.json
+++ b/GeneralStateTests/stRandom/randomStatetest80.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest80" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "daf012dfad9aa1a09d7cefa33fa4ce435de58dbe0b851ae6450e88c8bb70cd1e",
+                    "hash" : "0xdaf012dfad9aa1a09d7cefa33fa4ce435de58dbe0b851ae6450e88c8bb70cd1e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "daf012dfad9aa1a09d7cefa33fa4ce435de58dbe0b851ae6450e88c8bb70cd1e",
+                    "hash" : "0xdaf012dfad9aa1a09d7cefa33fa4ce435de58dbe0b851ae6450e88c8bb70cd1e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "daf012dfad9aa1a09d7cefa33fa4ce435de58dbe0b851ae6450e88c8bb70cd1e",
+                    "hash" : "0xdaf012dfad9aa1a09d7cefa33fa4ce435de58dbe0b851ae6450e88c8bb70cd1e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "daf012dfad9aa1a09d7cefa33fa4ce435de58dbe0b851ae6450e88c8bb70cd1e",
+                    "hash" : "0xdaf012dfad9aa1a09d7cefa33fa4ce435de58dbe0b851ae6450e88c8bb70cd1e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "daf012dfad9aa1a09d7cefa33fa4ce435de58dbe0b851ae6450e88c8bb70cd1e",
+                    "hash" : "0xdaf012dfad9aa1a09d7cefa33fa4ce435de58dbe0b851ae6450e88c8bb70cd1e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "daf012dfad9aa1a09d7cefa33fa4ce435de58dbe0b851ae6450e88c8bb70cd1e",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f0000000000000000000000010000000000000000000000000000000000000000117fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7e7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5681069127b3b9c877d6f6169ff3660005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "517580214"
+                "0x1ed9a5b6"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest81.json b/GeneralStateTests/stRandom/randomStatetest81.json
index f69c9c2f7..11a6eb110 100644
--- a/GeneralStateTests/stRandom/randomStatetest81.json
+++ b/GeneralStateTests/stRandom/randomStatetest81.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest81" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1bb7ebe0f22cf46554e8971383ebd1b4647e384e47f7cccc40ba8a1da350367b",
+                    "hash" : "0x1bb7ebe0f22cf46554e8971383ebd1b4647e384e47f7cccc40ba8a1da350367b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "1bb7ebe0f22cf46554e8971383ebd1b4647e384e47f7cccc40ba8a1da350367b",
+                    "hash" : "0x1bb7ebe0f22cf46554e8971383ebd1b4647e384e47f7cccc40ba8a1da350367b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "1bb7ebe0f22cf46554e8971383ebd1b4647e384e47f7cccc40ba8a1da350367b",
+                    "hash" : "0x1bb7ebe0f22cf46554e8971383ebd1b4647e384e47f7cccc40ba8a1da350367b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "1bb7ebe0f22cf46554e8971383ebd1b4647e384e47f7cccc40ba8a1da350367b",
+                    "hash" : "0x1bb7ebe0f22cf46554e8971383ebd1b4647e384e47f7cccc40ba8a1da350367b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "1bb7ebe0f22cf46554e8971383ebd1b4647e384e47f7cccc40ba8a1da350367b",
+                    "hash" : "0x1bb7ebe0f22cf46554e8971383ebd1b4647e384e47f7cccc40ba8a1da350367b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "1bb7ebe0f22cf46554e8971383ebd1b4647e384e47f7cccc40ba8a1da350367b",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe437f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff436f616c327e0435743c515b078453a03c5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "898282209"
+                "0x358ab2e1"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest82.json b/GeneralStateTests/stRandom/randomStatetest82.json
index b749d7c55..54b10b476 100644
--- a/GeneralStateTests/stRandom/randomStatetest82.json
+++ b/GeneralStateTests/stRandom/randomStatetest82.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest82" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e2b4f251b3161758b2f03f650a4af46b27c4daaadccae1ddb196718cf843d165",
+                    "hash" : "0xe2b4f251b3161758b2f03f650a4af46b27c4daaadccae1ddb196718cf843d165",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e2b4f251b3161758b2f03f650a4af46b27c4daaadccae1ddb196718cf843d165",
+                    "hash" : "0xe2b4f251b3161758b2f03f650a4af46b27c4daaadccae1ddb196718cf843d165",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e2b4f251b3161758b2f03f650a4af46b27c4daaadccae1ddb196718cf843d165",
+                    "hash" : "0xe2b4f251b3161758b2f03f650a4af46b27c4daaadccae1ddb196718cf843d165",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e2b4f251b3161758b2f03f650a4af46b27c4daaadccae1ddb196718cf843d165",
+                    "hash" : "0xe2b4f251b3161758b2f03f650a4af46b27c4daaadccae1ddb196718cf843d165",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e2b4f251b3161758b2f03f650a4af46b27c4daaadccae1ddb196718cf843d165",
+                    "hash" : "0xe2b4f251b3161758b2f03f650a4af46b27c4daaadccae1ddb196718cf843d165",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "e2b4f251b3161758b2f03f650a4af46b27c4daaadccae1ddb196718cf843d165",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff097ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000000655",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1676520806"
+                "0x63edad66"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest83.json b/GeneralStateTests/stRandom/randomStatetest83.json
index 3c8523fa9..2f2202efd 100644
--- a/GeneralStateTests/stRandom/randomStatetest83.json
+++ b/GeneralStateTests/stRandom/randomStatetest83.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest83" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6672a30686fd574d822ca9c8b4d7428f159e79d6863d4a48cd74278dec3527fa",
+                    "hash" : "0x6672a30686fd574d822ca9c8b4d7428f159e79d6863d4a48cd74278dec3527fa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6672a30686fd574d822ca9c8b4d7428f159e79d6863d4a48cd74278dec3527fa",
+                    "hash" : "0x6672a30686fd574d822ca9c8b4d7428f159e79d6863d4a48cd74278dec3527fa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6672a30686fd574d822ca9c8b4d7428f159e79d6863d4a48cd74278dec3527fa",
+                    "hash" : "0x6672a30686fd574d822ca9c8b4d7428f159e79d6863d4a48cd74278dec3527fa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6672a30686fd574d822ca9c8b4d7428f159e79d6863d4a48cd74278dec3527fa",
+                    "hash" : "0x6672a30686fd574d822ca9c8b4d7428f159e79d6863d4a48cd74278dec3527fa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6672a30686fd574d822ca9c8b4d7428f159e79d6863d4a48cd74278dec3527fa",
+                    "hash" : "0x6672a30686fd574d822ca9c8b4d7428f159e79d6863d4a48cd74278dec3527fa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "6672a30686fd574d822ca9c8b4d7428f159e79d6863d4a48cd74278dec3527fa",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff427f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000307ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6fa1109af20740728e72150a7a9c09595560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1015118220"
+                "0x3c81798c"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest84.json b/GeneralStateTests/stRandom/randomStatetest84.json
index 5bac182ba..80428abb6 100644
--- a/GeneralStateTests/stRandom/randomStatetest84.json
+++ b/GeneralStateTests/stRandom/randomStatetest84.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest84" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "af423ed22996f4161da21729d08e3d9138d94234b778a043313bb6dcbc55d93d",
+                    "hash" : "0xaf423ed22996f4161da21729d08e3d9138d94234b778a043313bb6dcbc55d93d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "af423ed22996f4161da21729d08e3d9138d94234b778a043313bb6dcbc55d93d",
+                    "hash" : "0xaf423ed22996f4161da21729d08e3d9138d94234b778a043313bb6dcbc55d93d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "af423ed22996f4161da21729d08e3d9138d94234b778a043313bb6dcbc55d93d",
+                    "hash" : "0xaf423ed22996f4161da21729d08e3d9138d94234b778a043313bb6dcbc55d93d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "af423ed22996f4161da21729d08e3d9138d94234b778a043313bb6dcbc55d93d",
+                    "hash" : "0xaf423ed22996f4161da21729d08e3d9138d94234b778a043313bb6dcbc55d93d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "af423ed22996f4161da21729d08e3d9138d94234b778a043313bb6dcbc55d93d",
+                    "hash" : "0xaf423ed22996f4161da21729d08e3d9138d94234b778a043313bb6dcbc55d93d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "af423ed22996f4161da21729d08e3d9138d94234b778a043313bb6dcbc55d93d",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000001000000000000000000000000000000000000000044457f0000000000000000000000000000000000000000000000000000000000000001187f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff52155955",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "679746513"
+                "0x28841bd1"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest85.json b/GeneralStateTests/stRandom/randomStatetest85.json
index 71b573d3b..b03edd444 100644
--- a/GeneralStateTests/stRandom/randomStatetest85.json
+++ b/GeneralStateTests/stRandom/randomStatetest85.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest85" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "937c4d826f55f76fcd7e9898ab074e9f44641d99c2860516a3df59c82c8eb7c5",
+                    "hash" : "0x937c4d826f55f76fcd7e9898ab074e9f44641d99c2860516a3df59c82c8eb7c5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "937c4d826f55f76fcd7e9898ab074e9f44641d99c2860516a3df59c82c8eb7c5",
+                    "hash" : "0x937c4d826f55f76fcd7e9898ab074e9f44641d99c2860516a3df59c82c8eb7c5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "df58551e1739386d31615d6d5ec6af7a87a7b86b5dd03ea65da6ff06eacf1309",
+                    "hash" : "0xdf58551e1739386d31615d6d5ec6af7a87a7b86b5dd03ea65da6ff06eacf1309",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "df58551e1739386d31615d6d5ec6af7a87a7b86b5dd03ea65da6ff06eacf1309",
+                    "hash" : "0xdf58551e1739386d31615d6d5ec6af7a87a7b86b5dd03ea65da6ff06eacf1309",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "937c4d826f55f76fcd7e9898ab074e9f44641d99c2860516a3df59c82c8eb7c5",
+                    "hash" : "0x937c4d826f55f76fcd7e9898ab074e9f44641d99c2860516a3df59c82c8eb7c5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "df58551e1739386d31615d6d5ec6af7a87a7b86b5dd03ea65da6ff06eacf1309",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c350f25b557e348ff374819d123109539b55",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "994504369"
+                "0x3b46eeb1"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest86.json b/GeneralStateTests/stRandom/randomStatetest86.json
index c464ec608..23ec798fa 100644
--- a/GeneralStateTests/stRandom/randomStatetest86.json
+++ b/GeneralStateTests/stRandom/randomStatetest86.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest86" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c13de543ac35b770d3deabc9e8c2343ad58714d392c07347a7a5bc9806cd5f5c",
+                    "hash" : "0xc13de543ac35b770d3deabc9e8c2343ad58714d392c07347a7a5bc9806cd5f5c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c13de543ac35b770d3deabc9e8c2343ad58714d392c07347a7a5bc9806cd5f5c",
+                    "hash" : "0xc13de543ac35b770d3deabc9e8c2343ad58714d392c07347a7a5bc9806cd5f5c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "c13de543ac35b770d3deabc9e8c2343ad58714d392c07347a7a5bc9806cd5f5c",
+                    "hash" : "0xc13de543ac35b770d3deabc9e8c2343ad58714d392c07347a7a5bc9806cd5f5c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c13de543ac35b770d3deabc9e8c2343ad58714d392c07347a7a5bc9806cd5f5c",
+                    "hash" : "0xc13de543ac35b770d3deabc9e8c2343ad58714d392c07347a7a5bc9806cd5f5c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c13de543ac35b770d3deabc9e8c2343ad58714d392c07347a7a5bc9806cd5f5c",
+                    "hash" : "0xc13de543ac35b770d3deabc9e8c2343ad58714d392c07347a7a5bc9806cd5f5c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "c13de543ac35b770d3deabc9e8c2343ad58714d392c07347a7a5bc9806cd5f5c",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c350407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff091860005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "988589280"
+                "0x3aecace0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest87.json b/GeneralStateTests/stRandom/randomStatetest87.json
index 7e7d9ba09..21c936264 100644
--- a/GeneralStateTests/stRandom/randomStatetest87.json
+++ b/GeneralStateTests/stRandom/randomStatetest87.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest87" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "02ea7864727c9a098ec279cb73ebc879752214292d2dbc1bac9ae5da63515f68",
+                    "hash" : "0x02ea7864727c9a098ec279cb73ebc879752214292d2dbc1bac9ae5da63515f68",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "02ea7864727c9a098ec279cb73ebc879752214292d2dbc1bac9ae5da63515f68",
+                    "hash" : "0x02ea7864727c9a098ec279cb73ebc879752214292d2dbc1bac9ae5da63515f68",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "02ea7864727c9a098ec279cb73ebc879752214292d2dbc1bac9ae5da63515f68",
+                    "hash" : "0x02ea7864727c9a098ec279cb73ebc879752214292d2dbc1bac9ae5da63515f68",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "02ea7864727c9a098ec279cb73ebc879752214292d2dbc1bac9ae5da63515f68",
+                    "hash" : "0x02ea7864727c9a098ec279cb73ebc879752214292d2dbc1bac9ae5da63515f68",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "02ea7864727c9a098ec279cb73ebc879752214292d2dbc1bac9ae5da63515f68",
+                    "hash" : "0x02ea7864727c9a098ec279cb73ebc879752214292d2dbc1bac9ae5da63515f68",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "02ea7864727c9a098ec279cb73ebc879752214292d2dbc1bac9ae5da63515f68",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000005b7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f446e638e7e16736c030393727d74817460005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "2065587657"
+                "0x7b1e5dc9"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest88.json b/GeneralStateTests/stRandom/randomStatetest88.json
index a6dcbebe2..472d7e010 100644
--- a/GeneralStateTests/stRandom/randomStatetest88.json
+++ b/GeneralStateTests/stRandom/randomStatetest88.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest88" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "229ff970ef4acb57cac758d145e5a793a3a656252b75dc1a1c235397b8c00f65",
+                    "hash" : "0x229ff970ef4acb57cac758d145e5a793a3a656252b75dc1a1c235397b8c00f65",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "229ff970ef4acb57cac758d145e5a793a3a656252b75dc1a1c235397b8c00f65",
+                    "hash" : "0x229ff970ef4acb57cac758d145e5a793a3a656252b75dc1a1c235397b8c00f65",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "229ff970ef4acb57cac758d145e5a793a3a656252b75dc1a1c235397b8c00f65",
+                    "hash" : "0x229ff970ef4acb57cac758d145e5a793a3a656252b75dc1a1c235397b8c00f65",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "229ff970ef4acb57cac758d145e5a793a3a656252b75dc1a1c235397b8c00f65",
+                    "hash" : "0x229ff970ef4acb57cac758d145e5a793a3a656252b75dc1a1c235397b8c00f65",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "229ff970ef4acb57cac758d145e5a793a3a656252b75dc1a1c235397b8c00f65",
+                    "hash" : "0x229ff970ef4acb57cac758d145e5a793a3a656252b75dc1a1c235397b8c00f65",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "f657655b45bc52bde744f4f6c47a32106cea8400ecbf42381a64a9c38691d285",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b54343537f000000000000000000000000000000000000000000000000000000000000c350117fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000016f34f06a7014541167033909103620f35560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1050242229"
+                "0x3e996cb5"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest89.json b/GeneralStateTests/stRandom/randomStatetest89.json
index a90517547..c4208338b 100644
--- a/GeneralStateTests/stRandom/randomStatetest89.json
+++ b/GeneralStateTests/stRandom/randomStatetest89.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest89" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e0627c8ceadeacfc593531291eefe7d841800d2797f83875fa419a193f18e46b",
+                    "hash" : "0xe0627c8ceadeacfc593531291eefe7d841800d2797f83875fa419a193f18e46b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e0627c8ceadeacfc593531291eefe7d841800d2797f83875fa419a193f18e46b",
+                    "hash" : "0xe0627c8ceadeacfc593531291eefe7d841800d2797f83875fa419a193f18e46b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e0627c8ceadeacfc593531291eefe7d841800d2797f83875fa419a193f18e46b",
+                    "hash" : "0xe0627c8ceadeacfc593531291eefe7d841800d2797f83875fa419a193f18e46b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e0627c8ceadeacfc593531291eefe7d841800d2797f83875fa419a193f18e46b",
+                    "hash" : "0xe0627c8ceadeacfc593531291eefe7d841800d2797f83875fa419a193f18e46b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e0627c8ceadeacfc593531291eefe7d841800d2797f83875fa419a193f18e46b",
+                    "hash" : "0xe0627c8ceadeacfc593531291eefe7d841800d2797f83875fa419a193f18e46b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "e0627c8ceadeacfc593531291eefe7d841800d2797f83875fa419a193f18e46b",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000016f05648ce0ad106b7a6f3483379e62876b60005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1090727739"
+                "0x41032f3b"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest9.json b/GeneralStateTests/stRandom/randomStatetest9.json
index dd65a47ce..73ef694e5 100644
--- a/GeneralStateTests/stRandom/randomStatetest9.json
+++ b/GeneralStateTests/stRandom/randomStatetest9.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest9" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "019f803676516c1002a843fcc965bf4159046bef5dfd0dd645e5bdd6336ec239",
+                    "hash" : "0x019f803676516c1002a843fcc965bf4159046bef5dfd0dd645e5bdd6336ec239",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "019f803676516c1002a843fcc965bf4159046bef5dfd0dd645e5bdd6336ec239",
+                    "hash" : "0x019f803676516c1002a843fcc965bf4159046bef5dfd0dd645e5bdd6336ec239",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "019f803676516c1002a843fcc965bf4159046bef5dfd0dd645e5bdd6336ec239",
+                    "hash" : "0x019f803676516c1002a843fcc965bf4159046bef5dfd0dd645e5bdd6336ec239",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "019f803676516c1002a843fcc965bf4159046bef5dfd0dd645e5bdd6336ec239",
+                    "hash" : "0x019f803676516c1002a843fcc965bf4159046bef5dfd0dd645e5bdd6336ec239",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "019f803676516c1002a843fcc965bf4159046bef5dfd0dd645e5bdd6336ec239",
+                    "hash" : "0x019f803676516c1002a843fcc965bf4159046bef5dfd0dd645e5bdd6336ec239",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "019f803676516c1002a843fcc965bf4159046bef5dfd0dd645e5bdd6336ec239",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000016f757fb845405bf1ff959ba03a9c336b5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "217035801"
+                "0x0cefb419"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest90.json b/GeneralStateTests/stRandom/randomStatetest90.json
index 4704254e3..e54353a51 100644
--- a/GeneralStateTests/stRandom/randomStatetest90.json
+++ b/GeneralStateTests/stRandom/randomStatetest90.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest90" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a2351c62118ac47b8bceaaeb770eb2cbedf263154bafe7d6bf92f4d621ad9908",
+                    "hash" : "0xa2351c62118ac47b8bceaaeb770eb2cbedf263154bafe7d6bf92f4d621ad9908",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a2351c62118ac47b8bceaaeb770eb2cbedf263154bafe7d6bf92f4d621ad9908",
+                    "hash" : "0xa2351c62118ac47b8bceaaeb770eb2cbedf263154bafe7d6bf92f4d621ad9908",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a2351c62118ac47b8bceaaeb770eb2cbedf263154bafe7d6bf92f4d621ad9908",
+                    "hash" : "0xa2351c62118ac47b8bceaaeb770eb2cbedf263154bafe7d6bf92f4d621ad9908",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a2351c62118ac47b8bceaaeb770eb2cbedf263154bafe7d6bf92f4d621ad9908",
+                    "hash" : "0xa2351c62118ac47b8bceaaeb770eb2cbedf263154bafe7d6bf92f4d621ad9908",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a2351c62118ac47b8bceaaeb770eb2cbedf263154bafe7d6bf92f4d621ad9908",
+                    "hash" : "0xa2351c62118ac47b8bceaaeb770eb2cbedf263154bafe7d6bf92f4d621ad9908",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "a2351c62118ac47b8bceaaeb770eb2cbedf263154bafe7d6bf92f4d621ad9908",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff45157f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000016f116b4177f25178d7048212877e95685560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "168858958"
+                "0x0a10954e"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest91.json b/GeneralStateTests/stRandom/randomStatetest91.json
index 6b91265a7..2bff4a7c6 100644
--- a/GeneralStateTests/stRandom/randomStatetest91.json
+++ b/GeneralStateTests/stRandom/randomStatetest91.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest91" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b683af91e6d95ba13ad53b046bf8c1733e72b2cbf229b3671a8a9714a92934ab",
+                    "hash" : "0xb683af91e6d95ba13ad53b046bf8c1733e72b2cbf229b3671a8a9714a92934ab",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b683af91e6d95ba13ad53b046bf8c1733e72b2cbf229b3671a8a9714a92934ab",
+                    "hash" : "0xb683af91e6d95ba13ad53b046bf8c1733e72b2cbf229b3671a8a9714a92934ab",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b683af91e6d95ba13ad53b046bf8c1733e72b2cbf229b3671a8a9714a92934ab",
+                    "hash" : "0xb683af91e6d95ba13ad53b046bf8c1733e72b2cbf229b3671a8a9714a92934ab",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b683af91e6d95ba13ad53b046bf8c1733e72b2cbf229b3671a8a9714a92934ab",
+                    "hash" : "0xb683af91e6d95ba13ad53b046bf8c1733e72b2cbf229b3671a8a9714a92934ab",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b683af91e6d95ba13ad53b046bf8c1733e72b2cbf229b3671a8a9714a92934ab",
+                    "hash" : "0xb683af91e6d95ba13ad53b046bf8c1733e72b2cbf229b3671a8a9714a92934ab",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "b683af91e6d95ba13ad53b046bf8c1733e72b2cbf229b3671a8a9714a92934ab",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000001000000000000000000000000000000000000000045407f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350447f00000000000000000000000100000000000000000000000000000000000000006f8b0b688d7b410a45178f6f956454f35560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "2077155937"
+                "0x7bcee261"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest92.json b/GeneralStateTests/stRandom/randomStatetest92.json
index aec57ead9..75329d4ca 100644
--- a/GeneralStateTests/stRandom/randomStatetest92.json
+++ b/GeneralStateTests/stRandom/randomStatetest92.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest92" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "fdd286c5eed3fad1fd30794fbeb85cadd442d73656854307e966c326d3ca2435",
+                    "hash" : "0xfdd286c5eed3fad1fd30794fbeb85cadd442d73656854307e966c326d3ca2435",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "fdd286c5eed3fad1fd30794fbeb85cadd442d73656854307e966c326d3ca2435",
+                    "hash" : "0xfdd286c5eed3fad1fd30794fbeb85cadd442d73656854307e966c326d3ca2435",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "fdd286c5eed3fad1fd30794fbeb85cadd442d73656854307e966c326d3ca2435",
+                    "hash" : "0xfdd286c5eed3fad1fd30794fbeb85cadd442d73656854307e966c326d3ca2435",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "fdd286c5eed3fad1fd30794fbeb85cadd442d73656854307e966c326d3ca2435",
+                    "hash" : "0xfdd286c5eed3fad1fd30794fbeb85cadd442d73656854307e966c326d3ca2435",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "fdd286c5eed3fad1fd30794fbeb85cadd442d73656854307e966c326d3ca2435",
+                    "hash" : "0xfdd286c5eed3fad1fd30794fbeb85cadd442d73656854307e966c326d3ca2435",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "fdd286c5eed3fad1fd30794fbeb85cadd442d73656854307e966c326d3ca2435",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000006f59640c655956799087168f0658a11a5560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "472110012"
+                "0x1c23d3bc"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest93.json b/GeneralStateTests/stRandom/randomStatetest93.json
index d8596267c..1e4c40486 100644
--- a/GeneralStateTests/stRandom/randomStatetest93.json
+++ b/GeneralStateTests/stRandom/randomStatetest93.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest93" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9dd769eca7a095a83fedfecb3f82d2f0b400408daa9f7e1be289eb4d0234003c",
+                    "hash" : "0x9dd769eca7a095a83fedfecb3f82d2f0b400408daa9f7e1be289eb4d0234003c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9dd769eca7a095a83fedfecb3f82d2f0b400408daa9f7e1be289eb4d0234003c",
+                    "hash" : "0x9dd769eca7a095a83fedfecb3f82d2f0b400408daa9f7e1be289eb4d0234003c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9dd769eca7a095a83fedfecb3f82d2f0b400408daa9f7e1be289eb4d0234003c",
+                    "hash" : "0x9dd769eca7a095a83fedfecb3f82d2f0b400408daa9f7e1be289eb4d0234003c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9dd769eca7a095a83fedfecb3f82d2f0b400408daa9f7e1be289eb4d0234003c",
+                    "hash" : "0x9dd769eca7a095a83fedfecb3f82d2f0b400408daa9f7e1be289eb4d0234003c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9dd769eca7a095a83fedfecb3f82d2f0b400408daa9f7e1be289eb4d0234003c",
+                    "hash" : "0x9dd769eca7a095a83fedfecb3f82d2f0b400408daa9f7e1be289eb4d0234003c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "9dd769eca7a095a83fedfecb3f82d2f0b400408daa9f7e1be289eb4d0234003c",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x44404340434136437b0703709768f36855",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest94.json b/GeneralStateTests/stRandom/randomStatetest94.json
index 6a6d74e97..7ccb88df2 100644
--- a/GeneralStateTests/stRandom/randomStatetest94.json
+++ b/GeneralStateTests/stRandom/randomStatetest94.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest94" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b8aba769f8108f1188f731797ef7ce7c362e56fba98dd004dbfd74b5b610e6e9",
+                    "hash" : "0xb8aba769f8108f1188f731797ef7ce7c362e56fba98dd004dbfd74b5b610e6e9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b8aba769f8108f1188f731797ef7ce7c362e56fba98dd004dbfd74b5b610e6e9",
+                    "hash" : "0xb8aba769f8108f1188f731797ef7ce7c362e56fba98dd004dbfd74b5b610e6e9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b8aba769f8108f1188f731797ef7ce7c362e56fba98dd004dbfd74b5b610e6e9",
+                    "hash" : "0xb8aba769f8108f1188f731797ef7ce7c362e56fba98dd004dbfd74b5b610e6e9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b8aba769f8108f1188f731797ef7ce7c362e56fba98dd004dbfd74b5b610e6e9",
+                    "hash" : "0xb8aba769f8108f1188f731797ef7ce7c362e56fba98dd004dbfd74b5b610e6e9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b8aba769f8108f1188f731797ef7ce7c362e56fba98dd004dbfd74b5b610e6e9",
+                    "hash" : "0xb8aba769f8108f1188f731797ef7ce7c362e56fba98dd004dbfd74b5b610e6e9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "f9daab160da6388b336998cc5b6d75c465725f00a6a0f8a9cab1ea3d1257f4cd",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x44444243204555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x42"
             ],
             "gasLimit" : [
-                "400000"
+                "0x061a80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest95.json b/GeneralStateTests/stRandom/randomStatetest95.json
index 133a3a301..6477a5c64 100644
--- a/GeneralStateTests/stRandom/randomStatetest95.json
+++ b/GeneralStateTests/stRandom/randomStatetest95.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest95" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "0cb659a91d23f40b4dfc08874dec658bc1bea4e27f6e717f0c2a7433c50bc8db",
+                    "hash" : "0x0cb659a91d23f40b4dfc08874dec658bc1bea4e27f6e717f0c2a7433c50bc8db",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "0cb659a91d23f40b4dfc08874dec658bc1bea4e27f6e717f0c2a7433c50bc8db",
+                    "hash" : "0x0cb659a91d23f40b4dfc08874dec658bc1bea4e27f6e717f0c2a7433c50bc8db",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "0cb659a91d23f40b4dfc08874dec658bc1bea4e27f6e717f0c2a7433c50bc8db",
+                    "hash" : "0x0cb659a91d23f40b4dfc08874dec658bc1bea4e27f6e717f0c2a7433c50bc8db",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "0cb659a91d23f40b4dfc08874dec658bc1bea4e27f6e717f0c2a7433c50bc8db",
+                    "hash" : "0x0cb659a91d23f40b4dfc08874dec658bc1bea4e27f6e717f0c2a7433c50bc8db",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0cb659a91d23f40b4dfc08874dec658bc1bea4e27f6e717f0c2a7433c50bc8db",
+                    "hash" : "0x0cb659a91d23f40b4dfc08874dec658bc1bea4e27f6e717f0c2a7433c50bc8db",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "0cb659a91d23f40b4dfc08874dec658bc1bea4e27f6e717f0c2a7433c50bc8db",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff14447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5b60005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,8 +96,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x7e83fa74"
             ]
diff --git a/GeneralStateTests/stRandom/randomStatetest96.json b/GeneralStateTests/stRandom/randomStatetest96.json
index ba4a183fb..6c590f0aa 100644
--- a/GeneralStateTests/stRandom/randomStatetest96.json
+++ b/GeneralStateTests/stRandom/randomStatetest96.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest96" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7097041c5d18f36344b2cc11ee9d666a847ff15db9f6294654ef24f2f19929ed",
+                    "hash" : "0x7097041c5d18f36344b2cc11ee9d666a847ff15db9f6294654ef24f2f19929ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7097041c5d18f36344b2cc11ee9d666a847ff15db9f6294654ef24f2f19929ed",
+                    "hash" : "0x7097041c5d18f36344b2cc11ee9d666a847ff15db9f6294654ef24f2f19929ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "7097041c5d18f36344b2cc11ee9d666a847ff15db9f6294654ef24f2f19929ed",
+                    "hash" : "0x7097041c5d18f36344b2cc11ee9d666a847ff15db9f6294654ef24f2f19929ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "7097041c5d18f36344b2cc11ee9d666a847ff15db9f6294654ef24f2f19929ed",
+                    "hash" : "0x7097041c5d18f36344b2cc11ee9d666a847ff15db9f6294654ef24f2f19929ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7097041c5d18f36344b2cc11ee9d666a847ff15db9f6294654ef24f2f19929ed",
+                    "hash" : "0x7097041c5d18f36344b2cc11ee9d666a847ff15db9f6294654ef24f2f19929ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "7097041c5d18f36344b2cc11ee9d666a847ff15db9f6294654ef24f2f19929ed",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000006f183b68a09b08953085a854a39d92125560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1246597060"
+                "0x4a4d8fc4"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest97.json b/GeneralStateTests/stRandom/randomStatetest97.json
index 4e2ae5931..125f30afd 100644
--- a/GeneralStateTests/stRandom/randomStatetest97.json
+++ b/GeneralStateTests/stRandom/randomStatetest97.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest97" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f6138f5e594083610a5e80c269b7cd74a9afb59150aee99257d0c835454b3b1e",
+                    "hash" : "0xf6138f5e594083610a5e80c269b7cd74a9afb59150aee99257d0c835454b3b1e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f6138f5e594083610a5e80c269b7cd74a9afb59150aee99257d0c835454b3b1e",
+                    "hash" : "0xf6138f5e594083610a5e80c269b7cd74a9afb59150aee99257d0c835454b3b1e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f6138f5e594083610a5e80c269b7cd74a9afb59150aee99257d0c835454b3b1e",
+                    "hash" : "0xf6138f5e594083610a5e80c269b7cd74a9afb59150aee99257d0c835454b3b1e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f6138f5e594083610a5e80c269b7cd74a9afb59150aee99257d0c835454b3b1e",
+                    "hash" : "0xf6138f5e594083610a5e80c269b7cd74a9afb59150aee99257d0c835454b3b1e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f6138f5e594083610a5e80c269b7cd74a9afb59150aee99257d0c835454b3b1e",
+                    "hash" : "0xf6138f5e594083610a5e80c269b7cd74a9afb59150aee99257d0c835454b3b1e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "f6138f5e594083610a5e80c269b7cd74a9afb59150aee99257d0c835454b3b1e",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5587f0000000000000000000000000000000000000000000000000000000000000001957f0000000000000000000000000000000000000000000000000000000000000000407f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3509781040107338b35071887a186",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "335580338"
+                "0x14008cb2"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest98.json b/GeneralStateTests/stRandom/randomStatetest98.json
index a29854044..fa923662f 100644
--- a/GeneralStateTests/stRandom/randomStatetest98.json
+++ b/GeneralStateTests/stRandom/randomStatetest98.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest98" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "fd62157f6c26de8b9d4ffd2eb863ba304c392d1c21023837bc05a6eeed2b6d68",
+                    "hash" : "0xfd62157f6c26de8b9d4ffd2eb863ba304c392d1c21023837bc05a6eeed2b6d68",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "fd62157f6c26de8b9d4ffd2eb863ba304c392d1c21023837bc05a6eeed2b6d68",
+                    "hash" : "0xfd62157f6c26de8b9d4ffd2eb863ba304c392d1c21023837bc05a6eeed2b6d68",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "fd62157f6c26de8b9d4ffd2eb863ba304c392d1c21023837bc05a6eeed2b6d68",
+                    "hash" : "0xfd62157f6c26de8b9d4ffd2eb863ba304c392d1c21023837bc05a6eeed2b6d68",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "fd62157f6c26de8b9d4ffd2eb863ba304c392d1c21023837bc05a6eeed2b6d68",
+                    "hash" : "0xfd62157f6c26de8b9d4ffd2eb863ba304c392d1c21023837bc05a6eeed2b6d68",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "fd62157f6c26de8b9d4ffd2eb863ba304c392d1c21023837bc05a6eeed2b6d68",
+                    "hash" : "0xfd62157f6c26de8b9d4ffd2eb863ba304c392d1c21023837bc05a6eeed2b6d68",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "fd62157f6c26de8b9d4ffd2eb863ba304c392d1c21023837bc05a6eeed2b6d68",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5417fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000000b085560005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "588937108"
+                "0x231a7794"
             ]
         }
     }
diff --git a/GeneralStateTests/stRandom/randomStatetest99.json b/GeneralStateTests/stRandom/randomStatetest99.json
index a8db174c9..cb9089e3f 100644
--- a/GeneralStateTests/stRandom/randomStatetest99.json
+++ b/GeneralStateTests/stRandom/randomStatetest99.json
@@ -1,12 +1,12 @@
 {
     "randomStatetest99" : {
         "env" : {
-            "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+            "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
         ],
@@ -14,7 +14,7 @@
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "39f06a3fcc57ab1d4318a42d943a18502cca9d836d8ad21c24eb036b2b20da5c",
+                    "hash" : "0x39f06a3fcc57ab1d4318a42d943a18502cca9d836d8ad21c24eb036b2b20da5c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -24,7 +24,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "39f06a3fcc57ab1d4318a42d943a18502cca9d836d8ad21c24eb036b2b20da5c",
+                    "hash" : "0x39f06a3fcc57ab1d4318a42d943a18502cca9d836d8ad21c24eb036b2b20da5c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -34,7 +34,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "39f06a3fcc57ab1d4318a42d943a18502cca9d836d8ad21c24eb036b2b20da5c",
+                    "hash" : "0x39f06a3fcc57ab1d4318a42d943a18502cca9d836d8ad21c24eb036b2b20da5c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -44,7 +44,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "39f06a3fcc57ab1d4318a42d943a18502cca9d836d8ad21c24eb036b2b20da5c",
+                    "hash" : "0x39f06a3fcc57ab1d4318a42d943a18502cca9d836d8ad21c24eb036b2b20da5c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -54,7 +54,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "39f06a3fcc57ab1d4318a42d943a18502cca9d836d8ad21c24eb036b2b20da5c",
+                    "hash" : "0x39f06a3fcc57ab1d4318a42d943a18502cca9d836d8ad21c24eb036b2b20da5c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -65,23 +65,23 @@
         },
         "postStateRoot" : "39f06a3fcc57ab1d4318a42d943a18502cca9d836d8ad21c24eb036b2b20da5c",
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000010000000000000000000000000000000000000000457ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff40390360005155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x2e",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -96,10 +96,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1485287688"
+                "0x5887b108"
             ]
         }
     }
diff --git a/GeneralStateTests/stRecursiveCreate/recursiveCreate.json b/GeneralStateTests/stRecursiveCreate/recursiveCreate.json
index 8149a3da7..e0d752755 100644
--- a/GeneralStateTests/stRecursiveCreate/recursiveCreate.json
+++ b/GeneralStateTests/stRecursiveCreate/recursiveCreate.json
@@ -1,17 +1,17 @@
 {
     "recursiveCreate" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "dae969656b73697b81572a709160104ca9521bbe111edbc58edb8f9238962424",
+                    "hash" : "0xdae969656b73697b81572a709160104ca9521bbe111edbc58edb8f9238962424",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7a598d472ac1ab495bbec7f2f48b8b05a3c1c4feade8cc9cfb9f71e7a711dbc0",
+                    "hash" : "0x7a598d472ac1ab495bbec7f2f48b8b05a3c1c4feade8cc9cfb9f71e7a711dbc0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "eee65c3186265472b087f52db4d1f5f9b9dc232c57b5749e1dd80a53165f6cb9",
+                    "hash" : "0xeee65c3186265472b087f52db4d1f5f9b9dc232c57b5749e1dd80a53165f6cb9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "eee65c3186265472b087f52db4d1f5f9b9dc232c57b5749e1dd80a53165f6cb9",
+                    "hash" : "0xeee65c3186265472b087f52db4d1f5f9b9dc232c57b5749e1dd80a53165f6cb9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7a598d472ac1ab495bbec7f2f48b8b05a3c1c4feade8cc9cfb9f71e7a711dbc0",
+                    "hash" : "0x7a598d472ac1ab495bbec7f2f48b8b05a3c1c4feade8cc9cfb9f71e7a711dbc0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x60206000600039602060006000f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "465224"
+                "0x071948"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRecursiveCreate/recursiveCreateReturnValue.json b/GeneralStateTests/stRecursiveCreate/recursiveCreateReturnValue.json
index 26cb5ce37..4426fc93d 100644
--- a/GeneralStateTests/stRecursiveCreate/recursiveCreateReturnValue.json
+++ b/GeneralStateTests/stRecursiveCreate/recursiveCreateReturnValue.json
@@ -1,17 +1,17 @@
 {
     "recursiveCreateReturnValue" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x02540be400",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c2a798315acf78203651d94d1b9d27d5a87c03d5a685e94c471889fe460f3b86",
+                    "hash" : "0xc2a798315acf78203651d94d1b9d27d5a87c03d5a685e94c471889fe460f3b86",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "eed4be82aa0dde10ee02374b2819bb8139b434727471da31037c12dc57276218",
+                    "hash" : "0xeed4be82aa0dde10ee02374b2819bb8139b434727471da31037c12dc57276218",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5c22bc6ec2ea240c8170de424002a2b5c93bfd2b3ac1c2cf8cb92cb5f549b17d",
+                    "hash" : "0x5c22bc6ec2ea240c8170de424002a2b5c93bfd2b3ac1c2cf8cb92cb5f549b17d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5c22bc6ec2ea240c8170de424002a2b5c93bfd2b3ac1c2cf8cb92cb5f549b17d",
+                    "hash" : "0x5c22bc6ec2ea240c8170de424002a2b5c93bfd2b3ac1c2cf8cb92cb5f549b17d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "eed4be82aa0dde10ee02374b2819bb8139b434727471da31037c12dc57276218",
+                    "hash" : "0xeed4be82aa0dde10ee02374b2819bb8139b434727471da31037c12dc57276218",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x602060006000396001602060006000f001600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1000000000"
+                "0x3b9aca00"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stRefundTest/refund50_1.json b/GeneralStateTests/stRefundTest/refund50_1.json
index 43dc59f83..909b74a36 100644
--- a/GeneralStateTests/stRefundTest/refund50_1.json
+++ b/GeneralStateTests/stRefundTest/refund50_1.json
@@ -1,17 +1,17 @@
 {
     "refund50_1" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b0c57a1107e5d2f752d931cb42167d1893902c6cf4b563edf64efee021e2fe35",
+                    "hash" : "0xb0c57a1107e5d2f752d931cb42167d1893902c6cf4b563edf64efee021e2fe35",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b0c57a1107e5d2f752d931cb42167d1893902c6cf4b563edf64efee021e2fe35",
+                    "hash" : "0xb0c57a1107e5d2f752d931cb42167d1893902c6cf4b563edf64efee021e2fe35",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b0c57a1107e5d2f752d931cb42167d1893902c6cf4b563edf64efee021e2fe35",
+                    "hash" : "0xb0c57a1107e5d2f752d931cb42167d1893902c6cf4b563edf64efee021e2fe35",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b0c57a1107e5d2f752d931cb42167d1893902c6cf4b563edf64efee021e2fe35",
+                    "hash" : "0xb0c57a1107e5d2f752d931cb42167d1893902c6cf4b563edf64efee021e2fe35",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b0c57a1107e5d2f752d931cb42167d1893902c6cf4b563edf64efee021e2fe35",
+                    "hash" : "0xb0c57a1107e5d2f752d931cb42167d1893902c6cf4b563edf64efee021e2fe35",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,7 +61,7 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60006001556000600255600060035560006004556000600555",
                 "nonce" : "0x00",
@@ -73,9 +73,9 @@
                     "0x05" : "0x01"
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -86,14 +86,14 @@
                 ""
             ],
             "gasLimit" : [
-                "100000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stRefundTest/refund50_2.json b/GeneralStateTests/stRefundTest/refund50_2.json
index 36e70c551..e45cd5443 100644
--- a/GeneralStateTests/stRefundTest/refund50_2.json
+++ b/GeneralStateTests/stRefundTest/refund50_2.json
@@ -1,17 +1,17 @@
 {
     "refund50_2" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "87dd26d566e797f0eee168936579dd677afebf184b84618988bf7b4c3289d0ae",
+                    "hash" : "0x87dd26d566e797f0eee168936579dd677afebf184b84618988bf7b4c3289d0ae",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "87dd26d566e797f0eee168936579dd677afebf184b84618988bf7b4c3289d0ae",
+                    "hash" : "0x87dd26d566e797f0eee168936579dd677afebf184b84618988bf7b4c3289d0ae",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "87dd26d566e797f0eee168936579dd677afebf184b84618988bf7b4c3289d0ae",
+                    "hash" : "0x87dd26d566e797f0eee168936579dd677afebf184b84618988bf7b4c3289d0ae",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "87dd26d566e797f0eee168936579dd677afebf184b84618988bf7b4c3289d0ae",
+                    "hash" : "0x87dd26d566e797f0eee168936579dd677afebf184b84618988bf7b4c3289d0ae",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "87dd26d566e797f0eee168936579dd677afebf184b84618988bf7b4c3289d0ae",
+                    "hash" : "0x87dd26d566e797f0eee168936579dd677afebf184b84618988bf7b4c3289d0ae",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,7 +61,7 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600a556001600b5560006001556000600255600060035560006004556000600555",
                 "nonce" : "0x00",
@@ -73,9 +73,9 @@
                     "0x05" : "0x01"
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -86,14 +86,14 @@
                 ""
             ],
             "gasLimit" : [
-                "100000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stRefundTest/refund50percentCap.json b/GeneralStateTests/stRefundTest/refund50percentCap.json
index 64b6cf490..1828946b8 100644
--- a/GeneralStateTests/stRefundTest/refund50percentCap.json
+++ b/GeneralStateTests/stRefundTest/refund50percentCap.json
@@ -1,57 +1,157 @@
 {
     "refund50percentCap" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d27a6d9b1da7ee2474413253621bd0e145e04f4a375ec62f3330173caf3854d5",
+                    "hash" : "0x6991ae521e7e1d6d7750429e0883daf7fbb898d06a7a0bf70e95193ba314e33d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
+                    },
+                    "postState" : {
+                        "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                            "balance" : "0x0de0b6b3a7640000",
+                            "code" : "0x60ff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x0a" : "0x8000000000000000000000000000000000000000000000000000000000000000",
+                                "0x0b" : "0x0de0b6b3a7640000"
+                            }
+                        },
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0xb2a7",
+                            "code" : "",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0xd3f9",
+                            "code" : "",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        }
                     }
                 }
             ],
             "EIP158" : [
                 {
-                    "hash" : "9a866458681a832830dd48849d51940a4d835897d7d7481d3ba9b46b6bb00ebc",
+                    "hash" : "0x5dc1d4933650bbb07cb3850b8ab6a47ed69d60d3e220cfe14bcd3cf3fdbe2fe9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
+                    },
+                    "postState" : {
+                        "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                            "balance" : "0x0de0b6b3a7640000",
+                            "code" : "0x60ff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x0a" : "0x8000000000000000000000000000000000000000000000000000000000000000",
+                                "0x0b" : "0x0de0b6b3a7640000"
+                            }
+                        },
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0xb2bb",
+                            "code" : "",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0xd3e5",
+                            "code" : "",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        }
                     }
                 }
             ],
             "Frontier" : [
                 {
-                    "hash" : "66b43c34731b76309714e8ebbcd740082785e5180c7c6a28105e985cc4fef83a",
+                    "hash" : "0x6b8cb17a93315e8736d19126421e6d902877b80c26442a22b99dbf4ce1c063f4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
+                    },
+                    "postState" : {
+                        "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                            "balance" : "0x0de0b6b3a7640000",
+                            "code" : "0x60ff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x0a" : "0x8000000000000000000000000000000000000000000000000000000000000000",
+                                "0x0b" : "0x0de0b6b3a7640000"
+                            }
+                        },
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0xb1e9",
+                            "code" : "",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0xd4b7",
+                            "code" : "",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        }
                     }
                 }
             ],
             "Homestead" : [
                 {
-                    "hash" : "66b43c34731b76309714e8ebbcd740082785e5180c7c6a28105e985cc4fef83a",
+                    "hash" : "0x6b8cb17a93315e8736d19126421e6d902877b80c26442a22b99dbf4ce1c063f4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
+                    },
+                    "postState" : {
+                        "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                            "balance" : "0x0de0b6b3a7640000",
+                            "code" : "0x60ff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x0a" : "0x8000000000000000000000000000000000000000000000000000000000000000",
+                                "0x0b" : "0x0de0b6b3a7640000"
+                            }
+                        },
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0xb1e9",
+                            "code" : "",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0xd4b7",
+                            "code" : "",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        }
                     }
                 }
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9a866458681a832830dd48849d51940a4d835897d7d7481d3ba9b46b6bb00ebc",
+                    "hash" : "0x5dc1d4933650bbb07cb3850b8ab6a47ed69d60d3e220cfe14bcd3cf3fdbe2fe9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +161,9 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x600154506002545060ff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                "code" : "0x60ff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x01" : "0x01",
@@ -74,9 +174,9 @@
                     "0x06" : "0x01"
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -87,14 +187,14 @@
                 ""
             ],
             "gasLimit" : [
-                "100000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stRefundTest/refund600.json b/GeneralStateTests/stRefundTest/refund600.json
index aea1ec665..2648fa754 100644
--- a/GeneralStateTests/stRefundTest/refund600.json
+++ b/GeneralStateTests/stRefundTest/refund600.json
@@ -1,57 +1,153 @@
 {
     "refund600" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "8c0ff698efea55f245a46aecfae9ce755781b856920b29b38dc198c05f88b058",
+                    "hash" : "0x370547e05d6e27ff92e21369072a418842438071d30790d09bea87c17e69828a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
+                    },
+                    "postState" : {
+                        "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                            "balance" : "0x0de0b6b3a7640000",
+                            "code" : "0x61ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x0b" : "0x0de0b6b3a7640000"
+                            }
+                        },
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0x9560",
+                            "code" : "",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0xf140",
+                            "code" : "",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        }
                     }
                 }
             ],
             "EIP158" : [
                 {
-                    "hash" : "2556bc8f45d770a17481726751babca7c8e280b2275da7a4bb3def1368a59691",
+                    "hash" : "0xb17757d3d6ac1ae9cd042db317fec1ed386ff43fede64a631be9628977c3a76b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
+                    },
+                    "postState" : {
+                        "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                            "balance" : "0x0de0b6b3a7640000",
+                            "code" : "0x61ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x0b" : "0x0de0b6b3a7640000"
+                            }
+                        },
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0x9588",
+                            "code" : "",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0xf118",
+                            "code" : "",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        }
                     }
                 }
             ],
             "Frontier" : [
                 {
-                    "hash" : "a880188f4bdc7256bb8fb3dd086146bd1a768bea9568c6a0bb03689df1ef41fe",
+                    "hash" : "0x97a63e88dde1aba3e542f3f9fb3170fc071631900e422b2316bd585ce4ef591b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
+                    },
+                    "postState" : {
+                        "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                            "balance" : "0x0de0b6b3a7640000",
+                            "code" : "0x61ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x0b" : "0x0de0b6b3a7640000"
+                            }
+                        },
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0x94a2",
+                            "code" : "",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0xf1fe",
+                            "code" : "",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        }
                     }
                 }
             ],
             "Homestead" : [
                 {
-                    "hash" : "a880188f4bdc7256bb8fb3dd086146bd1a768bea9568c6a0bb03689df1ef41fe",
+                    "hash" : "0x97a63e88dde1aba3e542f3f9fb3170fc071631900e422b2316bd585ce4ef591b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
+                    },
+                    "postState" : {
+                        "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                            "balance" : "0x0de0b6b3a7640000",
+                            "code" : "0x61ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x0b" : "0x0de0b6b3a7640000"
+                            }
+                        },
+                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0x94a2",
+                            "code" : "",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0xf1fe",
+                            "code" : "",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        }
                     }
                 }
             ],
             "Metropolis" : [
                 {
-                    "hash" : "2556bc8f45d770a17481726751babca7c8e280b2275da7a4bb3def1368a59691",
+                    "hash" : "0xb17757d3d6ac1ae9cd042db317fec1ed386ff43fede64a631be9628977c3a76b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +157,9 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x600154506002545061ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                "code" : "0x61ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x01" : "0x01",
@@ -74,9 +170,9 @@
                     "0x06" : "0x01"
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -87,14 +183,14 @@
                 ""
             ],
             "gasLimit" : [
-                "100000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stRefundTest/refundSuicide50procentCap.json b/GeneralStateTests/stRefundTest/refundSuicide50procentCap.json
index 0f0c21688..f65914749 100644
--- a/GeneralStateTests/stRefundTest/refundSuicide50procentCap.json
+++ b/GeneralStateTests/stRefundTest/refundSuicide50procentCap.json
@@ -1,17 +1,17 @@
 {
     "refundSuicide50procentCap" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "998d7e2c48aff9cff42c4523286cb54ff41e7c95180fffc3edfa578442c1df49",
+                    "hash" : "0x998d7e2c48aff9cff42c4523286cb54ff41e7c95180fffc3edfa578442c1df49",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "1e77c7b31e23ec766e220bcc32285e817d14ec7015d9622a993931c76bb33cb3",
+                    "hash" : "0x1e77c7b31e23ec766e220bcc32285e817d14ec7015d9622a993931c76bb33cb3",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -29,7 +29,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "998d7e2c48aff9cff42c4523286cb54ff41e7c95180fffc3edfa578442c1df49",
+                    "hash" : "0x998d7e2c48aff9cff42c4523286cb54ff41e7c95180fffc3edfa578442c1df49",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -37,7 +37,7 @@
                     }
                 },
                 {
-                    "hash" : "1e77c7b31e23ec766e220bcc32285e817d14ec7015d9622a993931c76bb33cb3",
+                    "hash" : "0x1e77c7b31e23ec766e220bcc32285e817d14ec7015d9622a993931c76bb33cb3",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -47,7 +47,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "8c91c8617b0a81c6e83299b207ab29fed428ef8196382620506086d051b440cd",
+                    "hash" : "0x8c91c8617b0a81c6e83299b207ab29fed428ef8196382620506086d051b440cd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -55,7 +55,7 @@
                     }
                 },
                 {
-                    "hash" : "9d832422b810e981abf1a62ccf61ff5a030f763e9fdb97dc7a0044c9e4246473",
+                    "hash" : "0x9d832422b810e981abf1a62ccf61ff5a030f763e9fdb97dc7a0044c9e4246473",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -65,7 +65,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "8c91c8617b0a81c6e83299b207ab29fed428ef8196382620506086d051b440cd",
+                    "hash" : "0x8c91c8617b0a81c6e83299b207ab29fed428ef8196382620506086d051b440cd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -73,7 +73,7 @@
                     }
                 },
                 {
-                    "hash" : "9d832422b810e981abf1a62ccf61ff5a030f763e9fdb97dc7a0044c9e4246473",
+                    "hash" : "0x9d832422b810e981abf1a62ccf61ff5a030f763e9fdb97dc7a0044c9e4246473",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -83,7 +83,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "998d7e2c48aff9cff42c4523286cb54ff41e7c95180fffc3edfa578442c1df49",
+                    "hash" : "0x998d7e2c48aff9cff42c4523286cb54ff41e7c95180fffc3edfa578442c1df49",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -91,7 +91,7 @@
                     }
                 },
                 {
-                    "hash" : "1e77c7b31e23ec766e220bcc32285e817d14ec7015d9622a993931c76bb33cb3",
+                    "hash" : "0x1e77c7b31e23ec766e220bcc32285e817d14ec7015d9622a993931c76bb33cb3",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -101,7 +101,7 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x5a6016556001600a556000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f1600b55600060015560006002556000600355600060045560006005556000600655600060075560006008555a601755",
                 "nonce" : "0x00",
@@ -116,14 +116,14 @@
                     "0x08" : "0x01"
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x989680",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d87ff",
                 "nonce" : "0x00",
@@ -137,14 +137,14 @@
                 "0x0000000000000000000000000000000000000000000000000000000000010000"
             ],
             "gasLimit" : [
-                "10000000"
+                "0x989680"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stRefundTest/refund_CallA.json b/GeneralStateTests/stRefundTest/refund_CallA.json
index 37bb45654..d99f80dfb 100644
--- a/GeneralStateTests/stRefundTest/refund_CallA.json
+++ b/GeneralStateTests/stRefundTest/refund_CallA.json
@@ -1,17 +1,17 @@
 {
     "refund_CallA" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c27ddf21d26bd13f5e895075c046c5b3346f190f7c2dc74600c0665275153ccf",
+                    "hash" : "0xc27ddf21d26bd13f5e895075c046c5b3346f190f7c2dc74600c0665275153ccf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c27ddf21d26bd13f5e895075c046c5b3346f190f7c2dc74600c0665275153ccf",
+                    "hash" : "0xc27ddf21d26bd13f5e895075c046c5b3346f190f7c2dc74600c0665275153ccf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2a379a44a3742aa7fa1abc25a43678a54e1dd0f03ac34a40715314cd09855773",
+                    "hash" : "0x2a379a44a3742aa7fa1abc25a43678a54e1dd0f03ac34a40715314cd09855773",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "2a379a44a3742aa7fa1abc25a43678a54e1dd0f03ac34a40715314cd09855773",
+                    "hash" : "0x2a379a44a3742aa7fa1abc25a43678a54e1dd0f03ac34a40715314cd09855773",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c27ddf21d26bd13f5e895075c046c5b3346f190f7c2dc74600c0665275153ccf",
+                    "hash" : "0xc27ddf21d26bd13f5e895075c046c5b3346f190f7c2dc74600c0665275153ccf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,7 +61,7 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa61157cf1600055",
                 "nonce" : "0x00",
@@ -69,14 +69,14 @@
                     "0x01" : "0x01"
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1e8480",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6000600155",
                 "nonce" : "0x00",
@@ -90,14 +90,14 @@
                 ""
             ],
             "gasLimit" : [
-                "200000"
+                "0x030d40"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stRefundTest/refund_CallA_OOG.json b/GeneralStateTests/stRefundTest/refund_CallA_OOG.json
index 5177df81e..fa793719c 100644
--- a/GeneralStateTests/stRefundTest/refund_CallA_OOG.json
+++ b/GeneralStateTests/stRefundTest/refund_CallA_OOG.json
@@ -1,17 +1,17 @@
 {
     "refund_CallA_OOG" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "ca233b283fda9c6080af30a12f19b13f117d75d3c06ef83671fd881e0c52db6a",
+                    "hash" : "0xca233b283fda9c6080af30a12f19b13f117d75d3c06ef83671fd881e0c52db6a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "ca233b283fda9c6080af30a12f19b13f117d75d3c06ef83671fd881e0c52db6a",
+                    "hash" : "0xca233b283fda9c6080af30a12f19b13f117d75d3c06ef83671fd881e0c52db6a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "ca233b283fda9c6080af30a12f19b13f117d75d3c06ef83671fd881e0c52db6a",
+                    "hash" : "0xca233b283fda9c6080af30a12f19b13f117d75d3c06ef83671fd881e0c52db6a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ca233b283fda9c6080af30a12f19b13f117d75d3c06ef83671fd881e0c52db6a",
+                    "hash" : "0xca233b283fda9c6080af30a12f19b13f117d75d3c06ef83671fd881e0c52db6a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "ca233b283fda9c6080af30a12f19b13f117d75d3c06ef83671fd881e0c52db6a",
+                    "hash" : "0xca233b283fda9c6080af30a12f19b13f117d75d3c06ef83671fd881e0c52db6a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,7 +61,7 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa611770f1600055",
                 "nonce" : "0x00",
@@ -69,14 +69,14 @@
                     "0x01" : "0x01"
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0493e0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6000600155",
                 "nonce" : "0x00",
@@ -90,14 +90,14 @@
                 ""
             ],
             "gasLimit" : [
-                "31069"
+                "0x795d"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stRefundTest/refund_CallA_notEnoughGasInCall.json b/GeneralStateTests/stRefundTest/refund_CallA_notEnoughGasInCall.json
index 15b0cfe06..4f175e302 100644
--- a/GeneralStateTests/stRefundTest/refund_CallA_notEnoughGasInCall.json
+++ b/GeneralStateTests/stRefundTest/refund_CallA_notEnoughGasInCall.json
@@ -1,17 +1,17 @@
 {
     "refund_CallA_notEnoughGasInCall" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "2aca4c21c2d51b4fbe64301f84fb5cfa12ffd311c52f5222204150758e610eac",
+                    "hash" : "0x2aca4c21c2d51b4fbe64301f84fb5cfa12ffd311c52f5222204150758e610eac",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "2aca4c21c2d51b4fbe64301f84fb5cfa12ffd311c52f5222204150758e610eac",
+                    "hash" : "0x2aca4c21c2d51b4fbe64301f84fb5cfa12ffd311c52f5222204150758e610eac",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "affeb3f7f719c9679a6295f2600b29777de1836809d86f405d7db2b67d2c2d63",
+                    "hash" : "0xaffeb3f7f719c9679a6295f2600b29777de1836809d86f405d7db2b67d2c2d63",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "affeb3f7f719c9679a6295f2600b29777de1836809d86f405d7db2b67d2c2d63",
+                    "hash" : "0xaffeb3f7f719c9679a6295f2600b29777de1836809d86f405d7db2b67d2c2d63",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "2aca4c21c2d51b4fbe64301f84fb5cfa12ffd311c52f5222204150758e610eac",
+                    "hash" : "0x2aca4c21c2d51b4fbe64301f84fb5cfa12ffd311c52f5222204150758e610eac",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,7 +61,7 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa61138df1600055",
                 "nonce" : "0x00",
@@ -69,14 +69,14 @@
                     "0x01" : "0x01"
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6000600155",
                 "nonce" : "0x00",
@@ -90,14 +90,14 @@
                 ""
             ],
             "gasLimit" : [
-                "85000"
+                "0x014c08"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stRefundTest/refund_CallToSuicideNoStorage.json b/GeneralStateTests/stRefundTest/refund_CallToSuicideNoStorage.json
index 0639a0585..ffe735f98 100644
--- a/GeneralStateTests/stRefundTest/refund_CallToSuicideNoStorage.json
+++ b/GeneralStateTests/stRefundTest/refund_CallToSuicideNoStorage.json
@@ -1,17 +1,17 @@
 {
     "refund_CallToSuicideNoStorage" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "23864f00568ee06c4fa976e7486076c878c7769477079ef6ec7263d3efbeb06c",
+                    "hash" : "0x23864f00568ee06c4fa976e7486076c878c7769477079ef6ec7263d3efbeb06c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "d2712850b9220fed8fded4dd69b08262c33b3cefe7dae41d8ee947b324229b08",
+                    "hash" : "0xd2712850b9220fed8fded4dd69b08262c33b3cefe7dae41d8ee947b324229b08",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -29,7 +29,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "23864f00568ee06c4fa976e7486076c878c7769477079ef6ec7263d3efbeb06c",
+                    "hash" : "0x23864f00568ee06c4fa976e7486076c878c7769477079ef6ec7263d3efbeb06c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -37,7 +37,7 @@
                     }
                 },
                 {
-                    "hash" : "d2712850b9220fed8fded4dd69b08262c33b3cefe7dae41d8ee947b324229b08",
+                    "hash" : "0xd2712850b9220fed8fded4dd69b08262c33b3cefe7dae41d8ee947b324229b08",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -47,7 +47,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "72d1e43979b3fff788ea533c0b363ac0cb6f7ae6b71f3a8cf4a2d223b9a90136",
+                    "hash" : "0x72d1e43979b3fff788ea533c0b363ac0cb6f7ae6b71f3a8cf4a2d223b9a90136",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -55,7 +55,7 @@
                     }
                 },
                 {
-                    "hash" : "b7e56361ab3129e79e9370a0c108fe52bc078753a73e9d76356eb5bedc8eed75",
+                    "hash" : "0xb7e56361ab3129e79e9370a0c108fe52bc078753a73e9d76356eb5bedc8eed75",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -65,7 +65,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "72d1e43979b3fff788ea533c0b363ac0cb6f7ae6b71f3a8cf4a2d223b9a90136",
+                    "hash" : "0x72d1e43979b3fff788ea533c0b363ac0cb6f7ae6b71f3a8cf4a2d223b9a90136",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -73,7 +73,7 @@
                     }
                 },
                 {
-                    "hash" : "b7e56361ab3129e79e9370a0c108fe52bc078753a73e9d76356eb5bedc8eed75",
+                    "hash" : "0xb7e56361ab3129e79e9370a0c108fe52bc078753a73e9d76356eb5bedc8eed75",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -83,7 +83,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "23864f00568ee06c4fa976e7486076c878c7769477079ef6ec7263d3efbeb06c",
+                    "hash" : "0x23864f00568ee06c4fa976e7486076c878c7769477079ef6ec7263d3efbeb06c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -91,7 +91,7 @@
                     }
                 },
                 {
-                    "hash" : "d2712850b9220fed8fded4dd69b08262c33b3cefe7dae41d8ee947b324229b08",
+                    "hash" : "0xd2712850b9220fed8fded4dd69b08262c33b3cefe7dae41d8ee947b324229b08",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -101,7 +101,7 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f1600055",
                 "nonce" : "0x00",
@@ -109,14 +109,14 @@
                     "0x01" : "0x01"
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f5e100",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d87ff",
                 "nonce" : "0x00",
@@ -130,14 +130,14 @@
                 "0x0000000000000000000000000000000000000000000000000000000000010000"
             ],
             "gasLimit" : [
-                "10000000"
+                "0x989680"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stRefundTest/refund_CallToSuicideStorage.json b/GeneralStateTests/stRefundTest/refund_CallToSuicideStorage.json
index 55a065fff..70ce289e6 100644
--- a/GeneralStateTests/stRefundTest/refund_CallToSuicideStorage.json
+++ b/GeneralStateTests/stRefundTest/refund_CallToSuicideStorage.json
@@ -1,17 +1,17 @@
 {
     "refund_CallToSuicideStorage" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a587ffe584ff984c6bd8710c40dc42c5f6aac60f280a01967d6c4f43249dd786",
+                    "hash" : "0xa587ffe584ff984c6bd8710c40dc42c5f6aac60f280a01967d6c4f43249dd786",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "d2712850b9220fed8fded4dd69b08262c33b3cefe7dae41d8ee947b324229b08",
+                    "hash" : "0xd2712850b9220fed8fded4dd69b08262c33b3cefe7dae41d8ee947b324229b08",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -29,7 +29,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a587ffe584ff984c6bd8710c40dc42c5f6aac60f280a01967d6c4f43249dd786",
+                    "hash" : "0xa587ffe584ff984c6bd8710c40dc42c5f6aac60f280a01967d6c4f43249dd786",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -37,7 +37,7 @@
                     }
                 },
                 {
-                    "hash" : "d2712850b9220fed8fded4dd69b08262c33b3cefe7dae41d8ee947b324229b08",
+                    "hash" : "0xd2712850b9220fed8fded4dd69b08262c33b3cefe7dae41d8ee947b324229b08",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -47,7 +47,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "72d1e43979b3fff788ea533c0b363ac0cb6f7ae6b71f3a8cf4a2d223b9a90136",
+                    "hash" : "0x72d1e43979b3fff788ea533c0b363ac0cb6f7ae6b71f3a8cf4a2d223b9a90136",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -55,7 +55,7 @@
                     }
                 },
                 {
-                    "hash" : "b7e56361ab3129e79e9370a0c108fe52bc078753a73e9d76356eb5bedc8eed75",
+                    "hash" : "0xb7e56361ab3129e79e9370a0c108fe52bc078753a73e9d76356eb5bedc8eed75",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -65,7 +65,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "72d1e43979b3fff788ea533c0b363ac0cb6f7ae6b71f3a8cf4a2d223b9a90136",
+                    "hash" : "0x72d1e43979b3fff788ea533c0b363ac0cb6f7ae6b71f3a8cf4a2d223b9a90136",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -73,7 +73,7 @@
                     }
                 },
                 {
-                    "hash" : "b7e56361ab3129e79e9370a0c108fe52bc078753a73e9d76356eb5bedc8eed75",
+                    "hash" : "0xb7e56361ab3129e79e9370a0c108fe52bc078753a73e9d76356eb5bedc8eed75",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -83,7 +83,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a587ffe584ff984c6bd8710c40dc42c5f6aac60f280a01967d6c4f43249dd786",
+                    "hash" : "0xa587ffe584ff984c6bd8710c40dc42c5f6aac60f280a01967d6c4f43249dd786",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -91,7 +91,7 @@
                     }
                 },
                 {
-                    "hash" : "d2712850b9220fed8fded4dd69b08262c33b3cefe7dae41d8ee947b324229b08",
+                    "hash" : "0xd2712850b9220fed8fded4dd69b08262c33b3cefe7dae41d8ee947b324229b08",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -101,7 +101,7 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f1600055",
                 "nonce" : "0x00",
@@ -109,14 +109,14 @@
                     "0x01" : "0x01"
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f5e100",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d87ff",
                 "nonce" : "0x00",
@@ -131,14 +131,14 @@
                 "0x0000000000000000000000000000000000000000000000000000000000010000"
             ],
             "gasLimit" : [
-                "10000000"
+                "0x989680"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stRefundTest/refund_CallToSuicideTwice.json b/GeneralStateTests/stRefundTest/refund_CallToSuicideTwice.json
index c6453752a..56c1363b9 100644
--- a/GeneralStateTests/stRefundTest/refund_CallToSuicideTwice.json
+++ b/GeneralStateTests/stRefundTest/refund_CallToSuicideTwice.json
@@ -1,17 +1,17 @@
 {
     "refund_CallToSuicideTwice" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "3a7b51222887418341a17d6348a7bb892e7af3d9aeda9ca704cd2d0717695e01",
+                    "hash" : "0x3a7b51222887418341a17d6348a7bb892e7af3d9aeda9ca704cd2d0717695e01",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "c3f51c7a52752e0bd11b975c85a7da9f8cb61b2a1169aed57c2448468d8d7876",
+                    "hash" : "0xc3f51c7a52752e0bd11b975c85a7da9f8cb61b2a1169aed57c2448468d8d7876",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -29,7 +29,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "3a7b51222887418341a17d6348a7bb892e7af3d9aeda9ca704cd2d0717695e01",
+                    "hash" : "0x3a7b51222887418341a17d6348a7bb892e7af3d9aeda9ca704cd2d0717695e01",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -37,7 +37,7 @@
                     }
                 },
                 {
-                    "hash" : "c3f51c7a52752e0bd11b975c85a7da9f8cb61b2a1169aed57c2448468d8d7876",
+                    "hash" : "0xc3f51c7a52752e0bd11b975c85a7da9f8cb61b2a1169aed57c2448468d8d7876",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -47,7 +47,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "760cadb9d8b99f6f9ddd673d76bb3aad04ac4f4c87ed21ceab6a859320aee2ee",
+                    "hash" : "0x760cadb9d8b99f6f9ddd673d76bb3aad04ac4f4c87ed21ceab6a859320aee2ee",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -55,7 +55,7 @@
                     }
                 },
                 {
-                    "hash" : "8fc808b98eebf12445af1aad861dd1294f909f06648588191ff698f78373e5bd",
+                    "hash" : "0x8fc808b98eebf12445af1aad861dd1294f909f06648588191ff698f78373e5bd",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -65,7 +65,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "760cadb9d8b99f6f9ddd673d76bb3aad04ac4f4c87ed21ceab6a859320aee2ee",
+                    "hash" : "0x760cadb9d8b99f6f9ddd673d76bb3aad04ac4f4c87ed21ceab6a859320aee2ee",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -73,7 +73,7 @@
                     }
                 },
                 {
-                    "hash" : "8fc808b98eebf12445af1aad861dd1294f909f06648588191ff698f78373e5bd",
+                    "hash" : "0x8fc808b98eebf12445af1aad861dd1294f909f06648588191ff698f78373e5bd",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -83,7 +83,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "3a7b51222887418341a17d6348a7bb892e7af3d9aeda9ca704cd2d0717695e01",
+                    "hash" : "0x3a7b51222887418341a17d6348a7bb892e7af3d9aeda9ca704cd2d0717695e01",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -91,7 +91,7 @@
                     }
                 },
                 {
-                    "hash" : "c3f51c7a52752e0bd11b975c85a7da9f8cb61b2a1169aed57c2448468d8d7876",
+                    "hash" : "0xc3f51c7a52752e0bd11b975c85a7da9f8cb61b2a1169aed57c2448468d8d7876",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -101,7 +101,7 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f16000556000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f1",
                 "nonce" : "0x00",
@@ -109,14 +109,14 @@
                     "0x01" : "0x01"
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f5e100",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d87ff",
                 "nonce" : "0x00",
@@ -131,14 +131,14 @@
                 "0x0000000000000000000000000000000000000000000000000000000000010000"
             ],
             "gasLimit" : [
-                "10000000"
+                "0x989680"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stRefundTest/refund_NoOOG_1.json b/GeneralStateTests/stRefundTest/refund_NoOOG_1.json
index b32024a41..7df436186 100644
--- a/GeneralStateTests/stRefundTest/refund_NoOOG_1.json
+++ b/GeneralStateTests/stRefundTest/refund_NoOOG_1.json
@@ -1,17 +1,17 @@
 {
     "refund_NoOOG_1" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "efa813dd4ded8a43953d20b6bbf5fb1b76a0aad9190a8bb755e1c98079f9da6a",
+                    "hash" : "0xefa813dd4ded8a43953d20b6bbf5fb1b76a0aad9190a8bb755e1c98079f9da6a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "efa813dd4ded8a43953d20b6bbf5fb1b76a0aad9190a8bb755e1c98079f9da6a",
+                    "hash" : "0xefa813dd4ded8a43953d20b6bbf5fb1b76a0aad9190a8bb755e1c98079f9da6a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "efa813dd4ded8a43953d20b6bbf5fb1b76a0aad9190a8bb755e1c98079f9da6a",
+                    "hash" : "0xefa813dd4ded8a43953d20b6bbf5fb1b76a0aad9190a8bb755e1c98079f9da6a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "efa813dd4ded8a43953d20b6bbf5fb1b76a0aad9190a8bb755e1c98079f9da6a",
+                    "hash" : "0xefa813dd4ded8a43953d20b6bbf5fb1b76a0aad9190a8bb755e1c98079f9da6a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "efa813dd4ded8a43953d20b6bbf5fb1b76a0aad9190a8bb755e1c98079f9da6a",
+                    "hash" : "0xefa813dd4ded8a43953d20b6bbf5fb1b76a0aad9190a8bb755e1c98079f9da6a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,7 +61,7 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6000600155",
                 "nonce" : "0x00",
@@ -69,9 +69,9 @@
                     "0x01" : "0x01"
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xc418",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -82,14 +82,14 @@
                 ""
             ],
             "gasLimit" : [
-                "26006"
+                "0x6596"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stRefundTest/refund_OOG.json b/GeneralStateTests/stRefundTest/refund_OOG.json
index 35feeadf6..6e517c7d2 100644
--- a/GeneralStateTests/stRefundTest/refund_OOG.json
+++ b/GeneralStateTests/stRefundTest/refund_OOG.json
@@ -1,17 +1,17 @@
 {
     "refund_OOG" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "da1d8b53222911d4edd86fb42ac017c3e1b219d7150007721307b676a6bc38c5",
+                    "hash" : "0xda1d8b53222911d4edd86fb42ac017c3e1b219d7150007721307b676a6bc38c5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "da1d8b53222911d4edd86fb42ac017c3e1b219d7150007721307b676a6bc38c5",
+                    "hash" : "0xda1d8b53222911d4edd86fb42ac017c3e1b219d7150007721307b676a6bc38c5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "da1d8b53222911d4edd86fb42ac017c3e1b219d7150007721307b676a6bc38c5",
+                    "hash" : "0xda1d8b53222911d4edd86fb42ac017c3e1b219d7150007721307b676a6bc38c5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "da1d8b53222911d4edd86fb42ac017c3e1b219d7150007721307b676a6bc38c5",
+                    "hash" : "0xda1d8b53222911d4edd86fb42ac017c3e1b219d7150007721307b676a6bc38c5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "da1d8b53222911d4edd86fb42ac017c3e1b219d7150007721307b676a6bc38c5",
+                    "hash" : "0xda1d8b53222911d4edd86fb42ac017c3e1b219d7150007721307b676a6bc38c5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,7 +61,7 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6000600155",
                 "nonce" : "0x00",
@@ -69,9 +69,9 @@
                     "0x01" : "0x01"
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x07a120",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -82,14 +82,14 @@
                 ""
             ],
             "gasLimit" : [
-                "26005"
+                "0x6595"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stRefundTest/refund_TxToSuicide.json b/GeneralStateTests/stRefundTest/refund_TxToSuicide.json
index 47bb531cd..e300f55b5 100644
--- a/GeneralStateTests/stRefundTest/refund_TxToSuicide.json
+++ b/GeneralStateTests/stRefundTest/refund_TxToSuicide.json
@@ -1,17 +1,17 @@
 {
     "refund_TxToSuicide" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "97942568ec40081407f0f17c744174685bf56c4bec7405d45837e7e6e203d5b2",
+                    "hash" : "0x97942568ec40081407f0f17c744174685bf56c4bec7405d45837e7e6e203d5b2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "88fb9e0f28bdde3b8d5d2a9c029c0be25e03e3c66c0f2d694f2923df35ef5e6f",
+                    "hash" : "0x88fb9e0f28bdde3b8d5d2a9c029c0be25e03e3c66c0f2d694f2923df35ef5e6f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -29,7 +29,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "97942568ec40081407f0f17c744174685bf56c4bec7405d45837e7e6e203d5b2",
+                    "hash" : "0x97942568ec40081407f0f17c744174685bf56c4bec7405d45837e7e6e203d5b2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -37,7 +37,7 @@
                     }
                 },
                 {
-                    "hash" : "88fb9e0f28bdde3b8d5d2a9c029c0be25e03e3c66c0f2d694f2923df35ef5e6f",
+                    "hash" : "0x88fb9e0f28bdde3b8d5d2a9c029c0be25e03e3c66c0f2d694f2923df35ef5e6f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -47,7 +47,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "51f254aed97a3c85e6ad2deb73214a0888fd23d42984d16d3f099ac1b1c5b2da",
+                    "hash" : "0x51f254aed97a3c85e6ad2deb73214a0888fd23d42984d16d3f099ac1b1c5b2da",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -55,7 +55,7 @@
                     }
                 },
                 {
-                    "hash" : "51f254aed97a3c85e6ad2deb73214a0888fd23d42984d16d3f099ac1b1c5b2da",
+                    "hash" : "0x51f254aed97a3c85e6ad2deb73214a0888fd23d42984d16d3f099ac1b1c5b2da",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -65,7 +65,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "51f254aed97a3c85e6ad2deb73214a0888fd23d42984d16d3f099ac1b1c5b2da",
+                    "hash" : "0x51f254aed97a3c85e6ad2deb73214a0888fd23d42984d16d3f099ac1b1c5b2da",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -73,7 +73,7 @@
                     }
                 },
                 {
-                    "hash" : "51f254aed97a3c85e6ad2deb73214a0888fd23d42984d16d3f099ac1b1c5b2da",
+                    "hash" : "0x51f254aed97a3c85e6ad2deb73214a0888fd23d42984d16d3f099ac1b1c5b2da",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -83,7 +83,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "97942568ec40081407f0f17c744174685bf56c4bec7405d45837e7e6e203d5b2",
+                    "hash" : "0x97942568ec40081407f0f17c744174685bf56c4bec7405d45837e7e6e203d5b2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -91,7 +91,7 @@
                     }
                 },
                 {
-                    "hash" : "88fb9e0f28bdde3b8d5d2a9c029c0be25e03e3c66c0f2d694f2923df35ef5e6f",
+                    "hash" : "0x88fb9e0f28bdde3b8d5d2a9c029c0be25e03e3c66c0f2d694f2923df35ef5e6f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -101,14 +101,14 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f5e100",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d87ff",
                 "nonce" : "0x00",
@@ -122,15 +122,15 @@
                 ""
             ],
             "gasLimit" : [
-                "21003",
-                "61003"
+                "0x520b",
+                "0xee4b"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "aaae7baea6a6c7c4c2dfeb977efac326af552aaa",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stRefundTest/refund_TxToSuicideOOG.json b/GeneralStateTests/stRefundTest/refund_TxToSuicideOOG.json
index 830b19982..d57d10149 100644
--- a/GeneralStateTests/stRefundTest/refund_TxToSuicideOOG.json
+++ b/GeneralStateTests/stRefundTest/refund_TxToSuicideOOG.json
@@ -1,17 +1,17 @@
 {
     "refund_TxToSuicideOOG" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7c2147eefb0539a33353f7f1d753dd0d1185993a327c2e6c3a2334fca5ac0f26",
+                    "hash" : "0x7c2147eefb0539a33353f7f1d753dd0d1185993a327c2e6c3a2334fca5ac0f26",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7c2147eefb0539a33353f7f1d753dd0d1185993a327c2e6c3a2334fca5ac0f26",
+                    "hash" : "0x7c2147eefb0539a33353f7f1d753dd0d1185993a327c2e6c3a2334fca5ac0f26",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "7c2147eefb0539a33353f7f1d753dd0d1185993a327c2e6c3a2334fca5ac0f26",
+                    "hash" : "0x7c2147eefb0539a33353f7f1d753dd0d1185993a327c2e6c3a2334fca5ac0f26",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "7c2147eefb0539a33353f7f1d753dd0d1185993a327c2e6c3a2334fca5ac0f26",
+                    "hash" : "0x7c2147eefb0539a33353f7f1d753dd0d1185993a327c2e6c3a2334fca5ac0f26",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7c2147eefb0539a33353f7f1d753dd0d1185993a327c2e6c3a2334fca5ac0f26",
+                    "hash" : "0x7c2147eefb0539a33353f7f1d753dd0d1185993a327c2e6c3a2334fca5ac0f26",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,14 +61,14 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f5e100",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d87ff",
                 "nonce" : "0x00",
@@ -82,14 +82,14 @@
                 ""
             ],
             "gasLimit" : [
-                "21002"
+                "0x520a"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "aaae7baea6a6c7c4c2dfeb977efac326af552aaa",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stRefundTest/refund_changeNonZeroStorage.json b/GeneralStateTests/stRefundTest/refund_changeNonZeroStorage.json
index 503c9e6cb..51faf8f55 100644
--- a/GeneralStateTests/stRefundTest/refund_changeNonZeroStorage.json
+++ b/GeneralStateTests/stRefundTest/refund_changeNonZeroStorage.json
@@ -1,17 +1,17 @@
 {
     "refund_changeNonZeroStorage" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c9e05a8fa968fe4a701b529e0fa662e0584e47ce365af374f51a68936fa6781f",
+                    "hash" : "0xc9e05a8fa968fe4a701b529e0fa662e0584e47ce365af374f51a68936fa6781f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c9e05a8fa968fe4a701b529e0fa662e0584e47ce365af374f51a68936fa6781f",
+                    "hash" : "0xc9e05a8fa968fe4a701b529e0fa662e0584e47ce365af374f51a68936fa6781f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "c9e05a8fa968fe4a701b529e0fa662e0584e47ce365af374f51a68936fa6781f",
+                    "hash" : "0xc9e05a8fa968fe4a701b529e0fa662e0584e47ce365af374f51a68936fa6781f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c9e05a8fa968fe4a701b529e0fa662e0584e47ce365af374f51a68936fa6781f",
+                    "hash" : "0xc9e05a8fa968fe4a701b529e0fa662e0584e47ce365af374f51a68936fa6781f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c9e05a8fa968fe4a701b529e0fa662e0584e47ce365af374f51a68936fa6781f",
+                    "hash" : "0xc9e05a8fa968fe4a701b529e0fa662e0584e47ce365af374f51a68936fa6781f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,7 +61,7 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6017600155",
                 "nonce" : "0x00",
@@ -69,9 +69,9 @@
                     "0x01" : "0x01"
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -82,14 +82,14 @@
                 ""
             ],
             "gasLimit" : [
-                "228500"
+                "0x037c94"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stRefundTest/refund_getEtherBack.json b/GeneralStateTests/stRefundTest/refund_getEtherBack.json
index 4b430e768..9200867d9 100644
--- a/GeneralStateTests/stRefundTest/refund_getEtherBack.json
+++ b/GeneralStateTests/stRefundTest/refund_getEtherBack.json
@@ -1,17 +1,17 @@
 {
     "refund_getEtherBack" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x037c94",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a0159f6905643874597ab3c5a4adfadcd07e113c4c4ac4c5bc54c1ef7a71a005",
+                    "hash" : "0xa0159f6905643874597ab3c5a4adfadcd07e113c4c4ac4c5bc54c1ef7a71a005",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a0159f6905643874597ab3c5a4adfadcd07e113c4c4ac4c5bc54c1ef7a71a005",
+                    "hash" : "0xa0159f6905643874597ab3c5a4adfadcd07e113c4c4ac4c5bc54c1ef7a71a005",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a0159f6905643874597ab3c5a4adfadcd07e113c4c4ac4c5bc54c1ef7a71a005",
+                    "hash" : "0xa0159f6905643874597ab3c5a4adfadcd07e113c4c4ac4c5bc54c1ef7a71a005",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a0159f6905643874597ab3c5a4adfadcd07e113c4c4ac4c5bc54c1ef7a71a005",
+                    "hash" : "0xa0159f6905643874597ab3c5a4adfadcd07e113c4c4ac4c5bc54c1ef7a71a005",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a0159f6905643874597ab3c5a4adfadcd07e113c4c4ac4c5bc54c1ef7a71a005",
+                    "hash" : "0xa0159f6905643874597ab3c5a4adfadcd07e113c4c4ac4c5bc54c1ef7a71a005",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,7 +61,7 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6000600155",
                 "nonce" : "0x00",
@@ -69,9 +69,9 @@
                     "0x01" : "0x01"
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x22ddc8",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -82,14 +82,14 @@
                 ""
             ],
             "gasLimit" : [
-                "228500"
+                "0x037c94"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stRefundTest/refund_multimpleSuicide.json b/GeneralStateTests/stRefundTest/refund_multimpleSuicide.json
index b355ba39c..258218c08 100644
--- a/GeneralStateTests/stRefundTest/refund_multimpleSuicide.json
+++ b/GeneralStateTests/stRefundTest/refund_multimpleSuicide.json
@@ -1,17 +1,17 @@
 {
     "refund_multimpleSuicide" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f86cd78f87f71a92c8db138f99e6ce104e81b30bbafac118127ec5057148aa99",
+                    "hash" : "0xf86cd78f87f71a92c8db138f99e6ce104e81b30bbafac118127ec5057148aa99",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6d682e26dc5364fc47db5306aea09899760ac2bd4b89229bfbf62b784ab1866d",
+                    "hash" : "0x6d682e26dc5364fc47db5306aea09899760ac2bd4b89229bfbf62b784ab1866d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4565006352de0399e17ac6cc3671ca2fa94e553df037f6df5fed7f966a04ba84",
+                    "hash" : "0x4565006352de0399e17ac6cc3671ca2fa94e553df037f6df5fed7f966a04ba84",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4565006352de0399e17ac6cc3671ca2fa94e553df037f6df5fed7f966a04ba84",
+                    "hash" : "0x4565006352de0399e17ac6cc3671ca2fa94e553df037f6df5fed7f966a04ba84",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6d682e26dc5364fc47db5306aea09899760ac2bd4b89229bfbf62b784ab1866d",
+                    "hash" : "0x6d682e26dc5364fc47db5306aea09899760ac2bd4b89229bfbf62b784ab1866d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x606060405260e060020a600035046309e587a58114610031578063c04062261461004d578063dd4f1f2a1461005a575b005b61002f3373ffffffffffffffffffffffffffffffffffffffff16ff5b6100f5600061010961005e565b61002f5b60003090508073ffffffffffffffffffffffffffffffffffffffff166309e587a56040518160e060020a0281526004018090506000604051808303816000876161da5a03f1156100025750604080517f09e587a500000000000000000000000000000000000000000000000000000000815290516004828101926000929190829003018183876161da5a03f1156100025750505050565b604080519115158252519081900360200190f35b5060019056",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0493e0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 "0xc0406226"
             ],
             "gasLimit" : [
-                "300000"
+                "0x0493e0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000001",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000001",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stRefundTest/refund_singleSuicide.json b/GeneralStateTests/stRefundTest/refund_singleSuicide.json
index b4a11d582..633f4e37d 100644
--- a/GeneralStateTests/stRefundTest/refund_singleSuicide.json
+++ b/GeneralStateTests/stRefundTest/refund_singleSuicide.json
@@ -1,17 +1,17 @@
 {
     "refund_singleSuicide" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6f5cbf09a8693d41dec28d7b4ada05d6cb4cc00029ee9311721903060039fd50",
+                    "hash" : "0x6f5cbf09a8693d41dec28d7b4ada05d6cb4cc00029ee9311721903060039fd50",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "470504afdd4f770328e7e01c552f262cc55996fc83cc5fe05c825fda6b50312c",
+                    "hash" : "0x470504afdd4f770328e7e01c552f262cc55996fc83cc5fe05c825fda6b50312c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "ba2fd14cc4799bf049ebc512a6e27a5c4678bf5ae0834659f9179ed3049ff4ff",
+                    "hash" : "0xba2fd14cc4799bf049ebc512a6e27a5c4678bf5ae0834659f9179ed3049ff4ff",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ba2fd14cc4799bf049ebc512a6e27a5c4678bf5ae0834659f9179ed3049ff4ff",
+                    "hash" : "0xba2fd14cc4799bf049ebc512a6e27a5c4678bf5ae0834659f9179ed3049ff4ff",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "470504afdd4f770328e7e01c552f262cc55996fc83cc5fe05c825fda6b50312c",
+                    "hash" : "0x470504afdd4f770328e7e01c552f262cc55996fc83cc5fe05c825fda6b50312c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x606060405260e060020a600035046309e587a58114602e5780632e4699ed146049578063c040622614609b575b005b602c3373ffffffffffffffffffffffffffffffffffffffff16ff5b602c5b60003090508073ffffffffffffffffffffffffffffffffffffffff166309e587a56040518160e060020a0281526004018090506000604051808303816000876161da5a03f11560025750505050565b60a5600060b9604c565b604080519115158252519081900360200190f35b5060019056",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0493e0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 "0xc0406226"
             ],
             "gasLimit" : [
-                "300000"
+                "0x0493e0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000001",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000001",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert.json b/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert.json
index fa98a7275..26d1481e6 100644
--- a/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert.json
+++ b/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert.json
@@ -1,17 +1,17 @@
 {
     "LoopCallsDepthThenRevert" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "81b5f1c57a1dcae800a1b87c67808809006e77f1b7645ba21eba71f5fc2a9852",
+                    "hash" : "0x81b5f1c57a1dcae800a1b87c67808809006e77f1b7645ba21eba71f5fc2a9852",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "81b5f1c57a1dcae800a1b87c67808809006e77f1b7645ba21eba71f5fc2a9852",
+                    "hash" : "0x81b5f1c57a1dcae800a1b87c67808809006e77f1b7645ba21eba71f5fc2a9852",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "d9c98049def493351df6808ceef42a14c3d4f3321c816d64bb57332e82426a0d",
+                    "hash" : "0xd9c98049def493351df6808ceef42a14c3d4f3321c816d64bb57332e82426a0d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "d9c98049def493351df6808ceef42a14c3d4f3321c816d64bb57332e82426a0d",
+                    "hash" : "0xd9c98049def493351df6808ceef42a14c3d4f3321c816d64bb57332e82426a0d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "81b5f1c57a1dcae800a1b87c67808809006e77f1b7645ba21eba71f5fc2a9852",
+                    "hash" : "0x81b5f1c57a1dcae800a1b87c67808809006e77f1b7645ba21eba71f5fc2a9852",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "a000000000000000000000000000000000000000" : {
+            "0xa000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x6001600054016000556000600060006000600073b0000000000000000000000000000000000000005af1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b000000000000000000000000000000000000000" : {
+            "0xb000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x6001600054016000556000600060006000600073a0000000000000000000000000000000000000005af1",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "10000000"
+                "0x989680"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "a000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xa000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert2.json b/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert2.json
index ed979a941..82b3c5695 100644
--- a/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert2.json
+++ b/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert2.json
@@ -1,17 +1,17 @@
 {
     "LoopCallsDepthThenRevert2" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "43a070c3751b629ac30b1fda3954b5301b0c92a2173eb3dd71f9726fba3cd2b5",
+                    "hash" : "0x43a070c3751b629ac30b1fda3954b5301b0c92a2173eb3dd71f9726fba3cd2b5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "216fd3110280abe8b81a5f5fde77efa3326f81dbb1edcd1334fccd093cdc935f",
+                    "hash" : "0x216fd3110280abe8b81a5f5fde77efa3326f81dbb1edcd1334fccd093cdc935f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2286ae15ac5ec3440acd73430954bf809f070b2c508ac564043adc7260be5e9f",
+                    "hash" : "0x2286ae15ac5ec3440acd73430954bf809f070b2c508ac564043adc7260be5e9f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "2286ae15ac5ec3440acd73430954bf809f070b2c508ac564043adc7260be5e9f",
+                    "hash" : "0x2286ae15ac5ec3440acd73430954bf809f070b2c508ac564043adc7260be5e9f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "216fd3110280abe8b81a5f5fde77efa3326f81dbb1edcd1334fccd093cdc935f",
+                    "hash" : "0x216fd3110280abe8b81a5f5fde77efa3326f81dbb1edcd1334fccd093cdc935f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "a000000000000000000000000000000000000000" : {
+            "0xa000000000000000000000000000000000000000" : {
                 "balance" : "0x0a",
                 "code" : "0x6103ff60005414603f576001600054016000556000600060006000600073a0000000000000000000000000000000000000005af15061041a600054106053575b66600060006002f0600052600760196003f0505b",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x13426172c74d822b878fe800000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -85,10 +85,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "a000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xa000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert3.json b/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert3.json
index ce7e36e7d..ed61eb0e9 100644
--- a/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert3.json
+++ b/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert3.json
@@ -1,17 +1,17 @@
 {
     "LoopCallsDepthThenRevert3" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e31213d4682a6d7e8754702229f6aea87486ccbbdfa8da864726be4085bd904e",
+                    "hash" : "0xe31213d4682a6d7e8754702229f6aea87486ccbbdfa8da864726be4085bd904e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "2c776844bb275ce1d4e7e7c41ed0136ccb8af0dd37f903ce487769efd8a6f88a",
+                    "hash" : "0x2c776844bb275ce1d4e7e7c41ed0136ccb8af0dd37f903ce487769efd8a6f88a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "40b9433e63136b733583d1920393a816bf2dfe8a0fc383f2c92800ab4a27b6fc",
+                    "hash" : "0x40b9433e63136b733583d1920393a816bf2dfe8a0fc383f2c92800ab4a27b6fc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "40b9433e63136b733583d1920393a816bf2dfe8a0fc383f2c92800ab4a27b6fc",
+                    "hash" : "0x40b9433e63136b733583d1920393a816bf2dfe8a0fc383f2c92800ab4a27b6fc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "2c776844bb275ce1d4e7e7c41ed0136ccb8af0dd37f903ce487769efd8a6f88a",
+                    "hash" : "0x2c776844bb275ce1d4e7e7c41ed0136ccb8af0dd37f903ce487769efd8a6f88a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "a000000000000000000000000000000000000000" : {
+            "0xa000000000000000000000000000000000000000" : {
                 "balance" : "0x0a",
                 "code" : "0x6103fe60005414603f576001600054016000556000600060006000600073a0000000000000000000000000000000000000005af15061041a600054106053575b66600060006002f0600052600760196003f0505b",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x13426172c74d822b878fe800000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -85,10 +85,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "a000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xa000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stRevertTest/LoopCallsThenRevert.json b/GeneralStateTests/stRevertTest/LoopCallsThenRevert.json
index a79fd598e..c93f1cc4a 100644
--- a/GeneralStateTests/stRevertTest/LoopCallsThenRevert.json
+++ b/GeneralStateTests/stRevertTest/LoopCallsThenRevert.json
@@ -1,17 +1,17 @@
 {
     "LoopCallsThenRevert" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "01422f9f38e9ac49e24d119a250f58979b44d1b2e99ef2f9032dc33dcf9c1df1",
+                    "hash" : "0x01422f9f38e9ac49e24d119a250f58979b44d1b2e99ef2f9032dc33dcf9c1df1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "da2f7fa251260ee3f45c72597ba85421a88492749f2c7e7276cbce63436b99be",
+                    "hash" : "0xda2f7fa251260ee3f45c72597ba85421a88492749f2c7e7276cbce63436b99be",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -29,7 +29,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "01422f9f38e9ac49e24d119a250f58979b44d1b2e99ef2f9032dc33dcf9c1df1",
+                    "hash" : "0x01422f9f38e9ac49e24d119a250f58979b44d1b2e99ef2f9032dc33dcf9c1df1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -37,7 +37,7 @@
                     }
                 },
                 {
-                    "hash" : "da2f7fa251260ee3f45c72597ba85421a88492749f2c7e7276cbce63436b99be",
+                    "hash" : "0xda2f7fa251260ee3f45c72597ba85421a88492749f2c7e7276cbce63436b99be",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -47,7 +47,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "d2cf7d4f9abde7c247783fbb366baa64189ec2d482de9638723a49059eb5e4aa",
+                    "hash" : "0xd2cf7d4f9abde7c247783fbb366baa64189ec2d482de9638723a49059eb5e4aa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -55,7 +55,7 @@
                     }
                 },
                 {
-                    "hash" : "d2cf7d4f9abde7c247783fbb366baa64189ec2d482de9638723a49059eb5e4aa",
+                    "hash" : "0xd2cf7d4f9abde7c247783fbb366baa64189ec2d482de9638723a49059eb5e4aa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -65,7 +65,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "d2cf7d4f9abde7c247783fbb366baa64189ec2d482de9638723a49059eb5e4aa",
+                    "hash" : "0xd2cf7d4f9abde7c247783fbb366baa64189ec2d482de9638723a49059eb5e4aa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -73,7 +73,7 @@
                     }
                 },
                 {
-                    "hash" : "d2cf7d4f9abde7c247783fbb366baa64189ec2d482de9638723a49059eb5e4aa",
+                    "hash" : "0xd2cf7d4f9abde7c247783fbb366baa64189ec2d482de9638723a49059eb5e4aa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -83,7 +83,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "01422f9f38e9ac49e24d119a250f58979b44d1b2e99ef2f9032dc33dcf9c1df1",
+                    "hash" : "0x01422f9f38e9ac49e24d119a250f58979b44d1b2e99ef2f9032dc33dcf9c1df1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -91,7 +91,7 @@
                     }
                 },
                 {
-                    "hash" : "da2f7fa251260ee3f45c72597ba85421a88492749f2c7e7276cbce63436b99be",
+                    "hash" : "0xda2f7fa251260ee3f45c72597ba85421a88492749f2c7e7276cbce63436b99be",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -101,7 +101,7 @@
             ]
         },
         "pre" : {
-            "a000000000000000000000000000000000000000" : {
+            "0xa000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x5b6001600054036000556000600060006000600073b00000000000000000000000000000000000000061c350f150600054600057",
                 "nonce" : "0x00",
@@ -109,14 +109,14 @@
                     "0x00" : "0x0352"
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b000000000000000000000000000000000000000" : {
+            "0xb000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x600054600101600055",
                 "nonce" : "0x00",
@@ -129,15 +129,15 @@
                 ""
             ],
             "gasLimit" : [
-                "10000000",
-                "9000000"
+                "0x989680",
+                "0x895440"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "a000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xa000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stRevertTest/LoopDelegateCallsDepthThenRevert.json b/GeneralStateTests/stRevertTest/LoopDelegateCallsDepthThenRevert.json
index b118cb0bb..d34054bb6 100644
--- a/GeneralStateTests/stRevertTest/LoopDelegateCallsDepthThenRevert.json
+++ b/GeneralStateTests/stRevertTest/LoopDelegateCallsDepthThenRevert.json
@@ -1,17 +1,17 @@
 {
     "LoopDelegateCallsDepthThenRevert" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b8e2ecbaeed90b5e892a2832cfc3231496ff86680f0fb898fcdf7ec894f92d45",
+                    "hash" : "0xb8e2ecbaeed90b5e892a2832cfc3231496ff86680f0fb898fcdf7ec894f92d45",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b8e2ecbaeed90b5e892a2832cfc3231496ff86680f0fb898fcdf7ec894f92d45",
+                    "hash" : "0xb8e2ecbaeed90b5e892a2832cfc3231496ff86680f0fb898fcdf7ec894f92d45",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f9d4a72012836575c25f1b5e8bd7b573ebf132caf6b10bd891636f80fc792117",
+                    "hash" : "0xf9d4a72012836575c25f1b5e8bd7b573ebf132caf6b10bd891636f80fc792117",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f9d4a72012836575c25f1b5e8bd7b573ebf132caf6b10bd891636f80fc792117",
+                    "hash" : "0xf9d4a72012836575c25f1b5e8bd7b573ebf132caf6b10bd891636f80fc792117",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b8e2ecbaeed90b5e892a2832cfc3231496ff86680f0fb898fcdf7ec894f92d45",
+                    "hash" : "0xb8e2ecbaeed90b5e892a2832cfc3231496ff86680f0fb898fcdf7ec894f92d45",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "a000000000000000000000000000000000000000" : {
+            "0xa000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x600160005401600055600060006000600073b0000000000000000000000000000000000000005af4",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b000000000000000000000000000000000000000" : {
+            "0xb000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x600160005401600055600060006000600073a0000000000000000000000000000000000000005af4",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "10000000"
+                "0x989680"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "a000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xa000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stRevertTest/NashatyrevSuicideRevert.json b/GeneralStateTests/stRevertTest/NashatyrevSuicideRevert.json
index fa1c4d6f1..1cb82c953 100644
--- a/GeneralStateTests/stRevertTest/NashatyrevSuicideRevert.json
+++ b/GeneralStateTests/stRevertTest/NashatyrevSuicideRevert.json
@@ -1,17 +1,17 @@
 {
     "NashatyrevSuicideRevert" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "dd821ab265cb0ac289d94a1c22540a9f1e1e96f59011a2e150618c38323a6c95",
+                    "hash" : "0xdd821ab265cb0ac289d94a1c22540a9f1e1e96f59011a2e150618c38323a6c95",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "dd821ab265cb0ac289d94a1c22540a9f1e1e96f59011a2e150618c38323a6c95",
+                    "hash" : "0xdd821ab265cb0ac289d94a1c22540a9f1e1e96f59011a2e150618c38323a6c95",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "0d347869d80f37b94370f30f18e3cb6e9521425c1587f150709ea7fdb889f6f1",
+                    "hash" : "0x0d347869d80f37b94370f30f18e3cb6e9521425c1587f150709ea7fdb889f6f1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "0d347869d80f37b94370f30f18e3cb6e9521425c1587f150709ea7fdb889f6f1",
+                    "hash" : "0x0d347869d80f37b94370f30f18e3cb6e9521425c1587f150709ea7fdb889f6f1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "dd821ab265cb0ac289d94a1c22540a9f1e1e96f59011a2e150618c38323a6c95",
+                    "hash" : "0xdd821ab265cb0ac289d94a1c22540a9f1e1e96f59011a2e150618c38323a6c95",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "a000000000000000000000000000000000000000" : {
+            "0xa000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680639c3674fc14610049578063c040622614610058575b610000565b3461000057610056610067565b005b3461000057610065610147565b005b600060405160a680610200833901809050604051809103906000f080156100005790508073ffffffffffffffffffffffffffffffffffffffff1660405180807f6628290000000000000000000000000000000000000000000000000000000000815250600301905060405180910390207c010000000000000000000000000000000000000000000000000000000090046040518163ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018090506000604051808303816000876161da5a03f19250505050610000565b50565b3073ffffffffffffffffffffffffffffffffffffffff1660405180807f6261642829000000000000000000000000000000000000000000000000000000815250600501905060405180910390207c010000000000000000000000000000000000000000000000000000000090046040518163ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018090506000604051808303816000876161da5a03f192505050505b56006060604052346000575b608f806100176000396000f30060606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806326121ff014603c575b6000565b3460005760466048565b005b3373ffffffffffffffffffffffffffffffffffffffff16ff5b5600a165627a7a723058203d1a897befde21eff26abc325fb3da2f526bbc99de1c5c857d1835f673744ebd0029a165627a7a72305820850a52b31ec4745b7af15ba3bffdb1ba17f5d9a00a5f263ee287a92b568f534c0029",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 "0xc0406226"
             ],
             "gasLimit" : [
-                "500000"
+                "0x07a120"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "a000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xa000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stRevertTest/RevertDepth2.json b/GeneralStateTests/stRevertTest/RevertDepth2.json
index 65846956b..aadd4b09c 100644
--- a/GeneralStateTests/stRevertTest/RevertDepth2.json
+++ b/GeneralStateTests/stRevertTest/RevertDepth2.json
@@ -1,17 +1,17 @@
 {
     "RevertDepth2" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "04ce8d06e26daf0ede58650a21e93c2abf8ea7a15e97695e2f3916ce6ff78f50",
+                    "hash" : "0x04ce8d06e26daf0ede58650a21e93c2abf8ea7a15e97695e2f3916ce6ff78f50",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "04ce8d06e26daf0ede58650a21e93c2abf8ea7a15e97695e2f3916ce6ff78f50",
+                    "hash" : "0x04ce8d06e26daf0ede58650a21e93c2abf8ea7a15e97695e2f3916ce6ff78f50",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "04ce8d06e26daf0ede58650a21e93c2abf8ea7a15e97695e2f3916ce6ff78f50",
+                    "hash" : "0x04ce8d06e26daf0ede58650a21e93c2abf8ea7a15e97695e2f3916ce6ff78f50",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "04ce8d06e26daf0ede58650a21e93c2abf8ea7a15e97695e2f3916ce6ff78f50",
+                    "hash" : "0x04ce8d06e26daf0ede58650a21e93c2abf8ea7a15e97695e2f3916ce6ff78f50",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "04ce8d06e26daf0ede58650a21e93c2abf8ea7a15e97695e2f3916ce6ff78f50",
+                    "hash" : "0x04ce8d06e26daf0ede58650a21e93c2abf8ea7a15e97695e2f3916ce6ff78f50",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,35 +61,35 @@
             ]
         },
         "pre" : {
-            "a000000000000000000000000000000000000000" : {
+            "0xa000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x6000546001016000556000600060006000600073b000000000000000000000000000000000000000620249f0f16001556000600060006000600073d000000000000000000000000000000000000000620249f0f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b000000000000000000000000000000000000000" : {
+            "0xb000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x6000546001016000556000600060006000600073c00000000000000000000000000000000000000061c350f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c000000000000000000000000000000000000000" : {
+            "0xc000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x600054600101600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "d000000000000000000000000000000000000000" : {
+            "0xd000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x6000546001016000556000600060006000600073c00000000000000000000000000000000000000061c350f16001555a600255",
                 "nonce" : "0x00",
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "170685"
+                "0x029abd"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "a000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xa000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision.json b/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision.json
index fea92a488..c372cdfe7 100644
--- a/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision.json
+++ b/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision.json
@@ -1,17 +1,17 @@
 {
     "RevertDepthCreateAddressCollision" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "fd4576f6f46ff6a211a0e825d80794c010e9c7d988094a078e2be1254a508c27",
+                    "hash" : "0xfd4576f6f46ff6a211a0e825d80794c010e9c7d988094a078e2be1254a508c27",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "fd4576f6f46ff6a211a0e825d80794c010e9c7d988094a078e2be1254a508c27",
+                    "hash" : "0xfd4576f6f46ff6a211a0e825d80794c010e9c7d988094a078e2be1254a508c27",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -27,7 +27,7 @@
                     }
                 },
                 {
-                    "hash" : "1967b2c7634d032982aae84a2822736d79b4c6c080bbc2295d62578cd08127a3",
+                    "hash" : "0x1967b2c7634d032982aae84a2822736d79b4c6c080bbc2295d62578cd08127a3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -35,7 +35,7 @@
                     }
                 },
                 {
-                    "hash" : "ef75c5e063ddaa516cf1bfa6de671ad9511e6a881ada2770d2da291c15452b2b",
+                    "hash" : "0xef75c5e063ddaa516cf1bfa6de671ad9511e6a881ada2770d2da291c15452b2b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -43,7 +43,7 @@
                     }
                 },
                 {
-                    "hash" : "fd4576f6f46ff6a211a0e825d80794c010e9c7d988094a078e2be1254a508c27",
+                    "hash" : "0xfd4576f6f46ff6a211a0e825d80794c010e9c7d988094a078e2be1254a508c27",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -51,7 +51,7 @@
                     }
                 },
                 {
-                    "hash" : "fd4576f6f46ff6a211a0e825d80794c010e9c7d988094a078e2be1254a508c27",
+                    "hash" : "0xfd4576f6f46ff6a211a0e825d80794c010e9c7d988094a078e2be1254a508c27",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -59,7 +59,7 @@
                     }
                 },
                 {
-                    "hash" : "b46d0cef0aaed0c79f3f2217d0d5319c6a91b130df4cf9495979b9dc99e6a8a9",
+                    "hash" : "0xb46d0cef0aaed0c79f3f2217d0d5319c6a91b130df4cf9495979b9dc99e6a8a9",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -67,7 +67,7 @@
                     }
                 },
                 {
-                    "hash" : "78ba42aa7a64d9d20dfcbbcf3527486f7607bc694724b6d2cf9d34cb7696eee4",
+                    "hash" : "0x78ba42aa7a64d9d20dfcbbcf3527486f7607bc694724b6d2cf9d34cb7696eee4",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -77,7 +77,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "fd4576f6f46ff6a211a0e825d80794c010e9c7d988094a078e2be1254a508c27",
+                    "hash" : "0xfd4576f6f46ff6a211a0e825d80794c010e9c7d988094a078e2be1254a508c27",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -85,7 +85,7 @@
                     }
                 },
                 {
-                    "hash" : "fd4576f6f46ff6a211a0e825d80794c010e9c7d988094a078e2be1254a508c27",
+                    "hash" : "0xfd4576f6f46ff6a211a0e825d80794c010e9c7d988094a078e2be1254a508c27",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -93,7 +93,7 @@
                     }
                 },
                 {
-                    "hash" : "1967b2c7634d032982aae84a2822736d79b4c6c080bbc2295d62578cd08127a3",
+                    "hash" : "0x1967b2c7634d032982aae84a2822736d79b4c6c080bbc2295d62578cd08127a3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -101,7 +101,7 @@
                     }
                 },
                 {
-                    "hash" : "ef75c5e063ddaa516cf1bfa6de671ad9511e6a881ada2770d2da291c15452b2b",
+                    "hash" : "0xef75c5e063ddaa516cf1bfa6de671ad9511e6a881ada2770d2da291c15452b2b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -109,7 +109,7 @@
                     }
                 },
                 {
-                    "hash" : "fd4576f6f46ff6a211a0e825d80794c010e9c7d988094a078e2be1254a508c27",
+                    "hash" : "0xfd4576f6f46ff6a211a0e825d80794c010e9c7d988094a078e2be1254a508c27",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -117,7 +117,7 @@
                     }
                 },
                 {
-                    "hash" : "fd4576f6f46ff6a211a0e825d80794c010e9c7d988094a078e2be1254a508c27",
+                    "hash" : "0xfd4576f6f46ff6a211a0e825d80794c010e9c7d988094a078e2be1254a508c27",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -125,7 +125,7 @@
                     }
                 },
                 {
-                    "hash" : "da322bcf094f1785bd69806d493d816c9919274912b75c3636cbb2e9176dea33",
+                    "hash" : "0xda322bcf094f1785bd69806d493d816c9919274912b75c3636cbb2e9176dea33",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -133,7 +133,7 @@
                     }
                 },
                 {
-                    "hash" : "19013819c754a9013bb5884a8ecbf1a920cc54a0f84cd34a117f7a947cc4e724",
+                    "hash" : "0x19013819c754a9013bb5884a8ecbf1a920cc54a0f84cd34a117f7a947cc4e724",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -143,7 +143,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "fd4576f6f46ff6a211a0e825d80794c010e9c7d988094a078e2be1254a508c27",
+                    "hash" : "0xfd4576f6f46ff6a211a0e825d80794c010e9c7d988094a078e2be1254a508c27",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -151,7 +151,7 @@
                     }
                 },
                 {
-                    "hash" : "fd4576f6f46ff6a211a0e825d80794c010e9c7d988094a078e2be1254a508c27",
+                    "hash" : "0xfd4576f6f46ff6a211a0e825d80794c010e9c7d988094a078e2be1254a508c27",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -159,7 +159,7 @@
                     }
                 },
                 {
-                    "hash" : "025d5b1b6062a8af12a219329e31cd30b93a1abd5b48a8007cdc2c159309e47f",
+                    "hash" : "0x025d5b1b6062a8af12a219329e31cd30b93a1abd5b48a8007cdc2c159309e47f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -167,7 +167,7 @@
                     }
                 },
                 {
-                    "hash" : "7723422b5f67efa12691b3a9c810910281c38165826aae46b2452a843a31e077",
+                    "hash" : "0x7723422b5f67efa12691b3a9c810910281c38165826aae46b2452a843a31e077",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -175,7 +175,7 @@
                     }
                 },
                 {
-                    "hash" : "222799d2ad41990338860221d0d59567fcb0ac058b7b72d962708a84cbace1ad",
+                    "hash" : "0x222799d2ad41990338860221d0d59567fcb0ac058b7b72d962708a84cbace1ad",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -183,7 +183,7 @@
                     }
                 },
                 {
-                    "hash" : "222799d2ad41990338860221d0d59567fcb0ac058b7b72d962708a84cbace1ad",
+                    "hash" : "0x222799d2ad41990338860221d0d59567fcb0ac058b7b72d962708a84cbace1ad",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -191,7 +191,7 @@
                     }
                 },
                 {
-                    "hash" : "c0df71b65b1cca2a28025c9c81d3b3775f44d7378e192e51a9b15c3467a54d9a",
+                    "hash" : "0xc0df71b65b1cca2a28025c9c81d3b3775f44d7378e192e51a9b15c3467a54d9a",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -199,7 +199,7 @@
                     }
                 },
                 {
-                    "hash" : "c0df71b65b1cca2a28025c9c81d3b3775f44d7378e192e51a9b15c3467a54d9a",
+                    "hash" : "0xc0df71b65b1cca2a28025c9c81d3b3775f44d7378e192e51a9b15c3467a54d9a",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -209,7 +209,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "fd4576f6f46ff6a211a0e825d80794c010e9c7d988094a078e2be1254a508c27",
+                    "hash" : "0xfd4576f6f46ff6a211a0e825d80794c010e9c7d988094a078e2be1254a508c27",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -217,7 +217,7 @@
                     }
                 },
                 {
-                    "hash" : "fd4576f6f46ff6a211a0e825d80794c010e9c7d988094a078e2be1254a508c27",
+                    "hash" : "0xfd4576f6f46ff6a211a0e825d80794c010e9c7d988094a078e2be1254a508c27",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -225,7 +225,7 @@
                     }
                 },
                 {
-                    "hash" : "025d5b1b6062a8af12a219329e31cd30b93a1abd5b48a8007cdc2c159309e47f",
+                    "hash" : "0x025d5b1b6062a8af12a219329e31cd30b93a1abd5b48a8007cdc2c159309e47f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -233,7 +233,7 @@
                     }
                 },
                 {
-                    "hash" : "7723422b5f67efa12691b3a9c810910281c38165826aae46b2452a843a31e077",
+                    "hash" : "0x7723422b5f67efa12691b3a9c810910281c38165826aae46b2452a843a31e077",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -241,7 +241,7 @@
                     }
                 },
                 {
-                    "hash" : "222799d2ad41990338860221d0d59567fcb0ac058b7b72d962708a84cbace1ad",
+                    "hash" : "0x222799d2ad41990338860221d0d59567fcb0ac058b7b72d962708a84cbace1ad",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -249,7 +249,7 @@
                     }
                 },
                 {
-                    "hash" : "222799d2ad41990338860221d0d59567fcb0ac058b7b72d962708a84cbace1ad",
+                    "hash" : "0x222799d2ad41990338860221d0d59567fcb0ac058b7b72d962708a84cbace1ad",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -257,7 +257,7 @@
                     }
                 },
                 {
-                    "hash" : "c0df71b65b1cca2a28025c9c81d3b3775f44d7378e192e51a9b15c3467a54d9a",
+                    "hash" : "0xc0df71b65b1cca2a28025c9c81d3b3775f44d7378e192e51a9b15c3467a54d9a",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -265,7 +265,7 @@
                     }
                 },
                 {
-                    "hash" : "c0df71b65b1cca2a28025c9c81d3b3775f44d7378e192e51a9b15c3467a54d9a",
+                    "hash" : "0xc0df71b65b1cca2a28025c9c81d3b3775f44d7378e192e51a9b15c3467a54d9a",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -275,7 +275,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "fd4576f6f46ff6a211a0e825d80794c010e9c7d988094a078e2be1254a508c27",
+                    "hash" : "0xfd4576f6f46ff6a211a0e825d80794c010e9c7d988094a078e2be1254a508c27",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -283,7 +283,7 @@
                     }
                 },
                 {
-                    "hash" : "fd4576f6f46ff6a211a0e825d80794c010e9c7d988094a078e2be1254a508c27",
+                    "hash" : "0xfd4576f6f46ff6a211a0e825d80794c010e9c7d988094a078e2be1254a508c27",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -291,7 +291,7 @@
                     }
                 },
                 {
-                    "hash" : "1967b2c7634d032982aae84a2822736d79b4c6c080bbc2295d62578cd08127a3",
+                    "hash" : "0x1967b2c7634d032982aae84a2822736d79b4c6c080bbc2295d62578cd08127a3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -299,7 +299,7 @@
                     }
                 },
                 {
-                    "hash" : "ef75c5e063ddaa516cf1bfa6de671ad9511e6a881ada2770d2da291c15452b2b",
+                    "hash" : "0xef75c5e063ddaa516cf1bfa6de671ad9511e6a881ada2770d2da291c15452b2b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -307,7 +307,7 @@
                     }
                 },
                 {
-                    "hash" : "fd4576f6f46ff6a211a0e825d80794c010e9c7d988094a078e2be1254a508c27",
+                    "hash" : "0xfd4576f6f46ff6a211a0e825d80794c010e9c7d988094a078e2be1254a508c27",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -315,7 +315,7 @@
                     }
                 },
                 {
-                    "hash" : "fd4576f6f46ff6a211a0e825d80794c010e9c7d988094a078e2be1254a508c27",
+                    "hash" : "0xfd4576f6f46ff6a211a0e825d80794c010e9c7d988094a078e2be1254a508c27",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -323,7 +323,7 @@
                     }
                 },
                 {
-                    "hash" : "da322bcf094f1785bd69806d493d816c9919274912b75c3636cbb2e9176dea33",
+                    "hash" : "0xda322bcf094f1785bd69806d493d816c9919274912b75c3636cbb2e9176dea33",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -331,7 +331,7 @@
                     }
                 },
                 {
-                    "hash" : "19013819c754a9013bb5884a8ecbf1a920cc54a0f84cd34a117f7a947cc4e724",
+                    "hash" : "0x19013819c754a9013bb5884a8ecbf1a920cc54a0f84cd34a117f7a947cc4e724",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -341,21 +341,21 @@
             ]
         },
         "pre" : {
-            "3e180b1862f9d158abb5e519a6d8605540c23682" : {
+            "0x3e180b1862f9d158abb5e519a6d8605540c23682" : {
                 "balance" : "0x05",
                 "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
                 "nonce" : "0x36",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b000000000000000000000000000000000000000" : {
+            "0xb000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x6008600255600060006000f050600c600355",
                 "nonce" : "0x00",
@@ -369,16 +369,16 @@
                 "000000000000000000000000000000000000000000000000000000000001ea60"
             ],
             "gasLimit" : [
-                "110000",
-                "160000"
+                "0x01adb0",
+                "0x027100"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "3e180b1862f9d158abb5e519a6d8605540c23682",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x3e180b1862f9d158abb5e519a6d8605540c23682",
             "value" : [
-                "1",
-                "0"
+                "0x01",
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stRevertTest/RevertDepthCreateOOG.json b/GeneralStateTests/stRevertTest/RevertDepthCreateOOG.json
index 6b0d4bccb..afc06cff9 100644
--- a/GeneralStateTests/stRevertTest/RevertDepthCreateOOG.json
+++ b/GeneralStateTests/stRevertTest/RevertDepthCreateOOG.json
@@ -1,17 +1,17 @@
 {
     "RevertDepthCreateOOG" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
+                    "hash" : "0xe4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "e4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
+                    "hash" : "0xe4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -27,7 +27,7 @@
                     }
                 },
                 {
-                    "hash" : "2792964862a467219a4d5e497f798176b09d8177f290c39eca662befff5f3a60",
+                    "hash" : "0x2792964862a467219a4d5e497f798176b09d8177f290c39eca662befff5f3a60",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -35,7 +35,7 @@
                     }
                 },
                 {
-                    "hash" : "42ca5d93f92acb6a80eb20a11fa0528865c1ac9a9bf67c39a6191d060ca7ce4f",
+                    "hash" : "0x42ca5d93f92acb6a80eb20a11fa0528865c1ac9a9bf67c39a6191d060ca7ce4f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -43,7 +43,7 @@
                     }
                 },
                 {
-                    "hash" : "e4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
+                    "hash" : "0xe4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -51,7 +51,7 @@
                     }
                 },
                 {
-                    "hash" : "e4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
+                    "hash" : "0xe4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -59,7 +59,7 @@
                     }
                 },
                 {
-                    "hash" : "1e0fae46b35d00d90eb311a335fffbfb18b5bb6fb97d2e8fd81b20179745ce4e",
+                    "hash" : "0x1e0fae46b35d00d90eb311a335fffbfb18b5bb6fb97d2e8fd81b20179745ce4e",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -67,7 +67,7 @@
                     }
                 },
                 {
-                    "hash" : "24a0106e5d29661bd6c5adcac678ffe1715cbc1ef0a5b5db39a084695cc737be",
+                    "hash" : "0x24a0106e5d29661bd6c5adcac678ffe1715cbc1ef0a5b5db39a084695cc737be",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -77,7 +77,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
+                    "hash" : "0xe4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -85,7 +85,7 @@
                     }
                 },
                 {
-                    "hash" : "e4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
+                    "hash" : "0xe4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -93,7 +93,7 @@
                     }
                 },
                 {
-                    "hash" : "2792964862a467219a4d5e497f798176b09d8177f290c39eca662befff5f3a60",
+                    "hash" : "0x2792964862a467219a4d5e497f798176b09d8177f290c39eca662befff5f3a60",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -101,7 +101,7 @@
                     }
                 },
                 {
-                    "hash" : "42ca5d93f92acb6a80eb20a11fa0528865c1ac9a9bf67c39a6191d060ca7ce4f",
+                    "hash" : "0x42ca5d93f92acb6a80eb20a11fa0528865c1ac9a9bf67c39a6191d060ca7ce4f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -109,7 +109,7 @@
                     }
                 },
                 {
-                    "hash" : "e4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
+                    "hash" : "0xe4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -117,7 +117,7 @@
                     }
                 },
                 {
-                    "hash" : "e4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
+                    "hash" : "0xe4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -125,7 +125,7 @@
                     }
                 },
                 {
-                    "hash" : "327f51edf987241a0a59405a62804d1a574cc7f285a875e3fbd7cd01863b1e4b",
+                    "hash" : "0x327f51edf987241a0a59405a62804d1a574cc7f285a875e3fbd7cd01863b1e4b",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -133,7 +133,7 @@
                     }
                 },
                 {
-                    "hash" : "1a18a2344a9244b257d4d16e2e9abb6dcb53d17d5a4c5fbb240f1c6011f14b50",
+                    "hash" : "0x1a18a2344a9244b257d4d16e2e9abb6dcb53d17d5a4c5fbb240f1c6011f14b50",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -143,7 +143,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
+                    "hash" : "0xe4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -151,7 +151,7 @@
                     }
                 },
                 {
-                    "hash" : "e4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
+                    "hash" : "0xe4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -159,7 +159,7 @@
                     }
                 },
                 {
-                    "hash" : "d8e4aee5a220887aa9a11f33979816e6dfd43d8566f2ae977b49afa17042ac17",
+                    "hash" : "0xd8e4aee5a220887aa9a11f33979816e6dfd43d8566f2ae977b49afa17042ac17",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -167,7 +167,7 @@
                     }
                 },
                 {
-                    "hash" : "46c459fa446969520040529dc429163a5c4304c9c0b774fd1e178dbf1d27eb86",
+                    "hash" : "0x46c459fa446969520040529dc429163a5c4304c9c0b774fd1e178dbf1d27eb86",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -175,7 +175,7 @@
                     }
                 },
                 {
-                    "hash" : "e4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
+                    "hash" : "0xe4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -183,7 +183,7 @@
                     }
                 },
                 {
-                    "hash" : "e4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
+                    "hash" : "0xe4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -191,7 +191,7 @@
                     }
                 },
                 {
-                    "hash" : "5e0dd98b60aa899f5c210103e4fdd587b00b461c36dedb372646b0fd0d2e023f",
+                    "hash" : "0x5e0dd98b60aa899f5c210103e4fdd587b00b461c36dedb372646b0fd0d2e023f",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -199,7 +199,7 @@
                     }
                 },
                 {
-                    "hash" : "5e0dd98b60aa899f5c210103e4fdd587b00b461c36dedb372646b0fd0d2e023f",
+                    "hash" : "0x5e0dd98b60aa899f5c210103e4fdd587b00b461c36dedb372646b0fd0d2e023f",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -209,7 +209,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
+                    "hash" : "0xe4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -217,7 +217,7 @@
                     }
                 },
                 {
-                    "hash" : "e4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
+                    "hash" : "0xe4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -225,7 +225,7 @@
                     }
                 },
                 {
-                    "hash" : "d8e4aee5a220887aa9a11f33979816e6dfd43d8566f2ae977b49afa17042ac17",
+                    "hash" : "0xd8e4aee5a220887aa9a11f33979816e6dfd43d8566f2ae977b49afa17042ac17",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -233,7 +233,7 @@
                     }
                 },
                 {
-                    "hash" : "46c459fa446969520040529dc429163a5c4304c9c0b774fd1e178dbf1d27eb86",
+                    "hash" : "0x46c459fa446969520040529dc429163a5c4304c9c0b774fd1e178dbf1d27eb86",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -241,7 +241,7 @@
                     }
                 },
                 {
-                    "hash" : "e4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
+                    "hash" : "0xe4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -249,7 +249,7 @@
                     }
                 },
                 {
-                    "hash" : "e4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
+                    "hash" : "0xe4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -257,7 +257,7 @@
                     }
                 },
                 {
-                    "hash" : "5e0dd98b60aa899f5c210103e4fdd587b00b461c36dedb372646b0fd0d2e023f",
+                    "hash" : "0x5e0dd98b60aa899f5c210103e4fdd587b00b461c36dedb372646b0fd0d2e023f",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -265,7 +265,7 @@
                     }
                 },
                 {
-                    "hash" : "5e0dd98b60aa899f5c210103e4fdd587b00b461c36dedb372646b0fd0d2e023f",
+                    "hash" : "0x5e0dd98b60aa899f5c210103e4fdd587b00b461c36dedb372646b0fd0d2e023f",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -275,7 +275,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
+                    "hash" : "0xe4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -283,7 +283,7 @@
                     }
                 },
                 {
-                    "hash" : "e4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
+                    "hash" : "0xe4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -291,7 +291,7 @@
                     }
                 },
                 {
-                    "hash" : "2792964862a467219a4d5e497f798176b09d8177f290c39eca662befff5f3a60",
+                    "hash" : "0x2792964862a467219a4d5e497f798176b09d8177f290c39eca662befff5f3a60",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -299,7 +299,7 @@
                     }
                 },
                 {
-                    "hash" : "42ca5d93f92acb6a80eb20a11fa0528865c1ac9a9bf67c39a6191d060ca7ce4f",
+                    "hash" : "0x42ca5d93f92acb6a80eb20a11fa0528865c1ac9a9bf67c39a6191d060ca7ce4f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -307,7 +307,7 @@
                     }
                 },
                 {
-                    "hash" : "e4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
+                    "hash" : "0xe4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -315,7 +315,7 @@
                     }
                 },
                 {
-                    "hash" : "e4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
+                    "hash" : "0xe4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -323,7 +323,7 @@
                     }
                 },
                 {
-                    "hash" : "327f51edf987241a0a59405a62804d1a574cc7f285a875e3fbd7cd01863b1e4b",
+                    "hash" : "0x327f51edf987241a0a59405a62804d1a574cc7f285a875e3fbd7cd01863b1e4b",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -331,7 +331,7 @@
                     }
                 },
                 {
-                    "hash" : "1a18a2344a9244b257d4d16e2e9abb6dcb53d17d5a4c5fbb240f1c6011f14b50",
+                    "hash" : "0x1a18a2344a9244b257d4d16e2e9abb6dcb53d17d5a4c5fbb240f1c6011f14b50",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -341,21 +341,21 @@
             ]
         },
         "pre" : {
-            "a000000000000000000000000000000000000000" : {
+            "0xa000000000000000000000000000000000000000" : {
                 "balance" : "0x05",
                 "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
                 "nonce" : "0x36",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b000000000000000000000000000000000000000" : {
+            "0xb000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x6008600255600060006000f050600c600355",
                 "nonce" : "0x00",
@@ -369,16 +369,16 @@
                 "000000000000000000000000000000000000000000000000000000000001ea60"
             ],
             "gasLimit" : [
-                "110000",
-                "160000"
+                "0x01adb0",
+                "0x027100"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "a000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xa000000000000000000000000000000000000000",
             "value" : [
-                "1",
-                "0"
+                "0x01",
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stRevertTest/RevertOpcode.json b/GeneralStateTests/stRevertTest/RevertOpcode.json
index 80977eb7a..360064a7b 100644
--- a/GeneralStateTests/stRevertTest/RevertOpcode.json
+++ b/GeneralStateTests/stRevertTest/RevertOpcode.json
@@ -1,17 +1,17 @@
 {
     "RevertOpcode" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "299e173f3b37ebb90f4390583926658bb2a000d031b2b1ed2a248e5a8a47f4d7",
+                    "hash" : "0x299e173f3b37ebb90f4390583926658bb2a000d031b2b1ed2a248e5a8a47f4d7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "299e173f3b37ebb90f4390583926658bb2a000d031b2b1ed2a248e5a8a47f4d7",
+                    "hash" : "0x299e173f3b37ebb90f4390583926658bb2a000d031b2b1ed2a248e5a8a47f4d7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -27,7 +27,7 @@
                     }
                 },
                 {
-                    "hash" : "f0b23a60fca645c6d2726c2a6ff621b379b77902e5a99ebc71035b13a1da70fb",
+                    "hash" : "0xf0b23a60fca645c6d2726c2a6ff621b379b77902e5a99ebc71035b13a1da70fb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -35,7 +35,7 @@
                     }
                 },
                 {
-                    "hash" : "f0b23a60fca645c6d2726c2a6ff621b379b77902e5a99ebc71035b13a1da70fb",
+                    "hash" : "0xf0b23a60fca645c6d2726c2a6ff621b379b77902e5a99ebc71035b13a1da70fb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -45,7 +45,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "299e173f3b37ebb90f4390583926658bb2a000d031b2b1ed2a248e5a8a47f4d7",
+                    "hash" : "0x299e173f3b37ebb90f4390583926658bb2a000d031b2b1ed2a248e5a8a47f4d7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -53,7 +53,7 @@
                     }
                 },
                 {
-                    "hash" : "299e173f3b37ebb90f4390583926658bb2a000d031b2b1ed2a248e5a8a47f4d7",
+                    "hash" : "0x299e173f3b37ebb90f4390583926658bb2a000d031b2b1ed2a248e5a8a47f4d7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,7 +61,7 @@
                     }
                 },
                 {
-                    "hash" : "f0b23a60fca645c6d2726c2a6ff621b379b77902e5a99ebc71035b13a1da70fb",
+                    "hash" : "0xf0b23a60fca645c6d2726c2a6ff621b379b77902e5a99ebc71035b13a1da70fb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -69,7 +69,7 @@
                     }
                 },
                 {
-                    "hash" : "f0b23a60fca645c6d2726c2a6ff621b379b77902e5a99ebc71035b13a1da70fb",
+                    "hash" : "0xf0b23a60fca645c6d2726c2a6ff621b379b77902e5a99ebc71035b13a1da70fb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -79,7 +79,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "299e173f3b37ebb90f4390583926658bb2a000d031b2b1ed2a248e5a8a47f4d7",
+                    "hash" : "0x299e173f3b37ebb90f4390583926658bb2a000d031b2b1ed2a248e5a8a47f4d7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -87,7 +87,7 @@
                     }
                 },
                 {
-                    "hash" : "299e173f3b37ebb90f4390583926658bb2a000d031b2b1ed2a248e5a8a47f4d7",
+                    "hash" : "0x299e173f3b37ebb90f4390583926658bb2a000d031b2b1ed2a248e5a8a47f4d7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -95,7 +95,7 @@
                     }
                 },
                 {
-                    "hash" : "f0b23a60fca645c6d2726c2a6ff621b379b77902e5a99ebc71035b13a1da70fb",
+                    "hash" : "0xf0b23a60fca645c6d2726c2a6ff621b379b77902e5a99ebc71035b13a1da70fb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -103,7 +103,7 @@
                     }
                 },
                 {
-                    "hash" : "f0b23a60fca645c6d2726c2a6ff621b379b77902e5a99ebc71035b13a1da70fb",
+                    "hash" : "0xf0b23a60fca645c6d2726c2a6ff621b379b77902e5a99ebc71035b13a1da70fb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -113,7 +113,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "299e173f3b37ebb90f4390583926658bb2a000d031b2b1ed2a248e5a8a47f4d7",
+                    "hash" : "0x299e173f3b37ebb90f4390583926658bb2a000d031b2b1ed2a248e5a8a47f4d7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -121,7 +121,7 @@
                     }
                 },
                 {
-                    "hash" : "299e173f3b37ebb90f4390583926658bb2a000d031b2b1ed2a248e5a8a47f4d7",
+                    "hash" : "0x299e173f3b37ebb90f4390583926658bb2a000d031b2b1ed2a248e5a8a47f4d7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -129,7 +129,7 @@
                     }
                 },
                 {
-                    "hash" : "f0b23a60fca645c6d2726c2a6ff621b379b77902e5a99ebc71035b13a1da70fb",
+                    "hash" : "0xf0b23a60fca645c6d2726c2a6ff621b379b77902e5a99ebc71035b13a1da70fb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -137,7 +137,7 @@
                     }
                 },
                 {
-                    "hash" : "f0b23a60fca645c6d2726c2a6ff621b379b77902e5a99ebc71035b13a1da70fb",
+                    "hash" : "0xf0b23a60fca645c6d2726c2a6ff621b379b77902e5a99ebc71035b13a1da70fb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -147,7 +147,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "94cc837a7eecd810063cc425e84e9467e74134c9a516d4df91f71f201fe77676",
+                    "hash" : "0x94cc837a7eecd810063cc425e84e9467e74134c9a516d4df91f71f201fe77676",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -155,7 +155,7 @@
                     }
                 },
                 {
-                    "hash" : "94cc837a7eecd810063cc425e84e9467e74134c9a516d4df91f71f201fe77676",
+                    "hash" : "0x94cc837a7eecd810063cc425e84e9467e74134c9a516d4df91f71f201fe77676",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -163,7 +163,7 @@
                     }
                 },
                 {
-                    "hash" : "f0b23a60fca645c6d2726c2a6ff621b379b77902e5a99ebc71035b13a1da70fb",
+                    "hash" : "0xf0b23a60fca645c6d2726c2a6ff621b379b77902e5a99ebc71035b13a1da70fb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -171,7 +171,7 @@
                     }
                 },
                 {
-                    "hash" : "f0b23a60fca645c6d2726c2a6ff621b379b77902e5a99ebc71035b13a1da70fb",
+                    "hash" : "0xf0b23a60fca645c6d2726c2a6ff621b379b77902e5a99ebc71035b13a1da70fb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -181,16 +181,16 @@
             ]
         },
         "pre" : {
-            "a000000000000000000000000000000000000000" : {
+            "0xa000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x600160005560016000fd6011600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -201,16 +201,16 @@
                 ""
             ],
             "gasLimit" : [
-                "800000",
-                "30000"
+                "0x0c3500",
+                "0x7530"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "a000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xa000000000000000000000000000000000000000",
             "value" : [
-                "0",
-                "10"
+                "0x00",
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stRevertTest/RevertOpcodeCalls.json b/GeneralStateTests/stRevertTest/RevertOpcodeCalls.json
index a94b06c91..9c936dfee 100644
--- a/GeneralStateTests/stRevertTest/RevertOpcodeCalls.json
+++ b/GeneralStateTests/stRevertTest/RevertOpcodeCalls.json
@@ -1,17 +1,17 @@
 {
     "RevertOpcodeCalls" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "710afb013436152320710b84da2b4546bf0aef1d68f634c478d4981d4105f255",
+                    "hash" : "0x710afb013436152320710b84da2b4546bf0aef1d68f634c478d4981d4105f255",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "ce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
+                    "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -27,7 +27,7 @@
                     }
                 },
                 {
-                    "hash" : "c879f36afaeace32cc8b9462dad38f688ec506a89884b21b6e60d8249b3ab136",
+                    "hash" : "0xc879f36afaeace32cc8b9462dad38f688ec506a89884b21b6e60d8249b3ab136",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -35,7 +35,7 @@
                     }
                 },
                 {
-                    "hash" : "ce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
+                    "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -43,7 +43,7 @@
                     }
                 },
                 {
-                    "hash" : "7b5aea4a6d7e6ac3b1a96651dc76c4171af4cb599bb4e8c242e18c83dd7533c8",
+                    "hash" : "0x7b5aea4a6d7e6ac3b1a96651dc76c4171af4cb599bb4e8c242e18c83dd7533c8",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -51,7 +51,7 @@
                     }
                 },
                 {
-                    "hash" : "ce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
+                    "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 1,
@@ -59,7 +59,7 @@
                     }
                 },
                 {
-                    "hash" : "d5a14b2554f5d08626ce5cdfac36217426d292b62ff994e25fe89cf8d3c93743",
+                    "hash" : "0xd5a14b2554f5d08626ce5cdfac36217426d292b62ff994e25fe89cf8d3c93743",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -67,7 +67,7 @@
                     }
                 },
                 {
-                    "hash" : "ce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
+                    "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 1,
@@ -77,7 +77,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "710afb013436152320710b84da2b4546bf0aef1d68f634c478d4981d4105f255",
+                    "hash" : "0x710afb013436152320710b84da2b4546bf0aef1d68f634c478d4981d4105f255",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -85,7 +85,7 @@
                     }
                 },
                 {
-                    "hash" : "ce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
+                    "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -93,7 +93,7 @@
                     }
                 },
                 {
-                    "hash" : "c879f36afaeace32cc8b9462dad38f688ec506a89884b21b6e60d8249b3ab136",
+                    "hash" : "0xc879f36afaeace32cc8b9462dad38f688ec506a89884b21b6e60d8249b3ab136",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -101,7 +101,7 @@
                     }
                 },
                 {
-                    "hash" : "ce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
+                    "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -109,7 +109,7 @@
                     }
                 },
                 {
-                    "hash" : "7b5aea4a6d7e6ac3b1a96651dc76c4171af4cb599bb4e8c242e18c83dd7533c8",
+                    "hash" : "0x7b5aea4a6d7e6ac3b1a96651dc76c4171af4cb599bb4e8c242e18c83dd7533c8",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -117,7 +117,7 @@
                     }
                 },
                 {
-                    "hash" : "ce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
+                    "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 1,
@@ -125,7 +125,7 @@
                     }
                 },
                 {
-                    "hash" : "d5a14b2554f5d08626ce5cdfac36217426d292b62ff994e25fe89cf8d3c93743",
+                    "hash" : "0xd5a14b2554f5d08626ce5cdfac36217426d292b62ff994e25fe89cf8d3c93743",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -133,7 +133,7 @@
                     }
                 },
                 {
-                    "hash" : "ce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
+                    "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 1,
@@ -143,7 +143,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "917fea5fed77119230c4120bc4df0d7f1e038160c5c733cd1e779038b67e122a",
+                    "hash" : "0x917fea5fed77119230c4120bc4df0d7f1e038160c5c733cd1e779038b67e122a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -151,7 +151,7 @@
                     }
                 },
                 {
-                    "hash" : "ce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
+                    "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -159,7 +159,7 @@
                     }
                 },
                 {
-                    "hash" : "b30ce1d2c038b2632e9bf010a78c665339513f1d2e762c6b9bb12a7494831ac2",
+                    "hash" : "0xb30ce1d2c038b2632e9bf010a78c665339513f1d2e762c6b9bb12a7494831ac2",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -167,7 +167,7 @@
                     }
                 },
                 {
-                    "hash" : "ce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
+                    "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -175,7 +175,7 @@
                     }
                 },
                 {
-                    "hash" : "9eaa832bba7dc43eb5e2b097c9a33430d6957285873991c69847ced845ba4f26",
+                    "hash" : "0x9eaa832bba7dc43eb5e2b097c9a33430d6957285873991c69847ced845ba4f26",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -183,7 +183,7 @@
                     }
                 },
                 {
-                    "hash" : "ce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
+                    "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 1,
@@ -191,7 +191,7 @@
                     }
                 },
                 {
-                    "hash" : "249083970cef69bb1a73955e5f3faff87414f280b3010de5409c70aa2f35d8dc",
+                    "hash" : "0x249083970cef69bb1a73955e5f3faff87414f280b3010de5409c70aa2f35d8dc",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -199,7 +199,7 @@
                     }
                 },
                 {
-                    "hash" : "ce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
+                    "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 1,
@@ -209,7 +209,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "917fea5fed77119230c4120bc4df0d7f1e038160c5c733cd1e779038b67e122a",
+                    "hash" : "0x917fea5fed77119230c4120bc4df0d7f1e038160c5c733cd1e779038b67e122a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -217,7 +217,7 @@
                     }
                 },
                 {
-                    "hash" : "ce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
+                    "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -225,7 +225,7 @@
                     }
                 },
                 {
-                    "hash" : "b30ce1d2c038b2632e9bf010a78c665339513f1d2e762c6b9bb12a7494831ac2",
+                    "hash" : "0xb30ce1d2c038b2632e9bf010a78c665339513f1d2e762c6b9bb12a7494831ac2",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -233,7 +233,7 @@
                     }
                 },
                 {
-                    "hash" : "ce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
+                    "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -241,7 +241,7 @@
                     }
                 },
                 {
-                    "hash" : "9a43f317297c23f76ed28075273dd8667a5fd0f0bb5d45dca4c86c311706d26a",
+                    "hash" : "0x9a43f317297c23f76ed28075273dd8667a5fd0f0bb5d45dca4c86c311706d26a",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -249,7 +249,7 @@
                     }
                 },
                 {
-                    "hash" : "ce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
+                    "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 1,
@@ -257,7 +257,7 @@
                     }
                 },
                 {
-                    "hash" : "249083970cef69bb1a73955e5f3faff87414f280b3010de5409c70aa2f35d8dc",
+                    "hash" : "0x249083970cef69bb1a73955e5f3faff87414f280b3010de5409c70aa2f35d8dc",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -265,7 +265,7 @@
                     }
                 },
                 {
-                    "hash" : "ce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
+                    "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 1,
@@ -275,7 +275,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "407fb3b03966b0d591a120f7b35135ddf221aadedee169c7d9d1a946e0354252",
+                    "hash" : "0x407fb3b03966b0d591a120f7b35135ddf221aadedee169c7d9d1a946e0354252",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -283,7 +283,7 @@
                     }
                 },
                 {
-                    "hash" : "ce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
+                    "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -291,7 +291,7 @@
                     }
                 },
                 {
-                    "hash" : "145fbde74591c64f02a4a791ccc1b96d60f031559605f8206bf0fe3c07de982d",
+                    "hash" : "0x145fbde74591c64f02a4a791ccc1b96d60f031559605f8206bf0fe3c07de982d",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -299,7 +299,7 @@
                     }
                 },
                 {
-                    "hash" : "ce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
+                    "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -307,7 +307,7 @@
                     }
                 },
                 {
-                    "hash" : "fcf18c617e61b5a16e9b550620ce5926908bf0ee8d9e049f62ce9c924b88ae2c",
+                    "hash" : "0xfcf18c617e61b5a16e9b550620ce5926908bf0ee8d9e049f62ce9c924b88ae2c",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -315,7 +315,7 @@
                     }
                 },
                 {
-                    "hash" : "ce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
+                    "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 1,
@@ -323,7 +323,7 @@
                     }
                 },
                 {
-                    "hash" : "bd8e9a2719f36730a9c3dcbcb952d55fca79fab9cd57231196647975467c471f",
+                    "hash" : "0xbd8e9a2719f36730a9c3dcbcb952d55fca79fab9cd57231196647975467c471f",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -331,7 +331,7 @@
                     }
                 },
                 {
-                    "hash" : "ce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
+                    "hash" : "0xce5a5ad6a9fdb0eb1aed2c0f8b14764f6b033c83920bde8675442e13c3ee3e08",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 1,
@@ -341,56 +341,56 @@
             ]
         },
         "pre" : {
-            "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x600060006000600060006000356203f7a0f1600a55",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b0005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb0005374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f1600055600e600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b1005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb1005374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f2600055600e600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b2005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb2005374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f4600055600e600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b3005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb3005374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x6000600060006000600073b3305374fce5edbc8e2a8697c15331677e6ebf0b620186a0f1600055600e600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b3305374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb3305374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f1600455600e600555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x600c60015560016000fd",
                 "nonce" : "0x00",
@@ -406,15 +406,15 @@
                 "0x000000000000000000000000b3005374fce5edbc8e2a8697c15331677e6ebf0b"
             ],
             "gasLimit" : [
-                "460000",
-                "88000"
+                "0x0704e0",
+                "0x0157c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "094f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stRevertTest/RevertOpcodeCreate.json b/GeneralStateTests/stRevertTest/RevertOpcodeCreate.json
index 36da93572..cd9b8a854 100644
--- a/GeneralStateTests/stRevertTest/RevertOpcodeCreate.json
+++ b/GeneralStateTests/stRevertTest/RevertOpcodeCreate.json
@@ -1,17 +1,17 @@
 {
     "RevertOpcodeCreate" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "2123e2e637ea369203c1e524079cda098388fb6cd7a5d51436c9aeb522efa47e",
+                    "hash" : "0x2123e2e637ea369203c1e524079cda098388fb6cd7a5d51436c9aeb522efa47e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "b72445d263cd1f0e84ee4087b5233aa0aa7c43fd1383b9d469fca46248d88431",
+                    "hash" : "0xb72445d263cd1f0e84ee4087b5233aa0aa7c43fd1383b9d469fca46248d88431",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -29,7 +29,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "2123e2e637ea369203c1e524079cda098388fb6cd7a5d51436c9aeb522efa47e",
+                    "hash" : "0x2123e2e637ea369203c1e524079cda098388fb6cd7a5d51436c9aeb522efa47e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -37,7 +37,7 @@
                     }
                 },
                 {
-                    "hash" : "b72445d263cd1f0e84ee4087b5233aa0aa7c43fd1383b9d469fca46248d88431",
+                    "hash" : "0xb72445d263cd1f0e84ee4087b5233aa0aa7c43fd1383b9d469fca46248d88431",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -47,7 +47,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2123e2e637ea369203c1e524079cda098388fb6cd7a5d51436c9aeb522efa47e",
+                    "hash" : "0x2123e2e637ea369203c1e524079cda098388fb6cd7a5d51436c9aeb522efa47e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -55,7 +55,7 @@
                     }
                 },
                 {
-                    "hash" : "b72445d263cd1f0e84ee4087b5233aa0aa7c43fd1383b9d469fca46248d88431",
+                    "hash" : "0xb72445d263cd1f0e84ee4087b5233aa0aa7c43fd1383b9d469fca46248d88431",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -65,7 +65,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "2123e2e637ea369203c1e524079cda098388fb6cd7a5d51436c9aeb522efa47e",
+                    "hash" : "0x2123e2e637ea369203c1e524079cda098388fb6cd7a5d51436c9aeb522efa47e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -73,7 +73,7 @@
                     }
                 },
                 {
-                    "hash" : "b72445d263cd1f0e84ee4087b5233aa0aa7c43fd1383b9d469fca46248d88431",
+                    "hash" : "0xb72445d263cd1f0e84ee4087b5233aa0aa7c43fd1383b9d469fca46248d88431",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -83,7 +83,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "eeac7cc67af32c9fc40749602cda167c54269830d2cb71fd3586e1ed4f458baa",
+                    "hash" : "0xeeac7cc67af32c9fc40749602cda167c54269830d2cb71fd3586e1ed4f458baa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -91,7 +91,7 @@
                     }
                 },
                 {
-                    "hash" : "b72445d263cd1f0e84ee4087b5233aa0aa7c43fd1383b9d469fca46248d88431",
+                    "hash" : "0xb72445d263cd1f0e84ee4087b5233aa0aa7c43fd1383b9d469fca46248d88431",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -101,14 +101,14 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x6e600160005560016000fd6011600155600052600f60116001f0600155600c600055",
                 "nonce" : "0x00",
@@ -121,15 +121,15 @@
                 "0x600160005560016000fe6011600155"
             ],
             "gasLimit" : [
-                "460000",
-                "70000"
+                "0x0704e0",
+                "0x011170"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stRevertTest/RevertOpcodeDirectCall.json b/GeneralStateTests/stRevertTest/RevertOpcodeDirectCall.json
index 70584e6cc..137ec342b 100644
--- a/GeneralStateTests/stRevertTest/RevertOpcodeDirectCall.json
+++ b/GeneralStateTests/stRevertTest/RevertOpcodeDirectCall.json
@@ -1,17 +1,17 @@
 {
     "RevertOpcodeDirectCall" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "4b5855c46e03a2b0f21f4e6e80b6a24551be97416f9eb725e191edb78fecc8b8",
+                    "hash" : "0x4b5855c46e03a2b0f21f4e6e80b6a24551be97416f9eb725e191edb78fecc8b8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "a57311b15ec973189e296050f35d5bd8f244246ff3c69a88ec8f9358cb0d15d4",
+                    "hash" : "0xa57311b15ec973189e296050f35d5bd8f244246ff3c69a88ec8f9358cb0d15d4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -29,7 +29,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "4b5855c46e03a2b0f21f4e6e80b6a24551be97416f9eb725e191edb78fecc8b8",
+                    "hash" : "0x4b5855c46e03a2b0f21f4e6e80b6a24551be97416f9eb725e191edb78fecc8b8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -37,7 +37,7 @@
                     }
                 },
                 {
-                    "hash" : "a57311b15ec973189e296050f35d5bd8f244246ff3c69a88ec8f9358cb0d15d4",
+                    "hash" : "0xa57311b15ec973189e296050f35d5bd8f244246ff3c69a88ec8f9358cb0d15d4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -47,7 +47,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "0c45c39cc33809ab7c3f91ebbe39b933e3968b9dbb885b3e60c6b743e536061b",
+                    "hash" : "0x0c45c39cc33809ab7c3f91ebbe39b933e3968b9dbb885b3e60c6b743e536061b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -55,7 +55,7 @@
                     }
                 },
                 {
-                    "hash" : "a57311b15ec973189e296050f35d5bd8f244246ff3c69a88ec8f9358cb0d15d4",
+                    "hash" : "0xa57311b15ec973189e296050f35d5bd8f244246ff3c69a88ec8f9358cb0d15d4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -65,7 +65,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "0c45c39cc33809ab7c3f91ebbe39b933e3968b9dbb885b3e60c6b743e536061b",
+                    "hash" : "0x0c45c39cc33809ab7c3f91ebbe39b933e3968b9dbb885b3e60c6b743e536061b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -73,7 +73,7 @@
                     }
                 },
                 {
-                    "hash" : "a57311b15ec973189e296050f35d5bd8f244246ff3c69a88ec8f9358cb0d15d4",
+                    "hash" : "0xa57311b15ec973189e296050f35d5bd8f244246ff3c69a88ec8f9358cb0d15d4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -83,7 +83,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b1da2f7f7736fefd7d61d0938e43457d2f48fd610a26a35bf94f5247aa672887",
+                    "hash" : "0xb1da2f7f7736fefd7d61d0938e43457d2f48fd610a26a35bf94f5247aa672887",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -91,7 +91,7 @@
                     }
                 },
                 {
-                    "hash" : "a57311b15ec973189e296050f35d5bd8f244246ff3c69a88ec8f9358cb0d15d4",
+                    "hash" : "0xa57311b15ec973189e296050f35d5bd8f244246ff3c69a88ec8f9358cb0d15d4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -101,28 +101,28 @@
             ]
         },
         "pre" : {
-            "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x6000600060006000600060003561ea60f1600a55",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f1600055600e600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x600c60015560016000fd",
                 "nonce" : "0x00",
@@ -135,15 +135,15 @@
                 "0x000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b"
             ],
             "gasLimit" : [
-                "460000",
-                "68000"
+                "0x0704e0",
+                "0x0109a0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stRevertTest/RevertOpcodeInInit.json b/GeneralStateTests/stRevertTest/RevertOpcodeInInit.json
index 1dd874962..04e8bfef6 100644
--- a/GeneralStateTests/stRevertTest/RevertOpcodeInInit.json
+++ b/GeneralStateTests/stRevertTest/RevertOpcodeInInit.json
@@ -1,17 +1,17 @@
 {
     "RevertOpcodeInInit" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7969d9a42e6ee6022e00fd68b4e831dbbefb73c0bfece34b5eb59e4d037ece23",
+                    "hash" : "0x7969d9a42e6ee6022e00fd68b4e831dbbefb73c0bfece34b5eb59e4d037ece23",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "7969d9a42e6ee6022e00fd68b4e831dbbefb73c0bfece34b5eb59e4d037ece23",
+                    "hash" : "0x7969d9a42e6ee6022e00fd68b4e831dbbefb73c0bfece34b5eb59e4d037ece23",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -27,7 +27,7 @@
                     }
                 },
                 {
-                    "hash" : "17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
+                    "hash" : "0x17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -35,7 +35,7 @@
                     }
                 },
                 {
-                    "hash" : "17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
+                    "hash" : "0x17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -45,7 +45,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7969d9a42e6ee6022e00fd68b4e831dbbefb73c0bfece34b5eb59e4d037ece23",
+                    "hash" : "0x7969d9a42e6ee6022e00fd68b4e831dbbefb73c0bfece34b5eb59e4d037ece23",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -53,7 +53,7 @@
                     }
                 },
                 {
-                    "hash" : "7969d9a42e6ee6022e00fd68b4e831dbbefb73c0bfece34b5eb59e4d037ece23",
+                    "hash" : "0x7969d9a42e6ee6022e00fd68b4e831dbbefb73c0bfece34b5eb59e4d037ece23",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,7 +61,7 @@
                     }
                 },
                 {
-                    "hash" : "17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
+                    "hash" : "0x17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -69,7 +69,7 @@
                     }
                 },
                 {
-                    "hash" : "17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
+                    "hash" : "0x17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -79,7 +79,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "7969d9a42e6ee6022e00fd68b4e831dbbefb73c0bfece34b5eb59e4d037ece23",
+                    "hash" : "0x7969d9a42e6ee6022e00fd68b4e831dbbefb73c0bfece34b5eb59e4d037ece23",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -87,7 +87,7 @@
                     }
                 },
                 {
-                    "hash" : "7969d9a42e6ee6022e00fd68b4e831dbbefb73c0bfece34b5eb59e4d037ece23",
+                    "hash" : "0x7969d9a42e6ee6022e00fd68b4e831dbbefb73c0bfece34b5eb59e4d037ece23",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -95,7 +95,7 @@
                     }
                 },
                 {
-                    "hash" : "191cd75344d7c8fac8c7356ea544a74818271d12aabe0f5a830c92ba3c2383c2",
+                    "hash" : "0x191cd75344d7c8fac8c7356ea544a74818271d12aabe0f5a830c92ba3c2383c2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -103,7 +103,7 @@
                     }
                 },
                 {
-                    "hash" : "191cd75344d7c8fac8c7356ea544a74818271d12aabe0f5a830c92ba3c2383c2",
+                    "hash" : "0x191cd75344d7c8fac8c7356ea544a74818271d12aabe0f5a830c92ba3c2383c2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -113,7 +113,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "7969d9a42e6ee6022e00fd68b4e831dbbefb73c0bfece34b5eb59e4d037ece23",
+                    "hash" : "0x7969d9a42e6ee6022e00fd68b4e831dbbefb73c0bfece34b5eb59e4d037ece23",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -121,7 +121,7 @@
                     }
                 },
                 {
-                    "hash" : "7969d9a42e6ee6022e00fd68b4e831dbbefb73c0bfece34b5eb59e4d037ece23",
+                    "hash" : "0x7969d9a42e6ee6022e00fd68b4e831dbbefb73c0bfece34b5eb59e4d037ece23",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -129,7 +129,7 @@
                     }
                 },
                 {
-                    "hash" : "17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
+                    "hash" : "0x17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -137,7 +137,7 @@
                     }
                 },
                 {
-                    "hash" : "17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
+                    "hash" : "0x17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -147,7 +147,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "79be816b8d710425c26c8c1ee39110a77775145d625ba505cdaa08b02cc85aa9",
+                    "hash" : "0x79be816b8d710425c26c8c1ee39110a77775145d625ba505cdaa08b02cc85aa9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -155,7 +155,7 @@
                     }
                 },
                 {
-                    "hash" : "79be816b8d710425c26c8c1ee39110a77775145d625ba505cdaa08b02cc85aa9",
+                    "hash" : "0x79be816b8d710425c26c8c1ee39110a77775145d625ba505cdaa08b02cc85aa9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -163,7 +163,7 @@
                     }
                 },
                 {
-                    "hash" : "17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
+                    "hash" : "0x17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -171,7 +171,7 @@
                     }
                 },
                 {
-                    "hash" : "17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
+                    "hash" : "0x17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -181,9 +181,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -194,16 +194,16 @@
                 "0x600160005560016000fd6011600155"
             ],
             "gasLimit" : [
-                "160000",
-                "40000"
+                "0x027100",
+                "0x9c40"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "0",
-                "10"
+                "0x00",
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls.json b/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls.json
index 948739f49..9e519f182 100644
--- a/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls.json
+++ b/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls.json
@@ -1,17 +1,17 @@
 {
     "RevertOpcodeMultipleSubCalls" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d8f4e54b56f537699870c958f97ff83480035abfbd13d3511d418baa5cae7c09",
+                    "hash" : "0xd8f4e54b56f537699870c958f97ff83480035abfbd13d3511d418baa5cae7c09",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "b6cc57520d9770d30f2ae303a3011772a6a92d1746b1a4ef6f6894ddefb8b78b",
+                    "hash" : "0xb6cc57520d9770d30f2ae303a3011772a6a92d1746b1a4ef6f6894ddefb8b78b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -27,7 +27,7 @@
                     }
                 },
                 {
-                    "hash" : "548ca959f5bc870502e34a6a6588fcc84339f07226557a9b601e580ee434cf7e",
+                    "hash" : "0x548ca959f5bc870502e34a6a6588fcc84339f07226557a9b601e580ee434cf7e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -35,7 +35,7 @@
                     }
                 },
                 {
-                    "hash" : "404c9b96e72d670b118f253994533902cea8e8905cb6a341e12a91c8500b70f7",
+                    "hash" : "0x404c9b96e72d670b118f253994533902cea8e8905cb6a341e12a91c8500b70f7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -43,7 +43,7 @@
                     }
                 },
                 {
-                    "hash" : "01cb4b1894d236991dd8f624910ac7cd11708731342187df760267723c7609a8",
+                    "hash" : "0x01cb4b1894d236991dd8f624910ac7cd11708731342187df760267723c7609a8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -51,7 +51,7 @@
                     }
                 },
                 {
-                    "hash" : "194d498eda8247cc0f13bd37c69b1151c4ab3c1e65e8815b9ce1cbdd0c9ee4a1",
+                    "hash" : "0x194d498eda8247cc0f13bd37c69b1151c4ab3c1e65e8815b9ce1cbdd0c9ee4a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -59,7 +59,7 @@
                     }
                 },
                 {
-                    "hash" : "1e4c40e58408c4916b3c0acc7044049824c50b0bd97091cb33eca52222eea6a7",
+                    "hash" : "0x1e4c40e58408c4916b3c0acc7044049824c50b0bd97091cb33eca52222eea6a7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
@@ -67,7 +67,7 @@
                     }
                 },
                 {
-                    "hash" : "3c04067e96a83e2b0c65f81c8a210a2088b45c4cbaa5a15b59f3ca21f1d8ae07",
+                    "hash" : "0x3c04067e96a83e2b0c65f81c8a210a2088b45c4cbaa5a15b59f3ca21f1d8ae07",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
@@ -75,7 +75,7 @@
                     }
                 },
                 {
-                    "hash" : "5d50590051ccaf4888d6aaea2e67c3c221418e6d63ac08ccaeb83f8972cef939",
+                    "hash" : "0x5d50590051ccaf4888d6aaea2e67c3c221418e6d63ac08ccaeb83f8972cef939",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -83,7 +83,7 @@
                     }
                 },
                 {
-                    "hash" : "34b72637b56181f53edcff598845763a878c55eeb2366ba4d1e4f3e6244c9062",
+                    "hash" : "0x34b72637b56181f53edcff598845763a878c55eeb2366ba4d1e4f3e6244c9062",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -91,7 +91,7 @@
                     }
                 },
                 {
-                    "hash" : "548ca959f5bc870502e34a6a6588fcc84339f07226557a9b601e580ee434cf7e",
+                    "hash" : "0x548ca959f5bc870502e34a6a6588fcc84339f07226557a9b601e580ee434cf7e",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -99,7 +99,7 @@
                     }
                 },
                 {
-                    "hash" : "404c9b96e72d670b118f253994533902cea8e8905cb6a341e12a91c8500b70f7",
+                    "hash" : "0x404c9b96e72d670b118f253994533902cea8e8905cb6a341e12a91c8500b70f7",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -107,7 +107,7 @@
                     }
                 },
                 {
-                    "hash" : "01cb4b1894d236991dd8f624910ac7cd11708731342187df760267723c7609a8",
+                    "hash" : "0x01cb4b1894d236991dd8f624910ac7cd11708731342187df760267723c7609a8",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -115,7 +115,7 @@
                     }
                 },
                 {
-                    "hash" : "194d498eda8247cc0f13bd37c69b1151c4ab3c1e65e8815b9ce1cbdd0c9ee4a1",
+                    "hash" : "0x194d498eda8247cc0f13bd37c69b1151c4ab3c1e65e8815b9ce1cbdd0c9ee4a1",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -123,7 +123,7 @@
                     }
                 },
                 {
-                    "hash" : "1e4c40e58408c4916b3c0acc7044049824c50b0bd97091cb33eca52222eea6a7",
+                    "hash" : "0x1e4c40e58408c4916b3c0acc7044049824c50b0bd97091cb33eca52222eea6a7",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 3,
@@ -131,7 +131,7 @@
                     }
                 },
                 {
-                    "hash" : "3c04067e96a83e2b0c65f81c8a210a2088b45c4cbaa5a15b59f3ca21f1d8ae07",
+                    "hash" : "0x3c04067e96a83e2b0c65f81c8a210a2088b45c4cbaa5a15b59f3ca21f1d8ae07",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 3,
@@ -139,7 +139,7 @@
                     }
                 },
                 {
-                    "hash" : "c5a643f1bfb926531f64c8bacaed120944594d9d40bb9623bab4da7b3a223f12",
+                    "hash" : "0xc5a643f1bfb926531f64c8bacaed120944594d9d40bb9623bab4da7b3a223f12",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -147,7 +147,7 @@
                     }
                 },
                 {
-                    "hash" : "e5636003a6a46f677815d577aa34d0327e1ffb059035e6d7bd1c0cde96bbcc68",
+                    "hash" : "0xe5636003a6a46f677815d577aa34d0327e1ffb059035e6d7bd1c0cde96bbcc68",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -155,7 +155,7 @@
                     }
                 },
                 {
-                    "hash" : "548ca959f5bc870502e34a6a6588fcc84339f07226557a9b601e580ee434cf7e",
+                    "hash" : "0x548ca959f5bc870502e34a6a6588fcc84339f07226557a9b601e580ee434cf7e",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 1,
@@ -163,7 +163,7 @@
                     }
                 },
                 {
-                    "hash" : "404c9b96e72d670b118f253994533902cea8e8905cb6a341e12a91c8500b70f7",
+                    "hash" : "0x404c9b96e72d670b118f253994533902cea8e8905cb6a341e12a91c8500b70f7",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 1,
@@ -171,7 +171,7 @@
                     }
                 },
                 {
-                    "hash" : "01cb4b1894d236991dd8f624910ac7cd11708731342187df760267723c7609a8",
+                    "hash" : "0x01cb4b1894d236991dd8f624910ac7cd11708731342187df760267723c7609a8",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 2,
@@ -179,7 +179,7 @@
                     }
                 },
                 {
-                    "hash" : "194d498eda8247cc0f13bd37c69b1151c4ab3c1e65e8815b9ce1cbdd0c9ee4a1",
+                    "hash" : "0x194d498eda8247cc0f13bd37c69b1151c4ab3c1e65e8815b9ce1cbdd0c9ee4a1",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 2,
@@ -187,7 +187,7 @@
                     }
                 },
                 {
-                    "hash" : "1e4c40e58408c4916b3c0acc7044049824c50b0bd97091cb33eca52222eea6a7",
+                    "hash" : "0x1e4c40e58408c4916b3c0acc7044049824c50b0bd97091cb33eca52222eea6a7",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 3,
@@ -195,7 +195,7 @@
                     }
                 },
                 {
-                    "hash" : "3c04067e96a83e2b0c65f81c8a210a2088b45c4cbaa5a15b59f3ca21f1d8ae07",
+                    "hash" : "0x3c04067e96a83e2b0c65f81c8a210a2088b45c4cbaa5a15b59f3ca21f1d8ae07",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 3,
@@ -203,7 +203,7 @@
                     }
                 },
                 {
-                    "hash" : "1afdbdfbba02f176a74a058ce687039fc418c16426ee072cf820edaa1136a20a",
+                    "hash" : "0x1afdbdfbba02f176a74a058ce687039fc418c16426ee072cf820edaa1136a20a",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -211,7 +211,7 @@
                     }
                 },
                 {
-                    "hash" : "4ad3d92aa98e194cb4b7bf8f889adc498f316c5a026fc36e4150b2cfa026a83c",
+                    "hash" : "0x4ad3d92aa98e194cb4b7bf8f889adc498f316c5a026fc36e4150b2cfa026a83c",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -219,7 +219,7 @@
                     }
                 },
                 {
-                    "hash" : "548ca959f5bc870502e34a6a6588fcc84339f07226557a9b601e580ee434cf7e",
+                    "hash" : "0x548ca959f5bc870502e34a6a6588fcc84339f07226557a9b601e580ee434cf7e",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 1,
@@ -227,7 +227,7 @@
                     }
                 },
                 {
-                    "hash" : "404c9b96e72d670b118f253994533902cea8e8905cb6a341e12a91c8500b70f7",
+                    "hash" : "0x404c9b96e72d670b118f253994533902cea8e8905cb6a341e12a91c8500b70f7",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 1,
@@ -235,7 +235,7 @@
                     }
                 },
                 {
-                    "hash" : "01cb4b1894d236991dd8f624910ac7cd11708731342187df760267723c7609a8",
+                    "hash" : "0x01cb4b1894d236991dd8f624910ac7cd11708731342187df760267723c7609a8",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 2,
@@ -243,7 +243,7 @@
                     }
                 },
                 {
-                    "hash" : "194d498eda8247cc0f13bd37c69b1151c4ab3c1e65e8815b9ce1cbdd0c9ee4a1",
+                    "hash" : "0x194d498eda8247cc0f13bd37c69b1151c4ab3c1e65e8815b9ce1cbdd0c9ee4a1",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 2,
@@ -251,7 +251,7 @@
                     }
                 },
                 {
-                    "hash" : "1e4c40e58408c4916b3c0acc7044049824c50b0bd97091cb33eca52222eea6a7",
+                    "hash" : "0x1e4c40e58408c4916b3c0acc7044049824c50b0bd97091cb33eca52222eea6a7",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 3,
@@ -259,7 +259,7 @@
                     }
                 },
                 {
-                    "hash" : "3c04067e96a83e2b0c65f81c8a210a2088b45c4cbaa5a15b59f3ca21f1d8ae07",
+                    "hash" : "0x3c04067e96a83e2b0c65f81c8a210a2088b45c4cbaa5a15b59f3ca21f1d8ae07",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 3,
@@ -269,7 +269,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d8f4e54b56f537699870c958f97ff83480035abfbd13d3511d418baa5cae7c09",
+                    "hash" : "0xd8f4e54b56f537699870c958f97ff83480035abfbd13d3511d418baa5cae7c09",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -277,7 +277,7 @@
                     }
                 },
                 {
-                    "hash" : "b6cc57520d9770d30f2ae303a3011772a6a92d1746b1a4ef6f6894ddefb8b78b",
+                    "hash" : "0xb6cc57520d9770d30f2ae303a3011772a6a92d1746b1a4ef6f6894ddefb8b78b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -285,7 +285,7 @@
                     }
                 },
                 {
-                    "hash" : "548ca959f5bc870502e34a6a6588fcc84339f07226557a9b601e580ee434cf7e",
+                    "hash" : "0x548ca959f5bc870502e34a6a6588fcc84339f07226557a9b601e580ee434cf7e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -293,7 +293,7 @@
                     }
                 },
                 {
-                    "hash" : "404c9b96e72d670b118f253994533902cea8e8905cb6a341e12a91c8500b70f7",
+                    "hash" : "0x404c9b96e72d670b118f253994533902cea8e8905cb6a341e12a91c8500b70f7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -301,7 +301,7 @@
                     }
                 },
                 {
-                    "hash" : "01cb4b1894d236991dd8f624910ac7cd11708731342187df760267723c7609a8",
+                    "hash" : "0x01cb4b1894d236991dd8f624910ac7cd11708731342187df760267723c7609a8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -309,7 +309,7 @@
                     }
                 },
                 {
-                    "hash" : "194d498eda8247cc0f13bd37c69b1151c4ab3c1e65e8815b9ce1cbdd0c9ee4a1",
+                    "hash" : "0x194d498eda8247cc0f13bd37c69b1151c4ab3c1e65e8815b9ce1cbdd0c9ee4a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -317,7 +317,7 @@
                     }
                 },
                 {
-                    "hash" : "1e4c40e58408c4916b3c0acc7044049824c50b0bd97091cb33eca52222eea6a7",
+                    "hash" : "0x1e4c40e58408c4916b3c0acc7044049824c50b0bd97091cb33eca52222eea6a7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
@@ -325,7 +325,7 @@
                     }
                 },
                 {
-                    "hash" : "3c04067e96a83e2b0c65f81c8a210a2088b45c4cbaa5a15b59f3ca21f1d8ae07",
+                    "hash" : "0x3c04067e96a83e2b0c65f81c8a210a2088b45c4cbaa5a15b59f3ca21f1d8ae07",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
@@ -333,7 +333,7 @@
                     }
                 },
                 {
-                    "hash" : "5d50590051ccaf4888d6aaea2e67c3c221418e6d63ac08ccaeb83f8972cef939",
+                    "hash" : "0x5d50590051ccaf4888d6aaea2e67c3c221418e6d63ac08ccaeb83f8972cef939",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -341,7 +341,7 @@
                     }
                 },
                 {
-                    "hash" : "34b72637b56181f53edcff598845763a878c55eeb2366ba4d1e4f3e6244c9062",
+                    "hash" : "0x34b72637b56181f53edcff598845763a878c55eeb2366ba4d1e4f3e6244c9062",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -349,7 +349,7 @@
                     }
                 },
                 {
-                    "hash" : "548ca959f5bc870502e34a6a6588fcc84339f07226557a9b601e580ee434cf7e",
+                    "hash" : "0x548ca959f5bc870502e34a6a6588fcc84339f07226557a9b601e580ee434cf7e",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -357,7 +357,7 @@
                     }
                 },
                 {
-                    "hash" : "404c9b96e72d670b118f253994533902cea8e8905cb6a341e12a91c8500b70f7",
+                    "hash" : "0x404c9b96e72d670b118f253994533902cea8e8905cb6a341e12a91c8500b70f7",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -365,7 +365,7 @@
                     }
                 },
                 {
-                    "hash" : "01cb4b1894d236991dd8f624910ac7cd11708731342187df760267723c7609a8",
+                    "hash" : "0x01cb4b1894d236991dd8f624910ac7cd11708731342187df760267723c7609a8",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -373,7 +373,7 @@
                     }
                 },
                 {
-                    "hash" : "194d498eda8247cc0f13bd37c69b1151c4ab3c1e65e8815b9ce1cbdd0c9ee4a1",
+                    "hash" : "0x194d498eda8247cc0f13bd37c69b1151c4ab3c1e65e8815b9ce1cbdd0c9ee4a1",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -381,7 +381,7 @@
                     }
                 },
                 {
-                    "hash" : "1e4c40e58408c4916b3c0acc7044049824c50b0bd97091cb33eca52222eea6a7",
+                    "hash" : "0x1e4c40e58408c4916b3c0acc7044049824c50b0bd97091cb33eca52222eea6a7",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 3,
@@ -389,7 +389,7 @@
                     }
                 },
                 {
-                    "hash" : "3c04067e96a83e2b0c65f81c8a210a2088b45c4cbaa5a15b59f3ca21f1d8ae07",
+                    "hash" : "0x3c04067e96a83e2b0c65f81c8a210a2088b45c4cbaa5a15b59f3ca21f1d8ae07",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 3,
@@ -397,7 +397,7 @@
                     }
                 },
                 {
-                    "hash" : "c5a643f1bfb926531f64c8bacaed120944594d9d40bb9623bab4da7b3a223f12",
+                    "hash" : "0xc5a643f1bfb926531f64c8bacaed120944594d9d40bb9623bab4da7b3a223f12",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -405,7 +405,7 @@
                     }
                 },
                 {
-                    "hash" : "e5636003a6a46f677815d577aa34d0327e1ffb059035e6d7bd1c0cde96bbcc68",
+                    "hash" : "0xe5636003a6a46f677815d577aa34d0327e1ffb059035e6d7bd1c0cde96bbcc68",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -413,7 +413,7 @@
                     }
                 },
                 {
-                    "hash" : "548ca959f5bc870502e34a6a6588fcc84339f07226557a9b601e580ee434cf7e",
+                    "hash" : "0x548ca959f5bc870502e34a6a6588fcc84339f07226557a9b601e580ee434cf7e",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 1,
@@ -421,7 +421,7 @@
                     }
                 },
                 {
-                    "hash" : "404c9b96e72d670b118f253994533902cea8e8905cb6a341e12a91c8500b70f7",
+                    "hash" : "0x404c9b96e72d670b118f253994533902cea8e8905cb6a341e12a91c8500b70f7",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 1,
@@ -429,7 +429,7 @@
                     }
                 },
                 {
-                    "hash" : "01cb4b1894d236991dd8f624910ac7cd11708731342187df760267723c7609a8",
+                    "hash" : "0x01cb4b1894d236991dd8f624910ac7cd11708731342187df760267723c7609a8",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 2,
@@ -437,7 +437,7 @@
                     }
                 },
                 {
-                    "hash" : "194d498eda8247cc0f13bd37c69b1151c4ab3c1e65e8815b9ce1cbdd0c9ee4a1",
+                    "hash" : "0x194d498eda8247cc0f13bd37c69b1151c4ab3c1e65e8815b9ce1cbdd0c9ee4a1",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 2,
@@ -445,7 +445,7 @@
                     }
                 },
                 {
-                    "hash" : "1e4c40e58408c4916b3c0acc7044049824c50b0bd97091cb33eca52222eea6a7",
+                    "hash" : "0x1e4c40e58408c4916b3c0acc7044049824c50b0bd97091cb33eca52222eea6a7",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 3,
@@ -453,7 +453,7 @@
                     }
                 },
                 {
-                    "hash" : "3c04067e96a83e2b0c65f81c8a210a2088b45c4cbaa5a15b59f3ca21f1d8ae07",
+                    "hash" : "0x3c04067e96a83e2b0c65f81c8a210a2088b45c4cbaa5a15b59f3ca21f1d8ae07",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 3,
@@ -461,7 +461,7 @@
                     }
                 },
                 {
-                    "hash" : "1afdbdfbba02f176a74a058ce687039fc418c16426ee072cf820edaa1136a20a",
+                    "hash" : "0x1afdbdfbba02f176a74a058ce687039fc418c16426ee072cf820edaa1136a20a",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -469,7 +469,7 @@
                     }
                 },
                 {
-                    "hash" : "4ad3d92aa98e194cb4b7bf8f889adc498f316c5a026fc36e4150b2cfa026a83c",
+                    "hash" : "0x4ad3d92aa98e194cb4b7bf8f889adc498f316c5a026fc36e4150b2cfa026a83c",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -477,7 +477,7 @@
                     }
                 },
                 {
-                    "hash" : "548ca959f5bc870502e34a6a6588fcc84339f07226557a9b601e580ee434cf7e",
+                    "hash" : "0x548ca959f5bc870502e34a6a6588fcc84339f07226557a9b601e580ee434cf7e",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 1,
@@ -485,7 +485,7 @@
                     }
                 },
                 {
-                    "hash" : "404c9b96e72d670b118f253994533902cea8e8905cb6a341e12a91c8500b70f7",
+                    "hash" : "0x404c9b96e72d670b118f253994533902cea8e8905cb6a341e12a91c8500b70f7",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 1,
@@ -493,7 +493,7 @@
                     }
                 },
                 {
-                    "hash" : "01cb4b1894d236991dd8f624910ac7cd11708731342187df760267723c7609a8",
+                    "hash" : "0x01cb4b1894d236991dd8f624910ac7cd11708731342187df760267723c7609a8",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 2,
@@ -501,7 +501,7 @@
                     }
                 },
                 {
-                    "hash" : "194d498eda8247cc0f13bd37c69b1151c4ab3c1e65e8815b9ce1cbdd0c9ee4a1",
+                    "hash" : "0x194d498eda8247cc0f13bd37c69b1151c4ab3c1e65e8815b9ce1cbdd0c9ee4a1",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 2,
@@ -509,7 +509,7 @@
                     }
                 },
                 {
-                    "hash" : "1e4c40e58408c4916b3c0acc7044049824c50b0bd97091cb33eca52222eea6a7",
+                    "hash" : "0x1e4c40e58408c4916b3c0acc7044049824c50b0bd97091cb33eca52222eea6a7",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 3,
@@ -517,7 +517,7 @@
                     }
                 },
                 {
-                    "hash" : "3c04067e96a83e2b0c65f81c8a210a2088b45c4cbaa5a15b59f3ca21f1d8ae07",
+                    "hash" : "0x3c04067e96a83e2b0c65f81c8a210a2088b45c4cbaa5a15b59f3ca21f1d8ae07",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 3,
@@ -527,7 +527,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "1e6f2866ebc2ec3bd095dd5d1e0a9003dff8c46d740422e032564e23800e401c",
+                    "hash" : "0x1e6f2866ebc2ec3bd095dd5d1e0a9003dff8c46d740422e032564e23800e401c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -535,7 +535,7 @@
                     }
                 },
                 {
-                    "hash" : "1092feb631e5d2b0bb2ca83f9f68b54c53717f8ceda091616c67aa01bf2f6715",
+                    "hash" : "0x1092feb631e5d2b0bb2ca83f9f68b54c53717f8ceda091616c67aa01bf2f6715",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -543,7 +543,7 @@
                     }
                 },
                 {
-                    "hash" : "936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a",
+                    "hash" : "0x936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -551,7 +551,7 @@
                     }
                 },
                 {
-                    "hash" : "936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a",
+                    "hash" : "0x936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -559,7 +559,7 @@
                     }
                 },
                 {
-                    "hash" : "9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820",
+                    "hash" : "0x9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -567,7 +567,7 @@
                     }
                 },
                 {
-                    "hash" : "9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820",
+                    "hash" : "0x9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -575,7 +575,7 @@
                     }
                 },
                 {
-                    "hash" : "3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73",
+                    "hash" : "0x3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
@@ -583,7 +583,7 @@
                     }
                 },
                 {
-                    "hash" : "3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73",
+                    "hash" : "0x3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
@@ -591,7 +591,7 @@
                     }
                 },
                 {
-                    "hash" : "69e43bbf019adedcae45878e4efb53768e49d66b68fa4ed04f0e1e4568ca41a7",
+                    "hash" : "0x69e43bbf019adedcae45878e4efb53768e49d66b68fa4ed04f0e1e4568ca41a7",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -599,7 +599,7 @@
                     }
                 },
                 {
-                    "hash" : "f6b3cbbd0610954032c6d46f6415ef5bff8742fbee55230fe12211ded4220c3d",
+                    "hash" : "0xf6b3cbbd0610954032c6d46f6415ef5bff8742fbee55230fe12211ded4220c3d",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -607,7 +607,7 @@
                     }
                 },
                 {
-                    "hash" : "936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a",
+                    "hash" : "0x936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -615,7 +615,7 @@
                     }
                 },
                 {
-                    "hash" : "936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a",
+                    "hash" : "0x936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -623,7 +623,7 @@
                     }
                 },
                 {
-                    "hash" : "9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820",
+                    "hash" : "0x9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -631,7 +631,7 @@
                     }
                 },
                 {
-                    "hash" : "9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820",
+                    "hash" : "0x9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -639,7 +639,7 @@
                     }
                 },
                 {
-                    "hash" : "3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73",
+                    "hash" : "0x3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 3,
@@ -647,7 +647,7 @@
                     }
                 },
                 {
-                    "hash" : "3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73",
+                    "hash" : "0x3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 3,
@@ -655,7 +655,7 @@
                     }
                 },
                 {
-                    "hash" : "d82deee3a810865a30ee17dee27244ecc812f3270ae1eb67c40f7aaf80907622",
+                    "hash" : "0xd82deee3a810865a30ee17dee27244ecc812f3270ae1eb67c40f7aaf80907622",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -663,7 +663,7 @@
                     }
                 },
                 {
-                    "hash" : "1a19c6ab26d1bc1fb3130c16132d82cc6bb770cc7e3f235be283a9c6a574d706",
+                    "hash" : "0x1a19c6ab26d1bc1fb3130c16132d82cc6bb770cc7e3f235be283a9c6a574d706",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -671,7 +671,7 @@
                     }
                 },
                 {
-                    "hash" : "936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a",
+                    "hash" : "0x936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 1,
@@ -679,7 +679,7 @@
                     }
                 },
                 {
-                    "hash" : "936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a",
+                    "hash" : "0x936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 1,
@@ -687,7 +687,7 @@
                     }
                 },
                 {
-                    "hash" : "9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820",
+                    "hash" : "0x9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 2,
@@ -695,7 +695,7 @@
                     }
                 },
                 {
-                    "hash" : "9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820",
+                    "hash" : "0x9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 2,
@@ -703,7 +703,7 @@
                     }
                 },
                 {
-                    "hash" : "3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73",
+                    "hash" : "0x3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 3,
@@ -711,7 +711,7 @@
                     }
                 },
                 {
-                    "hash" : "3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73",
+                    "hash" : "0x3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 3,
@@ -719,7 +719,7 @@
                     }
                 },
                 {
-                    "hash" : "d82deee3a810865a30ee17dee27244ecc812f3270ae1eb67c40f7aaf80907622",
+                    "hash" : "0xd82deee3a810865a30ee17dee27244ecc812f3270ae1eb67c40f7aaf80907622",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -727,7 +727,7 @@
                     }
                 },
                 {
-                    "hash" : "1a19c6ab26d1bc1fb3130c16132d82cc6bb770cc7e3f235be283a9c6a574d706",
+                    "hash" : "0x1a19c6ab26d1bc1fb3130c16132d82cc6bb770cc7e3f235be283a9c6a574d706",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -735,7 +735,7 @@
                     }
                 },
                 {
-                    "hash" : "936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a",
+                    "hash" : "0x936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 1,
@@ -743,7 +743,7 @@
                     }
                 },
                 {
-                    "hash" : "936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a",
+                    "hash" : "0x936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 1,
@@ -751,7 +751,7 @@
                     }
                 },
                 {
-                    "hash" : "9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820",
+                    "hash" : "0x9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 2,
@@ -759,7 +759,7 @@
                     }
                 },
                 {
-                    "hash" : "9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820",
+                    "hash" : "0x9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 2,
@@ -767,7 +767,7 @@
                     }
                 },
                 {
-                    "hash" : "3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73",
+                    "hash" : "0x3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 3,
@@ -775,7 +775,7 @@
                     }
                 },
                 {
-                    "hash" : "3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73",
+                    "hash" : "0x3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 3,
@@ -785,7 +785,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "1e6f2866ebc2ec3bd095dd5d1e0a9003dff8c46d740422e032564e23800e401c",
+                    "hash" : "0x1e6f2866ebc2ec3bd095dd5d1e0a9003dff8c46d740422e032564e23800e401c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -793,7 +793,7 @@
                     }
                 },
                 {
-                    "hash" : "1092feb631e5d2b0bb2ca83f9f68b54c53717f8ceda091616c67aa01bf2f6715",
+                    "hash" : "0x1092feb631e5d2b0bb2ca83f9f68b54c53717f8ceda091616c67aa01bf2f6715",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -801,7 +801,7 @@
                     }
                 },
                 {
-                    "hash" : "936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a",
+                    "hash" : "0x936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -809,7 +809,7 @@
                     }
                 },
                 {
-                    "hash" : "936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a",
+                    "hash" : "0x936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -817,7 +817,7 @@
                     }
                 },
                 {
-                    "hash" : "9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820",
+                    "hash" : "0x9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -825,7 +825,7 @@
                     }
                 },
                 {
-                    "hash" : "9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820",
+                    "hash" : "0x9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -833,7 +833,7 @@
                     }
                 },
                 {
-                    "hash" : "3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73",
+                    "hash" : "0x3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
@@ -841,7 +841,7 @@
                     }
                 },
                 {
-                    "hash" : "3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73",
+                    "hash" : "0x3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
@@ -849,7 +849,7 @@
                     }
                 },
                 {
-                    "hash" : "69e43bbf019adedcae45878e4efb53768e49d66b68fa4ed04f0e1e4568ca41a7",
+                    "hash" : "0x69e43bbf019adedcae45878e4efb53768e49d66b68fa4ed04f0e1e4568ca41a7",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -857,7 +857,7 @@
                     }
                 },
                 {
-                    "hash" : "f6b3cbbd0610954032c6d46f6415ef5bff8742fbee55230fe12211ded4220c3d",
+                    "hash" : "0xf6b3cbbd0610954032c6d46f6415ef5bff8742fbee55230fe12211ded4220c3d",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -865,7 +865,7 @@
                     }
                 },
                 {
-                    "hash" : "936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a",
+                    "hash" : "0x936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -873,7 +873,7 @@
                     }
                 },
                 {
-                    "hash" : "936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a",
+                    "hash" : "0x936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -881,7 +881,7 @@
                     }
                 },
                 {
-                    "hash" : "9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820",
+                    "hash" : "0x9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -889,7 +889,7 @@
                     }
                 },
                 {
-                    "hash" : "9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820",
+                    "hash" : "0x9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -897,7 +897,7 @@
                     }
                 },
                 {
-                    "hash" : "3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73",
+                    "hash" : "0x3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 3,
@@ -905,7 +905,7 @@
                     }
                 },
                 {
-                    "hash" : "3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73",
+                    "hash" : "0x3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 3,
@@ -913,7 +913,7 @@
                     }
                 },
                 {
-                    "hash" : "f831c6b1f491ca064a59088ac753fe9b9f6376112b08acd3ee9d7b2dd56ba209",
+                    "hash" : "0xf831c6b1f491ca064a59088ac753fe9b9f6376112b08acd3ee9d7b2dd56ba209",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -921,7 +921,7 @@
                     }
                 },
                 {
-                    "hash" : "5f9dbebae5fe583e47a8e4a2212dca465e4679785618107655e492a9c38f8397",
+                    "hash" : "0x5f9dbebae5fe583e47a8e4a2212dca465e4679785618107655e492a9c38f8397",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -929,7 +929,7 @@
                     }
                 },
                 {
-                    "hash" : "936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a",
+                    "hash" : "0x936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 1,
@@ -937,7 +937,7 @@
                     }
                 },
                 {
-                    "hash" : "936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a",
+                    "hash" : "0x936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 1,
@@ -945,7 +945,7 @@
                     }
                 },
                 {
-                    "hash" : "9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820",
+                    "hash" : "0x9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 2,
@@ -953,7 +953,7 @@
                     }
                 },
                 {
-                    "hash" : "9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820",
+                    "hash" : "0x9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 2,
@@ -961,7 +961,7 @@
                     }
                 },
                 {
-                    "hash" : "3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73",
+                    "hash" : "0x3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 3,
@@ -969,7 +969,7 @@
                     }
                 },
                 {
-                    "hash" : "3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73",
+                    "hash" : "0x3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 3,
@@ -977,7 +977,7 @@
                     }
                 },
                 {
-                    "hash" : "06d00ec0437967bfa535b2c7830db5a63042d73368beb07d68d2ed93bc769f03",
+                    "hash" : "0x06d00ec0437967bfa535b2c7830db5a63042d73368beb07d68d2ed93bc769f03",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -985,7 +985,7 @@
                     }
                 },
                 {
-                    "hash" : "697f6c1e9bc4bcb230fa4a941c977d44e74245e9af445c132d83d9cced610adb",
+                    "hash" : "0x697f6c1e9bc4bcb230fa4a941c977d44e74245e9af445c132d83d9cced610adb",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -993,7 +993,7 @@
                     }
                 },
                 {
-                    "hash" : "936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a",
+                    "hash" : "0x936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 1,
@@ -1001,7 +1001,7 @@
                     }
                 },
                 {
-                    "hash" : "936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a",
+                    "hash" : "0x936942c98843600eb69cdad1cdeaa3630afb62513e6c0a597a262ade92d5b66a",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 1,
@@ -1009,7 +1009,7 @@
                     }
                 },
                 {
-                    "hash" : "9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820",
+                    "hash" : "0x9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 2,
@@ -1017,7 +1017,7 @@
                     }
                 },
                 {
-                    "hash" : "9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820",
+                    "hash" : "0x9ac31168816aa36d6c71895d033daa0b610b199362690f733928dbef23f28820",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 2,
@@ -1025,7 +1025,7 @@
                     }
                 },
                 {
-                    "hash" : "3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73",
+                    "hash" : "0x3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 3,
@@ -1033,7 +1033,7 @@
                     }
                 },
                 {
-                    "hash" : "3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73",
+                    "hash" : "0x3c80aaff583e56560fcc9ff3b09d33d587e131d23270792f6dc37cc29c3b0f73",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 3,
@@ -1043,7 +1043,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "349fa19f377350ecaea31dd8486a281546eb070214059f1551d24d4f9cdaa565",
+                    "hash" : "0x349fa19f377350ecaea31dd8486a281546eb070214059f1551d24d4f9cdaa565",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -1051,7 +1051,7 @@
                     }
                 },
                 {
-                    "hash" : "6117f1c9999903c9289b0c1415c895f0810166df78f60b6297ced2ea76e34651",
+                    "hash" : "0x6117f1c9999903c9289b0c1415c895f0810166df78f60b6297ced2ea76e34651",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -1059,7 +1059,7 @@
                     }
                 },
                 {
-                    "hash" : "548ca959f5bc870502e34a6a6588fcc84339f07226557a9b601e580ee434cf7e",
+                    "hash" : "0x548ca959f5bc870502e34a6a6588fcc84339f07226557a9b601e580ee434cf7e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -1067,7 +1067,7 @@
                     }
                 },
                 {
-                    "hash" : "404c9b96e72d670b118f253994533902cea8e8905cb6a341e12a91c8500b70f7",
+                    "hash" : "0x404c9b96e72d670b118f253994533902cea8e8905cb6a341e12a91c8500b70f7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -1075,7 +1075,7 @@
                     }
                 },
                 {
-                    "hash" : "349fa19f377350ecaea31dd8486a281546eb070214059f1551d24d4f9cdaa565",
+                    "hash" : "0x349fa19f377350ecaea31dd8486a281546eb070214059f1551d24d4f9cdaa565",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -1083,7 +1083,7 @@
                     }
                 },
                 {
-                    "hash" : "6117f1c9999903c9289b0c1415c895f0810166df78f60b6297ced2ea76e34651",
+                    "hash" : "0x6117f1c9999903c9289b0c1415c895f0810166df78f60b6297ced2ea76e34651",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -1091,7 +1091,7 @@
                     }
                 },
                 {
-                    "hash" : "1e4c40e58408c4916b3c0acc7044049824c50b0bd97091cb33eca52222eea6a7",
+                    "hash" : "0x1e4c40e58408c4916b3c0acc7044049824c50b0bd97091cb33eca52222eea6a7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
@@ -1099,7 +1099,7 @@
                     }
                 },
                 {
-                    "hash" : "3c04067e96a83e2b0c65f81c8a210a2088b45c4cbaa5a15b59f3ca21f1d8ae07",
+                    "hash" : "0x3c04067e96a83e2b0c65f81c8a210a2088b45c4cbaa5a15b59f3ca21f1d8ae07",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
@@ -1107,7 +1107,7 @@
                     }
                 },
                 {
-                    "hash" : "43f18bb29c7d3a5ea26d340fc239438fb05b0644d49db8f1559bddd38ed86cfa",
+                    "hash" : "0x43f18bb29c7d3a5ea26d340fc239438fb05b0644d49db8f1559bddd38ed86cfa",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -1115,7 +1115,7 @@
                     }
                 },
                 {
-                    "hash" : "94d5c3ff4637fc5d129802b625852d64498497bc1b7ec55a8c16ea01af9f19ad",
+                    "hash" : "0x94d5c3ff4637fc5d129802b625852d64498497bc1b7ec55a8c16ea01af9f19ad",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -1123,7 +1123,7 @@
                     }
                 },
                 {
-                    "hash" : "548ca959f5bc870502e34a6a6588fcc84339f07226557a9b601e580ee434cf7e",
+                    "hash" : "0x548ca959f5bc870502e34a6a6588fcc84339f07226557a9b601e580ee434cf7e",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -1131,7 +1131,7 @@
                     }
                 },
                 {
-                    "hash" : "404c9b96e72d670b118f253994533902cea8e8905cb6a341e12a91c8500b70f7",
+                    "hash" : "0x404c9b96e72d670b118f253994533902cea8e8905cb6a341e12a91c8500b70f7",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -1139,7 +1139,7 @@
                     }
                 },
                 {
-                    "hash" : "43f18bb29c7d3a5ea26d340fc239438fb05b0644d49db8f1559bddd38ed86cfa",
+                    "hash" : "0x43f18bb29c7d3a5ea26d340fc239438fb05b0644d49db8f1559bddd38ed86cfa",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -1147,7 +1147,7 @@
                     }
                 },
                 {
-                    "hash" : "94d5c3ff4637fc5d129802b625852d64498497bc1b7ec55a8c16ea01af9f19ad",
+                    "hash" : "0x94d5c3ff4637fc5d129802b625852d64498497bc1b7ec55a8c16ea01af9f19ad",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -1155,7 +1155,7 @@
                     }
                 },
                 {
-                    "hash" : "1e4c40e58408c4916b3c0acc7044049824c50b0bd97091cb33eca52222eea6a7",
+                    "hash" : "0x1e4c40e58408c4916b3c0acc7044049824c50b0bd97091cb33eca52222eea6a7",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 3,
@@ -1163,7 +1163,7 @@
                     }
                 },
                 {
-                    "hash" : "3c04067e96a83e2b0c65f81c8a210a2088b45c4cbaa5a15b59f3ca21f1d8ae07",
+                    "hash" : "0x3c04067e96a83e2b0c65f81c8a210a2088b45c4cbaa5a15b59f3ca21f1d8ae07",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 3,
@@ -1171,7 +1171,7 @@
                     }
                 },
                 {
-                    "hash" : "86ac739c87c10de1e46ac532093e30be8639e0830d859f32b949b13a9e12dc2b",
+                    "hash" : "0x86ac739c87c10de1e46ac532093e30be8639e0830d859f32b949b13a9e12dc2b",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -1179,7 +1179,7 @@
                     }
                 },
                 {
-                    "hash" : "b7ec28e0f6f769330401a3213ea9d2e5f6337fce4337ebbad1fd01f8946289c8",
+                    "hash" : "0xb7ec28e0f6f769330401a3213ea9d2e5f6337fce4337ebbad1fd01f8946289c8",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -1187,7 +1187,7 @@
                     }
                 },
                 {
-                    "hash" : "548ca959f5bc870502e34a6a6588fcc84339f07226557a9b601e580ee434cf7e",
+                    "hash" : "0x548ca959f5bc870502e34a6a6588fcc84339f07226557a9b601e580ee434cf7e",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 1,
@@ -1195,7 +1195,7 @@
                     }
                 },
                 {
-                    "hash" : "404c9b96e72d670b118f253994533902cea8e8905cb6a341e12a91c8500b70f7",
+                    "hash" : "0x404c9b96e72d670b118f253994533902cea8e8905cb6a341e12a91c8500b70f7",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 1,
@@ -1203,7 +1203,7 @@
                     }
                 },
                 {
-                    "hash" : "86ac739c87c10de1e46ac532093e30be8639e0830d859f32b949b13a9e12dc2b",
+                    "hash" : "0x86ac739c87c10de1e46ac532093e30be8639e0830d859f32b949b13a9e12dc2b",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 2,
@@ -1211,7 +1211,7 @@
                     }
                 },
                 {
-                    "hash" : "b7ec28e0f6f769330401a3213ea9d2e5f6337fce4337ebbad1fd01f8946289c8",
+                    "hash" : "0xb7ec28e0f6f769330401a3213ea9d2e5f6337fce4337ebbad1fd01f8946289c8",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 2,
@@ -1219,7 +1219,7 @@
                     }
                 },
                 {
-                    "hash" : "1e4c40e58408c4916b3c0acc7044049824c50b0bd97091cb33eca52222eea6a7",
+                    "hash" : "0x1e4c40e58408c4916b3c0acc7044049824c50b0bd97091cb33eca52222eea6a7",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 3,
@@ -1227,7 +1227,7 @@
                     }
                 },
                 {
-                    "hash" : "3c04067e96a83e2b0c65f81c8a210a2088b45c4cbaa5a15b59f3ca21f1d8ae07",
+                    "hash" : "0x3c04067e96a83e2b0c65f81c8a210a2088b45c4cbaa5a15b59f3ca21f1d8ae07",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 3,
@@ -1235,7 +1235,7 @@
                     }
                 },
                 {
-                    "hash" : "4ff6ba73eb495fbfdf2a5fc9b13307e541cc9426af96827451cd6fa08528486e",
+                    "hash" : "0x4ff6ba73eb495fbfdf2a5fc9b13307e541cc9426af96827451cd6fa08528486e",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -1243,7 +1243,7 @@
                     }
                 },
                 {
-                    "hash" : "7395a1a844d205bf2bc5bf8ff97f597815ccc9f2092c69ef90253682a5b51847",
+                    "hash" : "0x7395a1a844d205bf2bc5bf8ff97f597815ccc9f2092c69ef90253682a5b51847",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -1251,7 +1251,7 @@
                     }
                 },
                 {
-                    "hash" : "548ca959f5bc870502e34a6a6588fcc84339f07226557a9b601e580ee434cf7e",
+                    "hash" : "0x548ca959f5bc870502e34a6a6588fcc84339f07226557a9b601e580ee434cf7e",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 1,
@@ -1259,7 +1259,7 @@
                     }
                 },
                 {
-                    "hash" : "404c9b96e72d670b118f253994533902cea8e8905cb6a341e12a91c8500b70f7",
+                    "hash" : "0x404c9b96e72d670b118f253994533902cea8e8905cb6a341e12a91c8500b70f7",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 1,
@@ -1267,7 +1267,7 @@
                     }
                 },
                 {
-                    "hash" : "4ff6ba73eb495fbfdf2a5fc9b13307e541cc9426af96827451cd6fa08528486e",
+                    "hash" : "0x4ff6ba73eb495fbfdf2a5fc9b13307e541cc9426af96827451cd6fa08528486e",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 2,
@@ -1275,7 +1275,7 @@
                     }
                 },
                 {
-                    "hash" : "7395a1a844d205bf2bc5bf8ff97f597815ccc9f2092c69ef90253682a5b51847",
+                    "hash" : "0x7395a1a844d205bf2bc5bf8ff97f597815ccc9f2092c69ef90253682a5b51847",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 2,
@@ -1283,7 +1283,7 @@
                     }
                 },
                 {
-                    "hash" : "1e4c40e58408c4916b3c0acc7044049824c50b0bd97091cb33eca52222eea6a7",
+                    "hash" : "0x1e4c40e58408c4916b3c0acc7044049824c50b0bd97091cb33eca52222eea6a7",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 3,
@@ -1291,7 +1291,7 @@
                     }
                 },
                 {
-                    "hash" : "3c04067e96a83e2b0c65f81c8a210a2088b45c4cbaa5a15b59f3ca21f1d8ae07",
+                    "hash" : "0x3c04067e96a83e2b0c65f81c8a210a2088b45c4cbaa5a15b59f3ca21f1d8ae07",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 3,
@@ -1301,63 +1301,63 @@
             ]
         },
         "pre" : {
-            "a000000000000000000000000000000000000000" : {
+            "0xa000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a100000000000000000000000000000000000000" : {
+            "0xa100000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a200000000000000000000000000000000000000" : {
+            "0xa200000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a300000000000000000000000000000000000000" : {
+            "0xa300000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "ac00000000000000000000000000000000000000" : {
+            "0xac00000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x6000600060006000346000356203f7a0f1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b000000000000000000000000000000000000000" : {
+            "0xb000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x600c60015560016000fd",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c000000000000000000000000000000000000000" : {
+            "0xc000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x600c60025560016000fd",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "d000000000000000000000000000000000000000" : {
+            "0xd000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x600c60035560016000fd",
                 "nonce" : "0x00",
@@ -1373,18 +1373,18 @@
                 "000000000000000000000000a300000000000000000000000000000000000000"
             ],
             "gasLimit" : [
-                "800000",
-                "140000",
-                "160000",
-                "50000"
+                "0x0c3500",
+                "0x0222e0",
+                "0x027100",
+                "0xc350"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "ac00000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xac00000000000000000000000000000000000000",
             "value" : [
-                "0",
-                "10"
+                "0x00",
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stRevertTest/RevertOpcodeReturn.json b/GeneralStateTests/stRevertTest/RevertOpcodeReturn.json
index c4b8c0c76..264c06d84 100644
--- a/GeneralStateTests/stRevertTest/RevertOpcodeReturn.json
+++ b/GeneralStateTests/stRevertTest/RevertOpcodeReturn.json
@@ -1,17 +1,17 @@
 {
     "RevertOpcodeReturn" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "26fbf1e03628ac787377d3e309d18c04d005d31743b650400e6da40539474c79",
+                    "hash" : "0x26fbf1e03628ac787377d3e309d18c04d005d31743b650400e6da40539474c79",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc",
+                    "hash" : "0x11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -27,7 +27,7 @@
                     }
                 },
                 {
-                    "hash" : "26fbf1e03628ac787377d3e309d18c04d005d31743b650400e6da40539474c79",
+                    "hash" : "0x26fbf1e03628ac787377d3e309d18c04d005d31743b650400e6da40539474c79",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -35,7 +35,7 @@
                     }
                 },
                 {
-                    "hash" : "11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc",
+                    "hash" : "0x11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -43,7 +43,7 @@
                     }
                 },
                 {
-                    "hash" : "26fbf1e03628ac787377d3e309d18c04d005d31743b650400e6da40539474c79",
+                    "hash" : "0x26fbf1e03628ac787377d3e309d18c04d005d31743b650400e6da40539474c79",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -51,7 +51,7 @@
                     }
                 },
                 {
-                    "hash" : "11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc",
+                    "hash" : "0x11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 1,
@@ -59,7 +59,7 @@
                     }
                 },
                 {
-                    "hash" : "26fbf1e03628ac787377d3e309d18c04d005d31743b650400e6da40539474c79",
+                    "hash" : "0x26fbf1e03628ac787377d3e309d18c04d005d31743b650400e6da40539474c79",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -67,7 +67,7 @@
                     }
                 },
                 {
-                    "hash" : "11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc",
+                    "hash" : "0x11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 1,
@@ -75,7 +75,7 @@
                     }
                 },
                 {
-                    "hash" : "26fbf1e03628ac787377d3e309d18c04d005d31743b650400e6da40539474c79",
+                    "hash" : "0x26fbf1e03628ac787377d3e309d18c04d005d31743b650400e6da40539474c79",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 0,
@@ -83,7 +83,7 @@
                     }
                 },
                 {
-                    "hash" : "11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc",
+                    "hash" : "0x11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 1,
@@ -91,7 +91,7 @@
                     }
                 },
                 {
-                    "hash" : "26fbf1e03628ac787377d3e309d18c04d005d31743b650400e6da40539474c79",
+                    "hash" : "0x26fbf1e03628ac787377d3e309d18c04d005d31743b650400e6da40539474c79",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 0,
@@ -99,7 +99,7 @@
                     }
                 },
                 {
-                    "hash" : "11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc",
+                    "hash" : "0x11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 1,
@@ -109,7 +109,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "26fbf1e03628ac787377d3e309d18c04d005d31743b650400e6da40539474c79",
+                    "hash" : "0x26fbf1e03628ac787377d3e309d18c04d005d31743b650400e6da40539474c79",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -117,7 +117,7 @@
                     }
                 },
                 {
-                    "hash" : "11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc",
+                    "hash" : "0x11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -125,7 +125,7 @@
                     }
                 },
                 {
-                    "hash" : "26fbf1e03628ac787377d3e309d18c04d005d31743b650400e6da40539474c79",
+                    "hash" : "0x26fbf1e03628ac787377d3e309d18c04d005d31743b650400e6da40539474c79",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -133,7 +133,7 @@
                     }
                 },
                 {
-                    "hash" : "11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc",
+                    "hash" : "0x11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -141,7 +141,7 @@
                     }
                 },
                 {
-                    "hash" : "26fbf1e03628ac787377d3e309d18c04d005d31743b650400e6da40539474c79",
+                    "hash" : "0x26fbf1e03628ac787377d3e309d18c04d005d31743b650400e6da40539474c79",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -149,7 +149,7 @@
                     }
                 },
                 {
-                    "hash" : "11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc",
+                    "hash" : "0x11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 1,
@@ -157,7 +157,7 @@
                     }
                 },
                 {
-                    "hash" : "26fbf1e03628ac787377d3e309d18c04d005d31743b650400e6da40539474c79",
+                    "hash" : "0x26fbf1e03628ac787377d3e309d18c04d005d31743b650400e6da40539474c79",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -165,7 +165,7 @@
                     }
                 },
                 {
-                    "hash" : "11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc",
+                    "hash" : "0x11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 1,
@@ -173,7 +173,7 @@
                     }
                 },
                 {
-                    "hash" : "26fbf1e03628ac787377d3e309d18c04d005d31743b650400e6da40539474c79",
+                    "hash" : "0x26fbf1e03628ac787377d3e309d18c04d005d31743b650400e6da40539474c79",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 0,
@@ -181,7 +181,7 @@
                     }
                 },
                 {
-                    "hash" : "11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc",
+                    "hash" : "0x11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 1,
@@ -189,7 +189,7 @@
                     }
                 },
                 {
-                    "hash" : "26fbf1e03628ac787377d3e309d18c04d005d31743b650400e6da40539474c79",
+                    "hash" : "0x26fbf1e03628ac787377d3e309d18c04d005d31743b650400e6da40539474c79",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 0,
@@ -197,7 +197,7 @@
                     }
                 },
                 {
-                    "hash" : "11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc",
+                    "hash" : "0x11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 1,
@@ -207,7 +207,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "070f9dec5ea98b79d4cc71a6e2fb99f40d90862131f8e23331c3a0a580f2dccd",
+                    "hash" : "0x070f9dec5ea98b79d4cc71a6e2fb99f40d90862131f8e23331c3a0a580f2dccd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -215,7 +215,7 @@
                     }
                 },
                 {
-                    "hash" : "11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc",
+                    "hash" : "0x11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -223,7 +223,7 @@
                     }
                 },
                 {
-                    "hash" : "070f9dec5ea98b79d4cc71a6e2fb99f40d90862131f8e23331c3a0a580f2dccd",
+                    "hash" : "0x070f9dec5ea98b79d4cc71a6e2fb99f40d90862131f8e23331c3a0a580f2dccd",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -231,7 +231,7 @@
                     }
                 },
                 {
-                    "hash" : "11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc",
+                    "hash" : "0x11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -239,7 +239,7 @@
                     }
                 },
                 {
-                    "hash" : "070f9dec5ea98b79d4cc71a6e2fb99f40d90862131f8e23331c3a0a580f2dccd",
+                    "hash" : "0x070f9dec5ea98b79d4cc71a6e2fb99f40d90862131f8e23331c3a0a580f2dccd",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -247,7 +247,7 @@
                     }
                 },
                 {
-                    "hash" : "11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc",
+                    "hash" : "0x11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 1,
@@ -255,7 +255,7 @@
                     }
                 },
                 {
-                    "hash" : "070f9dec5ea98b79d4cc71a6e2fb99f40d90862131f8e23331c3a0a580f2dccd",
+                    "hash" : "0x070f9dec5ea98b79d4cc71a6e2fb99f40d90862131f8e23331c3a0a580f2dccd",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -263,7 +263,7 @@
                     }
                 },
                 {
-                    "hash" : "11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc",
+                    "hash" : "0x11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 1,
@@ -271,7 +271,7 @@
                     }
                 },
                 {
-                    "hash" : "070f9dec5ea98b79d4cc71a6e2fb99f40d90862131f8e23331c3a0a580f2dccd",
+                    "hash" : "0x070f9dec5ea98b79d4cc71a6e2fb99f40d90862131f8e23331c3a0a580f2dccd",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 0,
@@ -279,7 +279,7 @@
                     }
                 },
                 {
-                    "hash" : "11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc",
+                    "hash" : "0x11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 1,
@@ -287,7 +287,7 @@
                     }
                 },
                 {
-                    "hash" : "070f9dec5ea98b79d4cc71a6e2fb99f40d90862131f8e23331c3a0a580f2dccd",
+                    "hash" : "0x070f9dec5ea98b79d4cc71a6e2fb99f40d90862131f8e23331c3a0a580f2dccd",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 0,
@@ -295,7 +295,7 @@
                     }
                 },
                 {
-                    "hash" : "11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc",
+                    "hash" : "0x11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 1,
@@ -305,7 +305,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "070f9dec5ea98b79d4cc71a6e2fb99f40d90862131f8e23331c3a0a580f2dccd",
+                    "hash" : "0x070f9dec5ea98b79d4cc71a6e2fb99f40d90862131f8e23331c3a0a580f2dccd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -313,7 +313,7 @@
                     }
                 },
                 {
-                    "hash" : "11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc",
+                    "hash" : "0x11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -321,7 +321,7 @@
                     }
                 },
                 {
-                    "hash" : "070f9dec5ea98b79d4cc71a6e2fb99f40d90862131f8e23331c3a0a580f2dccd",
+                    "hash" : "0x070f9dec5ea98b79d4cc71a6e2fb99f40d90862131f8e23331c3a0a580f2dccd",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -329,7 +329,7 @@
                     }
                 },
                 {
-                    "hash" : "11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc",
+                    "hash" : "0x11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -337,7 +337,7 @@
                     }
                 },
                 {
-                    "hash" : "070f9dec5ea98b79d4cc71a6e2fb99f40d90862131f8e23331c3a0a580f2dccd",
+                    "hash" : "0x070f9dec5ea98b79d4cc71a6e2fb99f40d90862131f8e23331c3a0a580f2dccd",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -345,7 +345,7 @@
                     }
                 },
                 {
-                    "hash" : "11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc",
+                    "hash" : "0x11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 1,
@@ -353,7 +353,7 @@
                     }
                 },
                 {
-                    "hash" : "070f9dec5ea98b79d4cc71a6e2fb99f40d90862131f8e23331c3a0a580f2dccd",
+                    "hash" : "0x070f9dec5ea98b79d4cc71a6e2fb99f40d90862131f8e23331c3a0a580f2dccd",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -361,7 +361,7 @@
                     }
                 },
                 {
-                    "hash" : "11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc",
+                    "hash" : "0x11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 1,
@@ -369,7 +369,7 @@
                     }
                 },
                 {
-                    "hash" : "070f9dec5ea98b79d4cc71a6e2fb99f40d90862131f8e23331c3a0a580f2dccd",
+                    "hash" : "0x070f9dec5ea98b79d4cc71a6e2fb99f40d90862131f8e23331c3a0a580f2dccd",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 0,
@@ -377,7 +377,7 @@
                     }
                 },
                 {
-                    "hash" : "11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc",
+                    "hash" : "0x11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 1,
@@ -385,7 +385,7 @@
                     }
                 },
                 {
-                    "hash" : "070f9dec5ea98b79d4cc71a6e2fb99f40d90862131f8e23331c3a0a580f2dccd",
+                    "hash" : "0x070f9dec5ea98b79d4cc71a6e2fb99f40d90862131f8e23331c3a0a580f2dccd",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 0,
@@ -393,7 +393,7 @@
                     }
                 },
                 {
-                    "hash" : "11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc",
+                    "hash" : "0x11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 1,
@@ -403,7 +403,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "60b9ed910a10118d39799374bf0defc97313bbbc449a621cbf7eb3d4d68ad450",
+                    "hash" : "0x60b9ed910a10118d39799374bf0defc97313bbbc449a621cbf7eb3d4d68ad450",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -411,7 +411,7 @@
                     }
                 },
                 {
-                    "hash" : "60b9ed910a10118d39799374bf0defc97313bbbc449a621cbf7eb3d4d68ad450",
+                    "hash" : "0x60b9ed910a10118d39799374bf0defc97313bbbc449a621cbf7eb3d4d68ad450",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -419,7 +419,7 @@
                     }
                 },
                 {
-                    "hash" : "11b003005214b4ec1532ec3381f60107b974a1c242f52787ca40d3f3fe3672b4",
+                    "hash" : "0x11b003005214b4ec1532ec3381f60107b974a1c242f52787ca40d3f3fe3672b4",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -427,7 +427,7 @@
                     }
                 },
                 {
-                    "hash" : "11b003005214b4ec1532ec3381f60107b974a1c242f52787ca40d3f3fe3672b4",
+                    "hash" : "0x11b003005214b4ec1532ec3381f60107b974a1c242f52787ca40d3f3fe3672b4",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -435,7 +435,7 @@
                     }
                 },
                 {
-                    "hash" : "26fbf1e03628ac787377d3e309d18c04d005d31743b650400e6da40539474c79",
+                    "hash" : "0x26fbf1e03628ac787377d3e309d18c04d005d31743b650400e6da40539474c79",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -443,7 +443,7 @@
                     }
                 },
                 {
-                    "hash" : "11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc",
+                    "hash" : "0x11bd0a7dd947e26013b63c7f1dad8e16343c4eec8646222186a4f2cf0ac032bc",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 1,
@@ -451,7 +451,7 @@
                     }
                 },
                 {
-                    "hash" : "11b003005214b4ec1532ec3381f60107b974a1c242f52787ca40d3f3fe3672b4",
+                    "hash" : "0x11b003005214b4ec1532ec3381f60107b974a1c242f52787ca40d3f3fe3672b4",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -459,7 +459,7 @@
                     }
                 },
                 {
-                    "hash" : "11b003005214b4ec1532ec3381f60107b974a1c242f52787ca40d3f3fe3672b4",
+                    "hash" : "0x11b003005214b4ec1532ec3381f60107b974a1c242f52787ca40d3f3fe3672b4",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 1,
@@ -467,7 +467,7 @@
                     }
                 },
                 {
-                    "hash" : "11b003005214b4ec1532ec3381f60107b974a1c242f52787ca40d3f3fe3672b4",
+                    "hash" : "0x11b003005214b4ec1532ec3381f60107b974a1c242f52787ca40d3f3fe3672b4",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 0,
@@ -475,7 +475,7 @@
                     }
                 },
                 {
-                    "hash" : "11b003005214b4ec1532ec3381f60107b974a1c242f52787ca40d3f3fe3672b4",
+                    "hash" : "0x11b003005214b4ec1532ec3381f60107b974a1c242f52787ca40d3f3fe3672b4",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 1,
@@ -483,7 +483,7 @@
                     }
                 },
                 {
-                    "hash" : "11b003005214b4ec1532ec3381f60107b974a1c242f52787ca40d3f3fe3672b4",
+                    "hash" : "0x11b003005214b4ec1532ec3381f60107b974a1c242f52787ca40d3f3fe3672b4",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 0,
@@ -491,7 +491,7 @@
                     }
                 },
                 {
-                    "hash" : "11b003005214b4ec1532ec3381f60107b974a1c242f52787ca40d3f3fe3672b4",
+                    "hash" : "0x11b003005214b4ec1532ec3381f60107b974a1c242f52787ca40d3f3fe3672b4",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 1,
@@ -501,58 +501,58 @@
             ]
         },
         "pre" : {
-            "a000000000000000000000000000000000000000" : {
+            "0xa000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x60206000600060006000600035620249f0f1600155600051600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a100000000000000000000000000000000000000" : {
+            "0xa100000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260206000fd",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a200000000000000000000000000000000000000" : {
+            "0xa200000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006000fd",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a300000000000000000000000000000000000000" : {
+            "0xa300000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x6c726576657274656420646174616000556d726576657274206d6573736167656000526e0fffffffffffffffffffffffffffff6000fd",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a400000000000000000000000000000000000000" : {
+            "0xa400000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x6c726576657274656420646174616000556d726576657274206d6573736167656000526000610100fd",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a500000000000000000000000000000000000000" : {
+            "0xa500000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006001fd",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a600000000000000000000000000000000000000" : {
+            "0xa600000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006e0ffffffffffffffffffffffffffffffd",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -568,15 +568,15 @@
                 "000000000000000000000000a600000000000000000000000000000000000000"
             ],
             "gasLimit" : [
-                "800000",
-                "70000"
+                "0x0c3500",
+                "0x011170"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "a000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xa000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stRevertTest/RevertPrecompiledTouch.json b/GeneralStateTests/stRevertTest/RevertPrecompiledTouch.json
index 981982b51..4080c0158 100644
--- a/GeneralStateTests/stRevertTest/RevertPrecompiledTouch.json
+++ b/GeneralStateTests/stRevertTest/RevertPrecompiledTouch.json
@@ -1,17 +1,17 @@
 {
     "RevertPrecompiledTouch" : {
         "env" : {
-            "currentCoinbase" : "68795C4AA09D6f4Ed3E5DeDDf8c2AD3049A601da",
+            "currentCoinbase" : "0x68795C4AA09D6f4Ed3E5DeDDf8c2AD3049A601da",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x3d37ef",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "424be5185a107f496bf82f63a1f0e0c533ff5913687ed87c4fd198637c439340",
+                    "hash" : "0x424be5185a107f496bf82f63a1f0e0c533ff5913687ed87c4fd198637c439340",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "424be5185a107f496bf82f63a1f0e0c533ff5913687ed87c4fd198637c439340",
+                    "hash" : "0x424be5185a107f496bf82f63a1f0e0c533ff5913687ed87c4fd198637c439340",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "424be5185a107f496bf82f63a1f0e0c533ff5913687ed87c4fd198637c439340",
+                    "hash" : "0x424be5185a107f496bf82f63a1f0e0c533ff5913687ed87c4fd198637c439340",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "424be5185a107f496bf82f63a1f0e0c533ff5913687ed87c4fd198637c439340",
+                    "hash" : "0x424be5185a107f496bf82f63a1f0e0c533ff5913687ed87c4fd198637c439340",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "424be5185a107f496bf82f63a1f0e0c533ff5913687ed87c4fd198637c439340",
+                    "hash" : "0x424be5185a107f496bf82f63a1f0e0c533ff5913687ed87c4fd198637c439340",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,70 +61,70 @@
             ]
         },
         "pre" : {
-            "0000000000000000000000000000000000000001" : {
+            "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0000000000000000000000000000000000000002" : {
+            "0x0000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0000000000000000000000000000000000000003" : {
+            "0x0000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0000000000000000000000000000000000000004" : {
+            "0x0000000000000000000000000000000000000004" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0000000000000000000000000000000000000005" : {
+            "0x0000000000000000000000000000000000000005" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0000000000000000000000000000000000000006" : {
+            "0x0000000000000000000000000000000000000006" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0000000000000000000000000000000000000007" : {
+            "0x0000000000000000000000000000000000000007" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0000000000000000000000000000000000000008" : {
+            "0x0000000000000000000000000000000000000008" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x60006000600060006000600161c350f15060006000600060006000600261c350f15060006000600060006000600361c350f15060006000600060006000600461c350f15060006000600060006000600561c350f15060006000600060006000600661c350f15060006000600060006000600761c350f15060006000600060006000600861c350f1505a6001555a6002555a600355",
                 "nonce" : "0x00",
@@ -137,14 +137,14 @@
                 ""
             ],
             "gasLimit" : [
-                "60000"
+                "0xea60"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x01",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stRevertTest/RevertPrecompiledTouchCC.json b/GeneralStateTests/stRevertTest/RevertPrecompiledTouchCC.json
index 7cd0441d5..3b3eaf1e2 100644
--- a/GeneralStateTests/stRevertTest/RevertPrecompiledTouchCC.json
+++ b/GeneralStateTests/stRevertTest/RevertPrecompiledTouchCC.json
@@ -1,17 +1,17 @@
 {
     "RevertPrecompiledTouchCC" : {
         "env" : {
-            "currentCoinbase" : "68795C4AA09D6f4Ed3E5DeDDf8c2AD3049A601da",
+            "currentCoinbase" : "0x68795C4AA09D6f4Ed3E5DeDDf8c2AD3049A601da",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x3d37ef",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "de48a41a0688b373a48fd2e17d4c4221a8c3c8fd0b7d15318bb40c4320418dee",
+                    "hash" : "0xde48a41a0688b373a48fd2e17d4c4221a8c3c8fd0b7d15318bb40c4320418dee",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "de48a41a0688b373a48fd2e17d4c4221a8c3c8fd0b7d15318bb40c4320418dee",
+                    "hash" : "0xde48a41a0688b373a48fd2e17d4c4221a8c3c8fd0b7d15318bb40c4320418dee",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "de48a41a0688b373a48fd2e17d4c4221a8c3c8fd0b7d15318bb40c4320418dee",
+                    "hash" : "0xde48a41a0688b373a48fd2e17d4c4221a8c3c8fd0b7d15318bb40c4320418dee",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "de48a41a0688b373a48fd2e17d4c4221a8c3c8fd0b7d15318bb40c4320418dee",
+                    "hash" : "0xde48a41a0688b373a48fd2e17d4c4221a8c3c8fd0b7d15318bb40c4320418dee",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "de48a41a0688b373a48fd2e17d4c4221a8c3c8fd0b7d15318bb40c4320418dee",
+                    "hash" : "0xde48a41a0688b373a48fd2e17d4c4221a8c3c8fd0b7d15318bb40c4320418dee",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,70 +61,70 @@
             ]
         },
         "pre" : {
-            "0000000000000000000000000000000000000001" : {
+            "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0000000000000000000000000000000000000002" : {
+            "0x0000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0000000000000000000000000000000000000003" : {
+            "0x0000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0000000000000000000000000000000000000004" : {
+            "0x0000000000000000000000000000000000000004" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0000000000000000000000000000000000000005" : {
+            "0x0000000000000000000000000000000000000005" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0000000000000000000000000000000000000006" : {
+            "0x0000000000000000000000000000000000000006" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0000000000000000000000000000000000000007" : {
+            "0x0000000000000000000000000000000000000007" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0000000000000000000000000000000000000008" : {
+            "0x0000000000000000000000000000000000000008" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x60006000600060006000600161c350f25060006000600060006000600261c350f25060006000600060006000600361c350f25060006000600060006000600461c350f25060006000600060006000600561c350f25060006000600060006000600661c350f25060006000600060006000600761c350f25060006000600060006000600861c350f2505a6001555a6002555a600355",
                 "nonce" : "0x00",
@@ -137,14 +137,14 @@
                 ""
             ],
             "gasLimit" : [
-                "60000"
+                "0xea60"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x01",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stRevertTest/RevertPrecompiledTouchDC.json b/GeneralStateTests/stRevertTest/RevertPrecompiledTouchDC.json
index c9dc54355..2eb4060f6 100644
--- a/GeneralStateTests/stRevertTest/RevertPrecompiledTouchDC.json
+++ b/GeneralStateTests/stRevertTest/RevertPrecompiledTouchDC.json
@@ -1,17 +1,17 @@
 {
     "RevertPrecompiledTouchDC" : {
         "env" : {
-            "currentCoinbase" : "68795C4AA09D6f4Ed3E5DeDDf8c2AD3049A601da",
+            "currentCoinbase" : "0x68795C4AA09D6f4Ed3E5DeDDf8c2AD3049A601da",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x3d37ef",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f6e61932177156675bc1f56bafea0999e78ccd7e47c86e549cc5ece7b65a1824",
+                    "hash" : "0xf6e61932177156675bc1f56bafea0999e78ccd7e47c86e549cc5ece7b65a1824",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f6e61932177156675bc1f56bafea0999e78ccd7e47c86e549cc5ece7b65a1824",
+                    "hash" : "0xf6e61932177156675bc1f56bafea0999e78ccd7e47c86e549cc5ece7b65a1824",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f6e61932177156675bc1f56bafea0999e78ccd7e47c86e549cc5ece7b65a1824",
+                    "hash" : "0xf6e61932177156675bc1f56bafea0999e78ccd7e47c86e549cc5ece7b65a1824",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f6e61932177156675bc1f56bafea0999e78ccd7e47c86e549cc5ece7b65a1824",
+                    "hash" : "0xf6e61932177156675bc1f56bafea0999e78ccd7e47c86e549cc5ece7b65a1824",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f6e61932177156675bc1f56bafea0999e78ccd7e47c86e549cc5ece7b65a1824",
+                    "hash" : "0xf6e61932177156675bc1f56bafea0999e78ccd7e47c86e549cc5ece7b65a1824",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,70 +61,70 @@
             ]
         },
         "pre" : {
-            "0000000000000000000000000000000000000001" : {
+            "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0000000000000000000000000000000000000002" : {
+            "0x0000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0000000000000000000000000000000000000003" : {
+            "0x0000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0000000000000000000000000000000000000004" : {
+            "0x0000000000000000000000000000000000000004" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0000000000000000000000000000000000000005" : {
+            "0x0000000000000000000000000000000000000005" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0000000000000000000000000000000000000006" : {
+            "0x0000000000000000000000000000000000000006" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0000000000000000000000000000000000000007" : {
+            "0x0000000000000000000000000000000000000007" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0000000000000000000000000000000000000008" : {
+            "0x0000000000000000000000000000000000000008" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x6000600060006000600161c350f4506000600060006000600261c350f4506000600060006000600361c350f4506000600060006000600461c350f4506000600060006000600561c350f4506000600060006000600661c350f4506000600060006000600761c350f4506000600060006000600861c350f4505a6001555a6002555a600355",
                 "nonce" : "0x00",
@@ -137,14 +137,14 @@
                 ""
             ],
             "gasLimit" : [
-                "60000"
+                "0xea60"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x01",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stRevertTest/RevertPrefound.json b/GeneralStateTests/stRevertTest/RevertPrefound.json
index 85049566f..aded5dacb 100644
--- a/GeneralStateTests/stRevertTest/RevertPrefound.json
+++ b/GeneralStateTests/stRevertTest/RevertPrefound.json
@@ -1,17 +1,17 @@
 {
     "RevertPrefound" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "13e72a366d61652d0793db7748e4403bb523238d390736520834918f4483b030",
+                    "hash" : "0x13e72a366d61652d0793db7748e4403bb523238d390736520834918f4483b030",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "bf9cac93b8f08ed994e2f738612995f8a41f412f1e6756a956e29053646ac96c",
+                    "hash" : "0xbf9cac93b8f08ed994e2f738612995f8a41f412f1e6756a956e29053646ac96c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "13e72a366d61652d0793db7748e4403bb523238d390736520834918f4483b030",
+                    "hash" : "0x13e72a366d61652d0793db7748e4403bb523238d390736520834918f4483b030",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "13e72a366d61652d0793db7748e4403bb523238d390736520834918f4483b030",
+                    "hash" : "0x13e72a366d61652d0793db7748e4403bb523238d390736520834918f4483b030",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "bf9cac93b8f08ed994e2f738612995f8a41f412f1e6756a956e29053646ac96c",
+                    "hash" : "0xbf9cac93b8f08ed994e2f738612995f8a41f412f1e6756a956e29053646ac96c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
+            "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a000000000000000000000000000000000000000" : {
+            "0xa000000000000000000000000000000000000000" : {
                 "balance" : "0x01",
                 "code" : "0x602060006000f0600055600c600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "94000"
+                "0x016f30"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "a000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xa000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stRevertTest/RevertPrefoundCall.json b/GeneralStateTests/stRevertTest/RevertPrefoundCall.json
index 0e01b0ff1..3878db9e7 100644
--- a/GeneralStateTests/stRevertTest/RevertPrefoundCall.json
+++ b/GeneralStateTests/stRevertTest/RevertPrefoundCall.json
@@ -1,17 +1,17 @@
 {
     "RevertPrefoundCall" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "ed72adb985f07be27c7fa0aed129485c9fe288082184d69560967cfca89dccba",
+                    "hash" : "0xed72adb985f07be27c7fa0aed129485c9fe288082184d69560967cfca89dccba",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "ed72adb985f07be27c7fa0aed129485c9fe288082184d69560967cfca89dccba",
+                    "hash" : "0xed72adb985f07be27c7fa0aed129485c9fe288082184d69560967cfca89dccba",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e06a0eec31a3a3ef18732bc4f5ec10475e4791591728e3222ead654c3990343e",
+                    "hash" : "0xe06a0eec31a3a3ef18732bc4f5ec10475e4791591728e3222ead654c3990343e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e06a0eec31a3a3ef18732bc4f5ec10475e4791591728e3222ead654c3990343e",
+                    "hash" : "0xe06a0eec31a3a3ef18732bc4f5ec10475e4791591728e3222ead654c3990343e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "ed72adb985f07be27c7fa0aed129485c9fe288082184d69560967cfca89dccba",
+                    "hash" : "0xed72adb985f07be27c7fa0aed129485c9fe288082184d69560967cfca89dccba",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
+            "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a000000000000000000000000000000000000000" : {
+            "0xa000000000000000000000000000000000000000" : {
                 "balance" : "0x01",
                 "code" : "0x60206000602060006000737db299e0885c85039f56fa504a13dd8ce8a56aa761c350f1600055600c600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "94000"
+                "0x016f30"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "a000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xa000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stRevertTest/RevertPrefoundCallOOG.json b/GeneralStateTests/stRevertTest/RevertPrefoundCallOOG.json
index cdb3d5b98..c8fef31da 100644
--- a/GeneralStateTests/stRevertTest/RevertPrefoundCallOOG.json
+++ b/GeneralStateTests/stRevertTest/RevertPrefoundCallOOG.json
@@ -1,17 +1,17 @@
 {
     "RevertPrefoundCallOOG" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d929a48e85304ee89d27dac9a747049fd1107c6c9511803709ef428d0825e020",
+                    "hash" : "0xd929a48e85304ee89d27dac9a747049fd1107c6c9511803709ef428d0825e020",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d929a48e85304ee89d27dac9a747049fd1107c6c9511803709ef428d0825e020",
+                    "hash" : "0xd929a48e85304ee89d27dac9a747049fd1107c6c9511803709ef428d0825e020",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "d929a48e85304ee89d27dac9a747049fd1107c6c9511803709ef428d0825e020",
+                    "hash" : "0xd929a48e85304ee89d27dac9a747049fd1107c6c9511803709ef428d0825e020",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "d929a48e85304ee89d27dac9a747049fd1107c6c9511803709ef428d0825e020",
+                    "hash" : "0xd929a48e85304ee89d27dac9a747049fd1107c6c9511803709ef428d0825e020",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d929a48e85304ee89d27dac9a747049fd1107c6c9511803709ef428d0825e020",
+                    "hash" : "0xd929a48e85304ee89d27dac9a747049fd1107c6c9511803709ef428d0825e020",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
+            "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a000000000000000000000000000000000000000" : {
+            "0xa000000000000000000000000000000000000000" : {
                 "balance" : "0x01",
                 "code" : "0x60206000602060006000737db299e0885c85039f56fa504a13dd8ce8a56aa761c350f1600055600c600155600c600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "63000"
+                "0xf618"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "a000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xa000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stRevertTest/RevertPrefoundEmpty.json b/GeneralStateTests/stRevertTest/RevertPrefoundEmpty.json
index fe56a209d..b65450738 100644
--- a/GeneralStateTests/stRevertTest/RevertPrefoundEmpty.json
+++ b/GeneralStateTests/stRevertTest/RevertPrefoundEmpty.json
@@ -1,17 +1,17 @@
 {
     "RevertPrefoundEmpty" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7928c8f99a40ee4e90832070c4cb9c8ed2450c32dfe63a4c441fa6b2183e3946",
+                    "hash" : "0x7928c8f99a40ee4e90832070c4cb9c8ed2450c32dfe63a4c441fa6b2183e3946",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c2ea011c70b9915217b5443a28ce2e2831ae80d401946d58b5b6cb98c14a5786",
+                    "hash" : "0xc2ea011c70b9915217b5443a28ce2e2831ae80d401946d58b5b6cb98c14a5786",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "7928c8f99a40ee4e90832070c4cb9c8ed2450c32dfe63a4c441fa6b2183e3946",
+                    "hash" : "0x7928c8f99a40ee4e90832070c4cb9c8ed2450c32dfe63a4c441fa6b2183e3946",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "7928c8f99a40ee4e90832070c4cb9c8ed2450c32dfe63a4c441fa6b2183e3946",
+                    "hash" : "0x7928c8f99a40ee4e90832070c4cb9c8ed2450c32dfe63a4c441fa6b2183e3946",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c2ea011c70b9915217b5443a28ce2e2831ae80d401946d58b5b6cb98c14a5786",
+                    "hash" : "0xc2ea011c70b9915217b5443a28ce2e2831ae80d401946d58b5b6cb98c14a5786",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
+            "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a000000000000000000000000000000000000000" : {
+            "0xa000000000000000000000000000000000000000" : {
                 "balance" : "0x01",
                 "code" : "0x602060006000f0600055600c600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "94000"
+                "0x016f30"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "a000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xa000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stRevertTest/RevertPrefoundEmptyCall.json b/GeneralStateTests/stRevertTest/RevertPrefoundEmptyCall.json
index fb4e8f2a0..874694c4f 100644
--- a/GeneralStateTests/stRevertTest/RevertPrefoundEmptyCall.json
+++ b/GeneralStateTests/stRevertTest/RevertPrefoundEmptyCall.json
@@ -1,17 +1,17 @@
 {
     "RevertPrefoundEmptyCall" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7ded03faa6a98d0e873172b3b0a346b6651730a957883ffd4e38cbc0c2cc7923",
+                    "hash" : "0x7ded03faa6a98d0e873172b3b0a346b6651730a957883ffd4e38cbc0c2cc7923",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "197c27f55074d15725bf77c4d8e87efdd1229bb3857541ee86009870d453d0e2",
+                    "hash" : "0x197c27f55074d15725bf77c4d8e87efdd1229bb3857541ee86009870d453d0e2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a6e1a58acac8171e0e4afe14904ada48877349bb40aa35a05593563e957713cc",
+                    "hash" : "0xa6e1a58acac8171e0e4afe14904ada48877349bb40aa35a05593563e957713cc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a6e1a58acac8171e0e4afe14904ada48877349bb40aa35a05593563e957713cc",
+                    "hash" : "0xa6e1a58acac8171e0e4afe14904ada48877349bb40aa35a05593563e957713cc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "197c27f55074d15725bf77c4d8e87efdd1229bb3857541ee86009870d453d0e2",
+                    "hash" : "0x197c27f55074d15725bf77c4d8e87efdd1229bb3857541ee86009870d453d0e2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
+            "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a000000000000000000000000000000000000000" : {
+            "0xa000000000000000000000000000000000000000" : {
                 "balance" : "0x01",
                 "code" : "0x60206000602060006000737db299e0885c85039f56fa504a13dd8ce8a56aa761c350f1600055600c600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "94000"
+                "0x016f30"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "a000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xa000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stRevertTest/RevertPrefoundEmptyCallOOG.json b/GeneralStateTests/stRevertTest/RevertPrefoundEmptyCallOOG.json
index f00753844..b56d00087 100644
--- a/GeneralStateTests/stRevertTest/RevertPrefoundEmptyCallOOG.json
+++ b/GeneralStateTests/stRevertTest/RevertPrefoundEmptyCallOOG.json
@@ -1,17 +1,17 @@
 {
     "RevertPrefoundEmptyCallOOG" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b14bde7808a9c984b3ec3e9826e246e3318a9f911db888e6c64486b92354d5a3",
+                    "hash" : "0xb14bde7808a9c984b3ec3e9826e246e3318a9f911db888e6c64486b92354d5a3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b14bde7808a9c984b3ec3e9826e246e3318a9f911db888e6c64486b92354d5a3",
+                    "hash" : "0xb14bde7808a9c984b3ec3e9826e246e3318a9f911db888e6c64486b92354d5a3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b14bde7808a9c984b3ec3e9826e246e3318a9f911db888e6c64486b92354d5a3",
+                    "hash" : "0xb14bde7808a9c984b3ec3e9826e246e3318a9f911db888e6c64486b92354d5a3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b14bde7808a9c984b3ec3e9826e246e3318a9f911db888e6c64486b92354d5a3",
+                    "hash" : "0xb14bde7808a9c984b3ec3e9826e246e3318a9f911db888e6c64486b92354d5a3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b14bde7808a9c984b3ec3e9826e246e3318a9f911db888e6c64486b92354d5a3",
+                    "hash" : "0xb14bde7808a9c984b3ec3e9826e246e3318a9f911db888e6c64486b92354d5a3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
+            "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a000000000000000000000000000000000000000" : {
+            "0xa000000000000000000000000000000000000000" : {
                 "balance" : "0x01",
                 "code" : "0x60206000602060006000737db299e0885c85039f56fa504a13dd8ce8a56aa761c350f1600055600c600155600c600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "63000"
+                "0xf618"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "a000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xa000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stRevertTest/RevertPrefoundEmptyOOG.json b/GeneralStateTests/stRevertTest/RevertPrefoundEmptyOOG.json
index 23f94d4d4..46146d8ee 100644
--- a/GeneralStateTests/stRevertTest/RevertPrefoundEmptyOOG.json
+++ b/GeneralStateTests/stRevertTest/RevertPrefoundEmptyOOG.json
@@ -1,17 +1,17 @@
 {
     "RevertPrefoundEmptyOOG" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "3452411abdcb0aec5b56356ed88d77bbec0a0d9fcabad3801ace5b0692fa90a3",
+                    "hash" : "0x3452411abdcb0aec5b56356ed88d77bbec0a0d9fcabad3801ace5b0692fa90a3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "3452411abdcb0aec5b56356ed88d77bbec0a0d9fcabad3801ace5b0692fa90a3",
+                    "hash" : "0x3452411abdcb0aec5b56356ed88d77bbec0a0d9fcabad3801ace5b0692fa90a3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3452411abdcb0aec5b56356ed88d77bbec0a0d9fcabad3801ace5b0692fa90a3",
+                    "hash" : "0x3452411abdcb0aec5b56356ed88d77bbec0a0d9fcabad3801ace5b0692fa90a3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3452411abdcb0aec5b56356ed88d77bbec0a0d9fcabad3801ace5b0692fa90a3",
+                    "hash" : "0x3452411abdcb0aec5b56356ed88d77bbec0a0d9fcabad3801ace5b0692fa90a3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "3452411abdcb0aec5b56356ed88d77bbec0a0d9fcabad3801ace5b0692fa90a3",
+                    "hash" : "0x3452411abdcb0aec5b56356ed88d77bbec0a0d9fcabad3801ace5b0692fa90a3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
+            "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a000000000000000000000000000000000000000" : {
+            "0xa000000000000000000000000000000000000000" : {
                 "balance" : "0x01",
                 "code" : "0x602060006000f0600055600c600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "93000"
+                "0x016b48"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "a000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xa000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stRevertTest/RevertPrefoundOOG.json b/GeneralStateTests/stRevertTest/RevertPrefoundOOG.json
index 0f28354f3..b14005890 100644
--- a/GeneralStateTests/stRevertTest/RevertPrefoundOOG.json
+++ b/GeneralStateTests/stRevertTest/RevertPrefoundOOG.json
@@ -1,17 +1,17 @@
 {
     "RevertPrefoundOOG" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d059b45833134777f23eca1eb256ca5a2451fc5ecea41e0cc8f581faccdf385e",
+                    "hash" : "0xd059b45833134777f23eca1eb256ca5a2451fc5ecea41e0cc8f581faccdf385e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d059b45833134777f23eca1eb256ca5a2451fc5ecea41e0cc8f581faccdf385e",
+                    "hash" : "0xd059b45833134777f23eca1eb256ca5a2451fc5ecea41e0cc8f581faccdf385e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "d059b45833134777f23eca1eb256ca5a2451fc5ecea41e0cc8f581faccdf385e",
+                    "hash" : "0xd059b45833134777f23eca1eb256ca5a2451fc5ecea41e0cc8f581faccdf385e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "d059b45833134777f23eca1eb256ca5a2451fc5ecea41e0cc8f581faccdf385e",
+                    "hash" : "0xd059b45833134777f23eca1eb256ca5a2451fc5ecea41e0cc8f581faccdf385e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d059b45833134777f23eca1eb256ca5a2451fc5ecea41e0cc8f581faccdf385e",
+                    "hash" : "0xd059b45833134777f23eca1eb256ca5a2451fc5ecea41e0cc8f581faccdf385e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
+            "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a000000000000000000000000000000000000000" : {
+            "0xa000000000000000000000000000000000000000" : {
                 "balance" : "0x01",
                 "code" : "0x602060006000f0600055600c600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "93000"
+                "0x016b48"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "a000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xa000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG.json b/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG.json
index 7c21019e3..1e0ddbcfd 100644
--- a/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG.json
+++ b/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG.json
@@ -1,17 +1,17 @@
 {
     "RevertRemoteSubCallStorageOOG" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "04068d2d81730e74a66ab864af1073c8b7ade7c47680d10d782638320f776c20",
+                    "hash" : "0x04068d2d81730e74a66ab864af1073c8b7ade7c47680d10d782638320f776c20",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "0df4cf0474e559e763dd66ca1f543974ae6c675ddf2c7c1deb88274ce226819a",
+                    "hash" : "0x0df4cf0474e559e763dd66ca1f543974ae6c675ddf2c7c1deb88274ce226819a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -27,7 +27,7 @@
                     }
                 },
                 {
-                    "hash" : "55c8e8054f7f508f34286f7016c8a00d0d829ec3d0778bb3204fed4ae04b4607",
+                    "hash" : "0x55c8e8054f7f508f34286f7016c8a00d0d829ec3d0778bb3204fed4ae04b4607",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -37,7 +37,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "04068d2d81730e74a66ab864af1073c8b7ade7c47680d10d782638320f776c20",
+                    "hash" : "0x04068d2d81730e74a66ab864af1073c8b7ade7c47680d10d782638320f776c20",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -45,7 +45,7 @@
                     }
                 },
                 {
-                    "hash" : "991a17af593912ef7be7d526b56e4605271135c8e3f9ab16260ecc53179727ab",
+                    "hash" : "0x991a17af593912ef7be7d526b56e4605271135c8e3f9ab16260ecc53179727ab",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -53,7 +53,7 @@
                     }
                 },
                 {
-                    "hash" : "55c8e8054f7f508f34286f7016c8a00d0d829ec3d0778bb3204fed4ae04b4607",
+                    "hash" : "0x55c8e8054f7f508f34286f7016c8a00d0d829ec3d0778bb3204fed4ae04b4607",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -63,7 +63,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "eb8017c3cc4624d2be7c5c746a416e1ba33c6cdaf57bac91e9a3c368e16e8fd1",
+                    "hash" : "0xeb8017c3cc4624d2be7c5c746a416e1ba33c6cdaf57bac91e9a3c368e16e8fd1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -71,7 +71,7 @@
                     }
                 },
                 {
-                    "hash" : "1d76ca685425229b1bcc27120c269e0134b87b646ba36735ea9e15b8a604a438",
+                    "hash" : "0x1d76ca685425229b1bcc27120c269e0134b87b646ba36735ea9e15b8a604a438",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -79,7 +79,7 @@
                     }
                 },
                 {
-                    "hash" : "55c8e8054f7f508f34286f7016c8a00d0d829ec3d0778bb3204fed4ae04b4607",
+                    "hash" : "0x55c8e8054f7f508f34286f7016c8a00d0d829ec3d0778bb3204fed4ae04b4607",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -89,7 +89,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "eb8017c3cc4624d2be7c5c746a416e1ba33c6cdaf57bac91e9a3c368e16e8fd1",
+                    "hash" : "0xeb8017c3cc4624d2be7c5c746a416e1ba33c6cdaf57bac91e9a3c368e16e8fd1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -97,7 +97,7 @@
                     }
                 },
                 {
-                    "hash" : "1d76ca685425229b1bcc27120c269e0134b87b646ba36735ea9e15b8a604a438",
+                    "hash" : "0x1d76ca685425229b1bcc27120c269e0134b87b646ba36735ea9e15b8a604a438",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -105,7 +105,7 @@
                     }
                 },
                 {
-                    "hash" : "55c8e8054f7f508f34286f7016c8a00d0d829ec3d0778bb3204fed4ae04b4607",
+                    "hash" : "0x55c8e8054f7f508f34286f7016c8a00d0d829ec3d0778bb3204fed4ae04b4607",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -115,7 +115,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "04068d2d81730e74a66ab864af1073c8b7ade7c47680d10d782638320f776c20",
+                    "hash" : "0x04068d2d81730e74a66ab864af1073c8b7ade7c47680d10d782638320f776c20",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -123,7 +123,7 @@
                     }
                 },
                 {
-                    "hash" : "991a17af593912ef7be7d526b56e4605271135c8e3f9ab16260ecc53179727ab",
+                    "hash" : "0x991a17af593912ef7be7d526b56e4605271135c8e3f9ab16260ecc53179727ab",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -131,7 +131,7 @@
                     }
                 },
                 {
-                    "hash" : "55c8e8054f7f508f34286f7016c8a00d0d829ec3d0778bb3204fed4ae04b4607",
+                    "hash" : "0x55c8e8054f7f508f34286f7016c8a00d0d829ec3d0778bb3204fed4ae04b4607",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -141,16 +141,16 @@
             ]
         },
         "pre" : {
-            "a000000000000000000000000000000000000000" : {
+            "0xa000000000000000000000000000000000000000" : {
                 "balance" : "0x01",
                 "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c414610049578063c040622614610058575b610000565b346100005761005661007f565b005b346100005761006561008a565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b6000600060405161016f80610163833901809050604051809103906000f080156100005790508073ffffffffffffffffffffffffffffffffffffffff166373027f6d306040518263ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001915050600060405180830381600087803b156100005760325a03f11561000057505050600d600181905550600191505b50905600606060405234610000575b610156806100196000396000f30060606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806373027f6d1461003e575b610000565b346100005761006f600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610071565b005b8073ffffffffffffffffffffffffffffffffffffffff1660405180807f73746f7228290000000000000000000000000000000000000000000000000000815250600601905060405180910390207c010000000000000000000000000000000000000000000000000000000090046040518163ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018090506000604051808303816000876161da5a03f192505050505b505600a165627a7a72305820db9c9d1f37fd36768131a0bf9687f465e15b0503452e603be6b6f07b70d72e260029a165627a7a72305820f8ff2f7feef24d01a1cc070e67db9e15ac34810c8e5d1c7f34f3c38148eeae900029",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -161,16 +161,16 @@
                 "0xc0406226"
             ],
             "gasLimit" : [
-                "148000",
-                "181000",
-                "145000"
+                "0x024220",
+                "0x02c308",
+                "0x023668"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "a000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xa000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG2.json b/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG2.json
index 101fbfe6f..3fca170d5 100644
--- a/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG2.json
+++ b/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG2.json
@@ -1,17 +1,17 @@
 {
     "RevertRemoteSubCallStorageOOG2" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d2c01284b0648a4b5dc0fda0cb1cf0278549930aef7a3d6f2f7060eb12fb13cf",
+                    "hash" : "0xd2c01284b0648a4b5dc0fda0cb1cf0278549930aef7a3d6f2f7060eb12fb13cf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "d2c01284b0648a4b5dc0fda0cb1cf0278549930aef7a3d6f2f7060eb12fb13cf",
+                    "hash" : "0xd2c01284b0648a4b5dc0fda0cb1cf0278549930aef7a3d6f2f7060eb12fb13cf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -27,7 +27,7 @@
                     }
                 },
                 {
-                    "hash" : "c06202a27f33b4314aace545da9d82fddd233f9c927e8736af75c612fbe94216",
+                    "hash" : "0xc06202a27f33b4314aace545da9d82fddd233f9c927e8736af75c612fbe94216",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -37,7 +37,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "74724ec28c6efcabe715b59397c0141bd023d845cefdeb7bd69e7967827c9e3e",
+                    "hash" : "0x74724ec28c6efcabe715b59397c0141bd023d845cefdeb7bd69e7967827c9e3e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -45,7 +45,7 @@
                     }
                 },
                 {
-                    "hash" : "74724ec28c6efcabe715b59397c0141bd023d845cefdeb7bd69e7967827c9e3e",
+                    "hash" : "0x74724ec28c6efcabe715b59397c0141bd023d845cefdeb7bd69e7967827c9e3e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -53,7 +53,7 @@
                     }
                 },
                 {
-                    "hash" : "c06202a27f33b4314aace545da9d82fddd233f9c927e8736af75c612fbe94216",
+                    "hash" : "0xc06202a27f33b4314aace545da9d82fddd233f9c927e8736af75c612fbe94216",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -63,7 +63,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b3567d3bcac54b002ffec737200094bbbb870b506fa1c2470f35aa40ab04d2ea",
+                    "hash" : "0xb3567d3bcac54b002ffec737200094bbbb870b506fa1c2470f35aa40ab04d2ea",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -71,7 +71,7 @@
                     }
                 },
                 {
-                    "hash" : "b3567d3bcac54b002ffec737200094bbbb870b506fa1c2470f35aa40ab04d2ea",
+                    "hash" : "0xb3567d3bcac54b002ffec737200094bbbb870b506fa1c2470f35aa40ab04d2ea",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -79,7 +79,7 @@
                     }
                 },
                 {
-                    "hash" : "c06202a27f33b4314aace545da9d82fddd233f9c927e8736af75c612fbe94216",
+                    "hash" : "0xc06202a27f33b4314aace545da9d82fddd233f9c927e8736af75c612fbe94216",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -89,7 +89,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b3567d3bcac54b002ffec737200094bbbb870b506fa1c2470f35aa40ab04d2ea",
+                    "hash" : "0xb3567d3bcac54b002ffec737200094bbbb870b506fa1c2470f35aa40ab04d2ea",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -97,7 +97,7 @@
                     }
                 },
                 {
-                    "hash" : "b3567d3bcac54b002ffec737200094bbbb870b506fa1c2470f35aa40ab04d2ea",
+                    "hash" : "0xb3567d3bcac54b002ffec737200094bbbb870b506fa1c2470f35aa40ab04d2ea",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -105,7 +105,7 @@
                     }
                 },
                 {
-                    "hash" : "c06202a27f33b4314aace545da9d82fddd233f9c927e8736af75c612fbe94216",
+                    "hash" : "0xc06202a27f33b4314aace545da9d82fddd233f9c927e8736af75c612fbe94216",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -115,7 +115,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "74724ec28c6efcabe715b59397c0141bd023d845cefdeb7bd69e7967827c9e3e",
+                    "hash" : "0x74724ec28c6efcabe715b59397c0141bd023d845cefdeb7bd69e7967827c9e3e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -123,7 +123,7 @@
                     }
                 },
                 {
-                    "hash" : "74724ec28c6efcabe715b59397c0141bd023d845cefdeb7bd69e7967827c9e3e",
+                    "hash" : "0x74724ec28c6efcabe715b59397c0141bd023d845cefdeb7bd69e7967827c9e3e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -131,7 +131,7 @@
                     }
                 },
                 {
-                    "hash" : "c06202a27f33b4314aace545da9d82fddd233f9c927e8736af75c612fbe94216",
+                    "hash" : "0xc06202a27f33b4314aace545da9d82fddd233f9c927e8736af75c612fbe94216",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -141,16 +141,16 @@
             ]
         },
         "pre" : {
-            "a000000000000000000000000000000000000000" : {
+            "0xa000000000000000000000000000000000000000" : {
                 "balance" : "0x01",
                 "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c414610049578063c040622614610058575b610000565b346100005761005661007f565b005b346100005761006561008a565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b6000600060405161016f8061016b833901809050604051809103906000f080156100005790508073ffffffffffffffffffffffffffffffffffffffff166373027f6d306040518263ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001915050600060405180830381600087803b156100005760325a03f11561000057505050600d600081905550600e600181905550600191505b50905600606060405234610000575b610156806100196000396000f30060606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806373027f6d1461003e575b610000565b346100005761006f600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610071565b005b8073ffffffffffffffffffffffffffffffffffffffff1660405180807f73746f7228290000000000000000000000000000000000000000000000000000815250600601905060405180910390207c010000000000000000000000000000000000000000000000000000000090046040518163ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018090506000604051808303816000876161da5a03f192505050505b505600a165627a7a723058201d40a4f4ab84c9ed5c1e6f9e4574875993931efb14de8c4fc6be556ceeef5cc20029a165627a7a72305820b3260ed34e660b9533216c5881783a6cc70a072f3dc8d26e835c4d14c3c2a7890029",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -161,16 +161,16 @@
                 "0xc0406226"
             ],
             "gasLimit" : [
-                "170000",
-                "181000",
-                "145000"
+                "0x029810",
+                "0x02c308",
+                "0x023668"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "a000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xa000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG.json b/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG.json
index 11fefe53c..b071b11ec 100644
--- a/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG.json
+++ b/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG.json
@@ -1,17 +1,17 @@
 {
     "RevertSubCallStorageOOG" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "67a9eb69bb5ed24c9f1da061d32d7faa6dd658fe46ed4157d22ab990eb87ee1d",
+                    "hash" : "0x67a9eb69bb5ed24c9f1da061d32d7faa6dd658fe46ed4157d22ab990eb87ee1d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "67a9eb69bb5ed24c9f1da061d32d7faa6dd658fe46ed4157d22ab990eb87ee1d",
+                    "hash" : "0x67a9eb69bb5ed24c9f1da061d32d7faa6dd658fe46ed4157d22ab990eb87ee1d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -27,7 +27,7 @@
                     }
                 },
                 {
-                    "hash" : "c7a23c4726c66e9ebf0e3f467d0bb73cf761315adacab2e5a0789df256070900",
+                    "hash" : "0xc7a23c4726c66e9ebf0e3f467d0bb73cf761315adacab2e5a0789df256070900",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -35,7 +35,7 @@
                     }
                 },
                 {
-                    "hash" : "d32c212c33ef5f828ae5d5ec88a9a5073ded539cc115abff89d79d54374d9f16",
+                    "hash" : "0xd32c212c33ef5f828ae5d5ec88a9a5073ded539cc115abff89d79d54374d9f16",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -45,7 +45,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "67a9eb69bb5ed24c9f1da061d32d7faa6dd658fe46ed4157d22ab990eb87ee1d",
+                    "hash" : "0x67a9eb69bb5ed24c9f1da061d32d7faa6dd658fe46ed4157d22ab990eb87ee1d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -53,7 +53,7 @@
                     }
                 },
                 {
-                    "hash" : "67a9eb69bb5ed24c9f1da061d32d7faa6dd658fe46ed4157d22ab990eb87ee1d",
+                    "hash" : "0x67a9eb69bb5ed24c9f1da061d32d7faa6dd658fe46ed4157d22ab990eb87ee1d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,7 +61,7 @@
                     }
                 },
                 {
-                    "hash" : "c7a23c4726c66e9ebf0e3f467d0bb73cf761315adacab2e5a0789df256070900",
+                    "hash" : "0xc7a23c4726c66e9ebf0e3f467d0bb73cf761315adacab2e5a0789df256070900",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -69,7 +69,7 @@
                     }
                 },
                 {
-                    "hash" : "d32c212c33ef5f828ae5d5ec88a9a5073ded539cc115abff89d79d54374d9f16",
+                    "hash" : "0xd32c212c33ef5f828ae5d5ec88a9a5073ded539cc115abff89d79d54374d9f16",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -79,7 +79,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "67a9eb69bb5ed24c9f1da061d32d7faa6dd658fe46ed4157d22ab990eb87ee1d",
+                    "hash" : "0x67a9eb69bb5ed24c9f1da061d32d7faa6dd658fe46ed4157d22ab990eb87ee1d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -87,7 +87,7 @@
                     }
                 },
                 {
-                    "hash" : "67a9eb69bb5ed24c9f1da061d32d7faa6dd658fe46ed4157d22ab990eb87ee1d",
+                    "hash" : "0x67a9eb69bb5ed24c9f1da061d32d7faa6dd658fe46ed4157d22ab990eb87ee1d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -95,7 +95,7 @@
                     }
                 },
                 {
-                    "hash" : "c7a23c4726c66e9ebf0e3f467d0bb73cf761315adacab2e5a0789df256070900",
+                    "hash" : "0xc7a23c4726c66e9ebf0e3f467d0bb73cf761315adacab2e5a0789df256070900",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -103,7 +103,7 @@
                     }
                 },
                 {
-                    "hash" : "d32c212c33ef5f828ae5d5ec88a9a5073ded539cc115abff89d79d54374d9f16",
+                    "hash" : "0xd32c212c33ef5f828ae5d5ec88a9a5073ded539cc115abff89d79d54374d9f16",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -113,7 +113,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "67a9eb69bb5ed24c9f1da061d32d7faa6dd658fe46ed4157d22ab990eb87ee1d",
+                    "hash" : "0x67a9eb69bb5ed24c9f1da061d32d7faa6dd658fe46ed4157d22ab990eb87ee1d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -121,7 +121,7 @@
                     }
                 },
                 {
-                    "hash" : "67a9eb69bb5ed24c9f1da061d32d7faa6dd658fe46ed4157d22ab990eb87ee1d",
+                    "hash" : "0x67a9eb69bb5ed24c9f1da061d32d7faa6dd658fe46ed4157d22ab990eb87ee1d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -129,7 +129,7 @@
                     }
                 },
                 {
-                    "hash" : "c7a23c4726c66e9ebf0e3f467d0bb73cf761315adacab2e5a0789df256070900",
+                    "hash" : "0xc7a23c4726c66e9ebf0e3f467d0bb73cf761315adacab2e5a0789df256070900",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -137,7 +137,7 @@
                     }
                 },
                 {
-                    "hash" : "d32c212c33ef5f828ae5d5ec88a9a5073ded539cc115abff89d79d54374d9f16",
+                    "hash" : "0xd32c212c33ef5f828ae5d5ec88a9a5073ded539cc115abff89d79d54374d9f16",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -147,7 +147,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "67a9eb69bb5ed24c9f1da061d32d7faa6dd658fe46ed4157d22ab990eb87ee1d",
+                    "hash" : "0x67a9eb69bb5ed24c9f1da061d32d7faa6dd658fe46ed4157d22ab990eb87ee1d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -155,7 +155,7 @@
                     }
                 },
                 {
-                    "hash" : "67a9eb69bb5ed24c9f1da061d32d7faa6dd658fe46ed4157d22ab990eb87ee1d",
+                    "hash" : "0x67a9eb69bb5ed24c9f1da061d32d7faa6dd658fe46ed4157d22ab990eb87ee1d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -163,7 +163,7 @@
                     }
                 },
                 {
-                    "hash" : "c7a23c4726c66e9ebf0e3f467d0bb73cf761315adacab2e5a0789df256070900",
+                    "hash" : "0xc7a23c4726c66e9ebf0e3f467d0bb73cf761315adacab2e5a0789df256070900",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -171,7 +171,7 @@
                     }
                 },
                 {
-                    "hash" : "d32c212c33ef5f828ae5d5ec88a9a5073ded539cc115abff89d79d54374d9f16",
+                    "hash" : "0xd32c212c33ef5f828ae5d5ec88a9a5073ded539cc115abff89d79d54374d9f16",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -181,16 +181,16 @@
             ]
         },
         "pre" : {
-            "a000000000000000000000000000000000000000" : {
+            "0xa000000000000000000000000000000000000000" : {
                 "balance" : "0x01",
                 "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c4146046578063c0406226146052575b6000565b3460005760506076565b005b34600057605c6081565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b600060896076565b600d600181905550600e600281905550600190505b905600a165627a7a723058202a8a75d7d795b5bcb9042fb18b283daa90b999a11ddec892f548732235342eb60029",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -201,16 +201,16 @@
                 "0xc0406226"
             ],
             "gasLimit" : [
-                "81000",
-                "181000"
+                "0x013c68",
+                "0x02c308"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "a000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xa000000000000000000000000000000000000000",
             "value" : [
-                "0",
-                "1"
+                "0x00",
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG2.json b/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG2.json
index ec36eccda..dbfac8eda 100644
--- a/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG2.json
+++ b/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG2.json
@@ -1,17 +1,17 @@
 {
     "RevertSubCallStorageOOG2" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6d4219451c92eff91d7a6404f8dfd48fe36b087480a2eb7e5cb8efaaf12bc109",
+                    "hash" : "0x6d4219451c92eff91d7a6404f8dfd48fe36b087480a2eb7e5cb8efaaf12bc109",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "6d4219451c92eff91d7a6404f8dfd48fe36b087480a2eb7e5cb8efaaf12bc109",
+                    "hash" : "0x6d4219451c92eff91d7a6404f8dfd48fe36b087480a2eb7e5cb8efaaf12bc109",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -27,7 +27,7 @@
                     }
                 },
                 {
-                    "hash" : "cf684bf367af93683536de7327a3873e72f3d8674deefc114b7c8aabc782ca32",
+                    "hash" : "0xcf684bf367af93683536de7327a3873e72f3d8674deefc114b7c8aabc782ca32",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -35,7 +35,7 @@
                     }
                 },
                 {
-                    "hash" : "c61bcc459fec38f4a7c3ee32e2a4f6d4578d165ac45505bffa98b53a305e8d15",
+                    "hash" : "0xc61bcc459fec38f4a7c3ee32e2a4f6d4578d165ac45505bffa98b53a305e8d15",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -45,7 +45,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6d4219451c92eff91d7a6404f8dfd48fe36b087480a2eb7e5cb8efaaf12bc109",
+                    "hash" : "0x6d4219451c92eff91d7a6404f8dfd48fe36b087480a2eb7e5cb8efaaf12bc109",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -53,7 +53,7 @@
                     }
                 },
                 {
-                    "hash" : "6d4219451c92eff91d7a6404f8dfd48fe36b087480a2eb7e5cb8efaaf12bc109",
+                    "hash" : "0x6d4219451c92eff91d7a6404f8dfd48fe36b087480a2eb7e5cb8efaaf12bc109",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,7 +61,7 @@
                     }
                 },
                 {
-                    "hash" : "cf684bf367af93683536de7327a3873e72f3d8674deefc114b7c8aabc782ca32",
+                    "hash" : "0xcf684bf367af93683536de7327a3873e72f3d8674deefc114b7c8aabc782ca32",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -69,7 +69,7 @@
                     }
                 },
                 {
-                    "hash" : "c61bcc459fec38f4a7c3ee32e2a4f6d4578d165ac45505bffa98b53a305e8d15",
+                    "hash" : "0xc61bcc459fec38f4a7c3ee32e2a4f6d4578d165ac45505bffa98b53a305e8d15",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -79,7 +79,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6d4219451c92eff91d7a6404f8dfd48fe36b087480a2eb7e5cb8efaaf12bc109",
+                    "hash" : "0x6d4219451c92eff91d7a6404f8dfd48fe36b087480a2eb7e5cb8efaaf12bc109",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -87,7 +87,7 @@
                     }
                 },
                 {
-                    "hash" : "6d4219451c92eff91d7a6404f8dfd48fe36b087480a2eb7e5cb8efaaf12bc109",
+                    "hash" : "0x6d4219451c92eff91d7a6404f8dfd48fe36b087480a2eb7e5cb8efaaf12bc109",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -95,7 +95,7 @@
                     }
                 },
                 {
-                    "hash" : "cf684bf367af93683536de7327a3873e72f3d8674deefc114b7c8aabc782ca32",
+                    "hash" : "0xcf684bf367af93683536de7327a3873e72f3d8674deefc114b7c8aabc782ca32",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -103,7 +103,7 @@
                     }
                 },
                 {
-                    "hash" : "c61bcc459fec38f4a7c3ee32e2a4f6d4578d165ac45505bffa98b53a305e8d15",
+                    "hash" : "0xc61bcc459fec38f4a7c3ee32e2a4f6d4578d165ac45505bffa98b53a305e8d15",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -113,7 +113,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6d4219451c92eff91d7a6404f8dfd48fe36b087480a2eb7e5cb8efaaf12bc109",
+                    "hash" : "0x6d4219451c92eff91d7a6404f8dfd48fe36b087480a2eb7e5cb8efaaf12bc109",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -121,7 +121,7 @@
                     }
                 },
                 {
-                    "hash" : "6d4219451c92eff91d7a6404f8dfd48fe36b087480a2eb7e5cb8efaaf12bc109",
+                    "hash" : "0x6d4219451c92eff91d7a6404f8dfd48fe36b087480a2eb7e5cb8efaaf12bc109",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -129,7 +129,7 @@
                     }
                 },
                 {
-                    "hash" : "cf684bf367af93683536de7327a3873e72f3d8674deefc114b7c8aabc782ca32",
+                    "hash" : "0xcf684bf367af93683536de7327a3873e72f3d8674deefc114b7c8aabc782ca32",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -137,7 +137,7 @@
                     }
                 },
                 {
-                    "hash" : "c61bcc459fec38f4a7c3ee32e2a4f6d4578d165ac45505bffa98b53a305e8d15",
+                    "hash" : "0xc61bcc459fec38f4a7c3ee32e2a4f6d4578d165ac45505bffa98b53a305e8d15",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -147,7 +147,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6d4219451c92eff91d7a6404f8dfd48fe36b087480a2eb7e5cb8efaaf12bc109",
+                    "hash" : "0x6d4219451c92eff91d7a6404f8dfd48fe36b087480a2eb7e5cb8efaaf12bc109",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -155,7 +155,7 @@
                     }
                 },
                 {
-                    "hash" : "6d4219451c92eff91d7a6404f8dfd48fe36b087480a2eb7e5cb8efaaf12bc109",
+                    "hash" : "0x6d4219451c92eff91d7a6404f8dfd48fe36b087480a2eb7e5cb8efaaf12bc109",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -163,7 +163,7 @@
                     }
                 },
                 {
-                    "hash" : "cf684bf367af93683536de7327a3873e72f3d8674deefc114b7c8aabc782ca32",
+                    "hash" : "0xcf684bf367af93683536de7327a3873e72f3d8674deefc114b7c8aabc782ca32",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -171,7 +171,7 @@
                     }
                 },
                 {
-                    "hash" : "c61bcc459fec38f4a7c3ee32e2a4f6d4578d165ac45505bffa98b53a305e8d15",
+                    "hash" : "0xc61bcc459fec38f4a7c3ee32e2a4f6d4578d165ac45505bffa98b53a305e8d15",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -181,16 +181,16 @@
             ]
         },
         "pre" : {
-            "a000000000000000000000000000000000000000" : {
+            "0xa000000000000000000000000000000000000000" : {
                 "balance" : "0x01",
                 "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c4146046578063c0406226146052575b6000565b3460005760506076565b005b34600057605c6081565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b600060896076565b600d600081905550600e6001819055505b905600a165627a7a72305820b7c6987c21e63fed8a74d899557744a3be8d3fda191ce0f56cf261d6b860f6b40029",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -201,16 +201,16 @@
                 "0xc0406226"
             ],
             "gasLimit" : [
-                "66500",
-                "181000"
+                "0x0103c4",
+                "0x02c308"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "a000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xa000000000000000000000000000000000000000",
             "value" : [
-                "0",
-                "1"
+                "0x00",
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert.json b/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert.json
index ec0fe8edf..48379b4d8 100644
--- a/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert.json
+++ b/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert.json
@@ -1,17 +1,17 @@
 {
     "TouchToEmptyAccountRevert" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "8b8c2f339c8b3eeb1372eca8d379983d99b1631a828913743ec3f17cc855c3fb",
+                    "hash" : "0x8b8c2f339c8b3eeb1372eca8d379983d99b1631a828913743ec3f17cc855c3fb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "8b8c2f339c8b3eeb1372eca8d379983d99b1631a828913743ec3f17cc855c3fb",
+                    "hash" : "0x8b8c2f339c8b3eeb1372eca8d379983d99b1631a828913743ec3f17cc855c3fb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "8b8c2f339c8b3eeb1372eca8d379983d99b1631a828913743ec3f17cc855c3fb",
+                    "hash" : "0x8b8c2f339c8b3eeb1372eca8d379983d99b1631a828913743ec3f17cc855c3fb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "8b8c2f339c8b3eeb1372eca8d379983d99b1631a828913743ec3f17cc855c3fb",
+                    "hash" : "0x8b8c2f339c8b3eeb1372eca8d379983d99b1631a828913743ec3f17cc855c3fb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "8b8c2f339c8b3eeb1372eca8d379983d99b1631a828913743ec3f17cc855c3fb",
+                    "hash" : "0x8b8c2f339c8b3eeb1372eca8d379983d99b1631a828913743ec3f17cc855c3fb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,28 +61,28 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b617530f16000556001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x60006000600060006000731000000000000000000000000000000000000000617530f1600155",
                 "nonce" : "0x00",
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "70000"
+                "0x011170"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert2.json b/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert2.json
index 3ee8a6142..835d4dbdb 100644
--- a/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert2.json
+++ b/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert2.json
@@ -1,17 +1,17 @@
 {
     "TouchToEmptyAccountRevert2" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "271c21195e9e41c52003339d0957473d172f67c4bb780a308e2ac800a0a50b24",
+                    "hash" : "0x271c21195e9e41c52003339d0957473d172f67c4bb780a308e2ac800a0a50b24",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "271c21195e9e41c52003339d0957473d172f67c4bb780a308e2ac800a0a50b24",
+                    "hash" : "0x271c21195e9e41c52003339d0957473d172f67c4bb780a308e2ac800a0a50b24",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "ab0c055cc7ace4fbd1d251cabdafa7bca86064b231087adec534c90d6185eab2",
+                    "hash" : "0xab0c055cc7ace4fbd1d251cabdafa7bca86064b231087adec534c90d6185eab2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ab0c055cc7ace4fbd1d251cabdafa7bca86064b231087adec534c90d6185eab2",
+                    "hash" : "0xab0c055cc7ace4fbd1d251cabdafa7bca86064b231087adec534c90d6185eab2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "271c21195e9e41c52003339d0957473d172f67c4bb780a308e2ac800a0a50b24",
+                    "hash" : "0x271c21195e9e41c52003339d0957473d172f67c4bb780a308e2ac800a0a50b24",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,28 +61,28 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x60006000600060006000731000000000000000000000000000000000000000617530f16002556001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "ba4f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xba4f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x60006000600060006000731000000000000000000000000000000000000000617530f16000556000600060006000600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b617530f1600155",
                 "nonce" : "0x00",
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "77400"
+                "0x012e58"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "ba4f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xba4f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert3.json b/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert3.json
index a9fdd2d1f..cd731e63a 100644
--- a/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert3.json
+++ b/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert3.json
@@ -1,17 +1,17 @@
 {
     "TouchToEmptyAccountRevert3" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "408c421965df91a5ab9a8103c92e4497d11740e218ce569e47dd39b0ca924e2f",
+                    "hash" : "0x408c421965df91a5ab9a8103c92e4497d11740e218ce569e47dd39b0ca924e2f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "408c421965df91a5ab9a8103c92e4497d11740e218ce569e47dd39b0ca924e2f",
+                    "hash" : "0x408c421965df91a5ab9a8103c92e4497d11740e218ce569e47dd39b0ca924e2f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "d53b7d6e4469317d1c11a5e26fce847c3b7c6f1acd59778db3528aa7e80dabaa",
+                    "hash" : "0xd53b7d6e4469317d1c11a5e26fce847c3b7c6f1acd59778db3528aa7e80dabaa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "d53b7d6e4469317d1c11a5e26fce847c3b7c6f1acd59778db3528aa7e80dabaa",
+                    "hash" : "0xd53b7d6e4469317d1c11a5e26fce847c3b7c6f1acd59778db3528aa7e80dabaa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "408c421965df91a5ab9a8103c92e4497d11740e218ce569e47dd39b0ca924e2f",
+                    "hash" : "0x408c421965df91a5ab9a8103c92e4497d11740e218ce569e47dd39b0ca924e2f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,42 +61,42 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x6000600060006000600073e94f5374fce5edbc8e2a8697c15331677e6ebf0b617530f16002556001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "ba4f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xba4f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x6000600060006000600073d94f5374fce5edbc8e2a8697c15331677e6ebf0b617530f16000556000600060006000600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b617530f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "e94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xe94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x731000000000000000000000000000000000000000ff",
                 "nonce" : "0x00",
@@ -109,14 +109,14 @@
                 ""
             ],
             "gasLimit" : [
-                "82400"
+                "0x0141e0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "ba4f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xba4f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stSolidityTest/AmbiguousMethod.json b/GeneralStateTests/stSolidityTest/AmbiguousMethod.json
index a2aae4ded..5306c75ae 100644
--- a/GeneralStateTests/stSolidityTest/AmbiguousMethod.json
+++ b/GeneralStateTests/stSolidityTest/AmbiguousMethod.json
@@ -1,17 +1,17 @@
 {
     "AmbiguousMethod" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x05f5e100",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c55c94f5708aff56edbe823e1e448d4e7db3d9e4c693044f633c76395219a532",
+                    "hash" : "0xc55c94f5708aff56edbe823e1e448d4e7db3d9e4c693044f633c76395219a532",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d568910442624a2259901b496d69aeaa58375be8c9f8f18c5316251cf306f31e",
+                    "hash" : "0xd568910442624a2259901b496d69aeaa58375be8c9f8f18c5316251cf306f31e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "c55c94f5708aff56edbe823e1e448d4e7db3d9e4c693044f633c76395219a532",
+                    "hash" : "0xc55c94f5708aff56edbe823e1e448d4e7db3d9e4c693044f633c76395219a532",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c55c94f5708aff56edbe823e1e448d4e7db3d9e4c693044f633c76395219a532",
+                    "hash" : "0xc55c94f5708aff56edbe823e1e448d4e7db3d9e4c693044f633c76395219a532",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d568910442624a2259901b496d69aeaa58375be8c9f8f18c5316251cf306f31e",
+                    "hash" : "0xd568910442624a2259901b496d69aeaa58375be8c9f8f18c5316251cf306f31e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x60003560e060020a90048063c040622614601557005b601b6021565b60006000f35b61014f60008190555056",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x07a120",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 "0xc0406226"
             ],
             "gasLimit" : [
-                "300000"
+                "0x0493e0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stSolidityTest/CallInfiniteLoop.json b/GeneralStateTests/stSolidityTest/CallInfiniteLoop.json
index 0f1cb0bb6..5b318d8bd 100644
--- a/GeneralStateTests/stSolidityTest/CallInfiniteLoop.json
+++ b/GeneralStateTests/stSolidityTest/CallInfiniteLoop.json
@@ -1,17 +1,17 @@
 {
     "CallInfiniteLoop" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x05f5e100",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "94a768f71a8f2feee4dd28a9d71ac3c34b5324df442b634b47eb96139f2f9358",
+                    "hash" : "0x94a768f71a8f2feee4dd28a9d71ac3c34b5324df442b634b47eb96139f2f9358",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "94a768f71a8f2feee4dd28a9d71ac3c34b5324df442b634b47eb96139f2f9358",
+                    "hash" : "0x94a768f71a8f2feee4dd28a9d71ac3c34b5324df442b634b47eb96139f2f9358",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "94a768f71a8f2feee4dd28a9d71ac3c34b5324df442b634b47eb96139f2f9358",
+                    "hash" : "0x94a768f71a8f2feee4dd28a9d71ac3c34b5324df442b634b47eb96139f2f9358",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "94a768f71a8f2feee4dd28a9d71ac3c34b5324df442b634b47eb96139f2f9358",
+                    "hash" : "0x94a768f71a8f2feee4dd28a9d71ac3c34b5324df442b634b47eb96139f2f9358",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "94a768f71a8f2feee4dd28a9d71ac3c34b5324df442b634b47eb96139f2f9358",
+                    "hash" : "0x94a768f71a8f2feee4dd28a9d71ac3c34b5324df442b634b47eb96139f2f9358",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x60003560e060020a90048063296df0df1460295780634893d88a146035578063981a316514604157005b602f604d565b60006000f35b603b6062565b60006000f35b6047605a565b60006000f35b5b600115605857604e565b565b60606062565b565b6068605a565b56",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x07a120",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 "0x296df0df"
             ],
             "gasLimit" : [
-                "300000"
+                "0x0493e0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stSolidityTest/CallLowLevelCreatesSolidity.json b/GeneralStateTests/stSolidityTest/CallLowLevelCreatesSolidity.json
index c038c9276..c2ff6ebdc 100644
--- a/GeneralStateTests/stSolidityTest/CallLowLevelCreatesSolidity.json
+++ b/GeneralStateTests/stSolidityTest/CallLowLevelCreatesSolidity.json
@@ -1,17 +1,17 @@
 {
     "CallLowLevelCreatesSolidity" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x05f5e100",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b228eae256f1654e21d832c5be223b05762abbe26f7a7aa46541e219fb40769b",
+                    "hash" : "0xb228eae256f1654e21d832c5be223b05762abbe26f7a7aa46541e219fb40769b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "492942ca8f130e161aa13923a962a3133dd5a25f786eaa97985dc721dac212c9",
+                    "hash" : "0x492942ca8f130e161aa13923a962a3133dd5a25f786eaa97985dc721dac212c9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4b1504174022cbd59e4757634acd4fa9db18145fc5ea0a5893b7040a1e6879e6",
+                    "hash" : "0x4b1504174022cbd59e4757634acd4fa9db18145fc5ea0a5893b7040a1e6879e6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4b1504174022cbd59e4757634acd4fa9db18145fc5ea0a5893b7040a1e6879e6",
+                    "hash" : "0x4b1504174022cbd59e4757634acd4fa9db18145fc5ea0a5893b7040a1e6879e6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "492942ca8f130e161aa13923a962a3133dd5a25f786eaa97985dc721dac212c9",
+                    "hash" : "0x492942ca8f130e161aa13923a962a3133dd5a25f786eaa97985dc721dac212c9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x60003560e060020a9004806330debb4214610021578063c04062261461003257005b61002c6004356100c7565b60006000f35b61003a610044565b8060005260206000f35b60006000600160008190555073095e7baea6a6c7c4c2dfeb977efac326af552d87600181905550606a6100d2600039606a60006000f0905080600160a060020a03166319ab453c600060008260e060020a026000526004600154600160a060020a03168152602001600060008660325a03f16100bc57005b505060005491505090565b80600081905550505600605e80600c6000396000f30060003560e060020a9004806319ab453c14601557005b601e6004356024565b60006000f35b80600160a060020a03166330debb42600060008260e060020a02600052600460e18152602001600060008660325a03f1605957005b50505056",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 "0xc0406226"
             ],
             "gasLimit" : [
-                "350000"
+                "0x055730"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stSolidityTest/CallRecursiveMethods.json b/GeneralStateTests/stSolidityTest/CallRecursiveMethods.json
index 3085cb69a..a0dba551d 100644
--- a/GeneralStateTests/stSolidityTest/CallRecursiveMethods.json
+++ b/GeneralStateTests/stSolidityTest/CallRecursiveMethods.json
@@ -1,17 +1,17 @@
 {
     "CallRecursiveMethods" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x05f5e100",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "28775a9bfb2082afcf55670f0cec3345867d51cf068580a38bb823d375e44f1a",
+                    "hash" : "0x28775a9bfb2082afcf55670f0cec3345867d51cf068580a38bb823d375e44f1a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "28775a9bfb2082afcf55670f0cec3345867d51cf068580a38bb823d375e44f1a",
+                    "hash" : "0x28775a9bfb2082afcf55670f0cec3345867d51cf068580a38bb823d375e44f1a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "28775a9bfb2082afcf55670f0cec3345867d51cf068580a38bb823d375e44f1a",
+                    "hash" : "0x28775a9bfb2082afcf55670f0cec3345867d51cf068580a38bb823d375e44f1a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "28775a9bfb2082afcf55670f0cec3345867d51cf068580a38bb823d375e44f1a",
+                    "hash" : "0x28775a9bfb2082afcf55670f0cec3345867d51cf068580a38bb823d375e44f1a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "28775a9bfb2082afcf55670f0cec3345867d51cf068580a38bb823d375e44f1a",
+                    "hash" : "0x28775a9bfb2082afcf55670f0cec3345867d51cf068580a38bb823d375e44f1a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463296df0df811460415780634893d88a14604d578063981a316514605957005b60476065565b60006000f35b6053607a565b60006000f35b605f6072565b60006000f35b5b6001156070576066565b565b6078607a565b565b60806072565b56",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x07a120",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 "0x981a3165"
             ],
             "gasLimit" : [
-                "60000"
+                "0xea60"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stSolidityTest/ContractInheritance.json b/GeneralStateTests/stSolidityTest/ContractInheritance.json
index 6ea718b2b..9fa7cfd7d 100644
--- a/GeneralStateTests/stSolidityTest/ContractInheritance.json
+++ b/GeneralStateTests/stSolidityTest/ContractInheritance.json
@@ -1,17 +1,17 @@
 {
     "ContractInheritance" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "ef8d0a0e1452bcf2ec28e34e9945b26ae8cc833de5b2cec8b1306b70df6f2cbc",
+                    "hash" : "0xef8d0a0e1452bcf2ec28e34e9945b26ae8cc833de5b2cec8b1306b70df6f2cbc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "296b2fd1997a528da5f325628fbc77260461bca622bab66caf85fb4d1321a009",
+                    "hash" : "0x296b2fd1997a528da5f325628fbc77260461bca622bab66caf85fb4d1321a009",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e7f84d674881d1cfd115be59e3e390271435c0b3474a482f7add54c3fe429d85",
+                    "hash" : "0xe7f84d674881d1cfd115be59e3e390271435c0b3474a482f7add54c3fe429d85",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e7f84d674881d1cfd115be59e3e390271435c0b3474a482f7add54c3fe429d85",
+                    "hash" : "0xe7f84d674881d1cfd115be59e3e390271435c0b3474a482f7add54c3fe429d85",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "296b2fd1997a528da5f325628fbc77260461bca622bab66caf85fb4d1321a009",
+                    "hash" : "0x296b2fd1997a528da5f325628fbc77260461bca622bab66caf85fb4d1321a009",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x7c010000000000000000000000000000000000000000000000000000000060003504633e0bca3b8114610039578063c0406226146100a857005b6100b55b600160008060456101ec8339604560006000f091508173ffffffffffffffffffffffffffffffffffffffff166381bda09b60206000827c010000000000000000000000000000000000000000000000000000000002600052600460006000866161da5a03f161011957005b6100bf60006100c961003d565b8060005260206000f35b8060005260206000f35b600080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0016919091179081905560ff16919050565b505060005163ffffffff166002141561019d575b5b505090565b505060005163ffffffff1660011415610194575b60456101a7600039604560006000f090508073ffffffffffffffffffffffffffffffffffffffff166381bda09b60206000827c010000000000000000000000000000000000000000000000000000000002600052600460006000866161da5a03f16100ff57005b60009250610114565b600092506101145600603980600c6000396000f3007c0100000000000000000000000000000000000000000000000000000000600035046381bda09b8114602d57005b60026000818152602090f3603980600c6000396000f3007c0100000000000000000000000000000000000000000000000000000000600035046381bda09b8114602d57005b60016000818152602090f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x02faf080",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 "0xc0406226"
             ],
             "gasLimit" : [
-                "35000000"
+                "0x02160ec0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stSolidityTest/CreateContractFromMethod.json b/GeneralStateTests/stSolidityTest/CreateContractFromMethod.json
index b6019ac8b..2952372eb 100644
--- a/GeneralStateTests/stSolidityTest/CreateContractFromMethod.json
+++ b/GeneralStateTests/stSolidityTest/CreateContractFromMethod.json
@@ -1,17 +1,17 @@
 {
     "CreateContractFromMethod" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x05f5e100",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b82770d51d1259de93c4e884e126cc1914564b6e87a6636f38f27c4d3b6bbf66",
+                    "hash" : "0xb82770d51d1259de93c4e884e126cc1914564b6e87a6636f38f27c4d3b6bbf66",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f188cfbe040b966727dce0c929cc6711a42aa93d064515f751106ef1a9e7525d",
+                    "hash" : "0xf188cfbe040b966727dce0c929cc6711a42aa93d064515f751106ef1a9e7525d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b82770d51d1259de93c4e884e126cc1914564b6e87a6636f38f27c4d3b6bbf66",
+                    "hash" : "0xb82770d51d1259de93c4e884e126cc1914564b6e87a6636f38f27c4d3b6bbf66",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b82770d51d1259de93c4e884e126cc1914564b6e87a6636f38f27c4d3b6bbf66",
+                    "hash" : "0xb82770d51d1259de93c4e884e126cc1914564b6e87a6636f38f27c4d3b6bbf66",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f188cfbe040b966727dce0c929cc6711a42aa93d064515f751106ef1a9e7525d",
+                    "hash" : "0xf188cfbe040b966727dce0c929cc6711a42aa93d064515f751106ef1a9e7525d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x60003560e060020a900480637ee17e1214601f578063c040622614602b57005b60256047565b60006000f35b6031603b565b8060005260206000f35b600060436047565b5090565b60006060605d600039606060006000f09050905600605480600c6000396000f30060003560e060020a90048062f55d9d14601e578063b9c3d0a514602d57005b60276004356046565b60006000f35b6033603d565b8060005260206000f35b600060e1905090565b80600160a060020a0316ff5056",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 "0xc0406226"
             ],
             "gasLimit" : [
-                "350000"
+                "0x055730"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stSolidityTest/RecursiveCreateContracts.json b/GeneralStateTests/stSolidityTest/RecursiveCreateContracts.json
index 5ad905ee2..848ce6da7 100644
--- a/GeneralStateTests/stSolidityTest/RecursiveCreateContracts.json
+++ b/GeneralStateTests/stSolidityTest/RecursiveCreateContracts.json
@@ -1,17 +1,17 @@
 {
     "RecursiveCreateContracts" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x05f5e100",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "de2b270f7ca346807238c5d102d518d261a6abf4ff217a70ca1c7e7251bfb3ed",
+                    "hash" : "0xde2b270f7ca346807238c5d102d518d261a6abf4ff217a70ca1c7e7251bfb3ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "bf0e0fcf76fec2d3216a7830dbf3cb7f3bd715b6b3b245668d4e2946235c7bf4",
+                    "hash" : "0xbf0e0fcf76fec2d3216a7830dbf3cb7f3bd715b6b3b245668d4e2946235c7bf4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f0259d59719b205707dabbde44be2a0e5ca1b74c3c132df147d992a0cc1b96e9",
+                    "hash" : "0xf0259d59719b205707dabbde44be2a0e5ca1b74c3c132df147d992a0cc1b96e9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f0259d59719b205707dabbde44be2a0e5ca1b74c3c132df147d992a0cc1b96e9",
+                    "hash" : "0xf0259d59719b205707dabbde44be2a0e5ca1b74c3c132df147d992a0cc1b96e9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "bf0e0fcf76fec2d3216a7830dbf3cb7f3bd715b6b3b245668d4e2946235c7bf4",
+                    "hash" : "0xbf0e0fcf76fec2d3216a7830dbf3cb7f3bd715b6b3b245668d4e2946235c7bf4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x314dc6448d9338c15b0a00000000",
                 "code" : "0x60003560e060020a90048063820b13f614610021578063a444f5e91461003257005b61002c600435610093565b60006000f35b61003d600435610043565b60006000f35b600073095e7baea6a6c7c4c2dfeb977efac326af552d8760008190555081600181905550606b6101ad600039606b600054600160a060020a0316815260200182815260200160006000f090505050565b600060c86100e560003960c8600054600160a060020a0316815260200182815260200160006000f0905080600160a060020a0316600060026000600060006000848787f16100dd57005b50505050505600604060c860043960045160245160006001820391508160008190555060008211602657604c565b606b605d600039606b83600160a060020a0316815260200182815260200160006000f090505b505050600180605c6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f30000",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x4c4b40",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 "0xa444f5e90000000000000000000000000000000000000000000000000000000000000304"
             ],
             "gasLimit" : [
-                "300000"
+                "0x0493e0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stSolidityTest/RecursiveCreateContractsCreate4Contracts.json b/GeneralStateTests/stSolidityTest/RecursiveCreateContractsCreate4Contracts.json
index 12a585729..39a45431f 100644
--- a/GeneralStateTests/stSolidityTest/RecursiveCreateContractsCreate4Contracts.json
+++ b/GeneralStateTests/stSolidityTest/RecursiveCreateContractsCreate4Contracts.json
@@ -1,17 +1,17 @@
 {
     "RecursiveCreateContractsCreate4Contracts" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x05f5e100",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c9c2c49e4940b2ee507726474e8f5d31502ed5691e4edc27463058d676d69029",
+                    "hash" : "0xc9c2c49e4940b2ee507726474e8f5d31502ed5691e4edc27463058d676d69029",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f27f3f2ecfc41e216642436c6c76ffdf50b68674dd698d6806cbaa295ad46260",
+                    "hash" : "0xf27f3f2ecfc41e216642436c6c76ffdf50b68674dd698d6806cbaa295ad46260",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "c2fffb98fdd2871f70a001e775525039d94bb8ad0c3c783efa970af2e3ed54a4",
+                    "hash" : "0xc2fffb98fdd2871f70a001e775525039d94bb8ad0c3c783efa970af2e3ed54a4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c2fffb98fdd2871f70a001e775525039d94bb8ad0c3c783efa970af2e3ed54a4",
+                    "hash" : "0xc2fffb98fdd2871f70a001e775525039d94bb8ad0c3c783efa970af2e3ed54a4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f27f3f2ecfc41e216642436c6c76ffdf50b68674dd698d6806cbaa295ad46260",
+                    "hash" : "0xf27f3f2ecfc41e216642436c6c76ffdf50b68674dd698d6806cbaa295ad46260",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x314dc6448d9338c15b0a00000000",
                 "code" : "0x60003560e060020a90048063820b13f614610021578063a444f5e91461003257005b61002c600435610093565b60006000f35b61003d600435610043565b60006000f35b600073095e7baea6a6c7c4c2dfeb977efac326af552d8760008190555081600181905550606b6101ad600039606b600054600160a060020a0316815260200182815260200160006000f090505050565b600060c86100e560003960c8600054600160a060020a0316815260200182815260200160006000f0905080600160a060020a0316600060026000600060006000848787f16100dd57005b50505050505600604060c860043960045160245160006001820391508160008190555060008211602657604c565b606b605d600039606b83600160a060020a0316815260200182815260200160006000f090505b505050600180605c6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f30000",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x4c4b40",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 "0xa444f5e90000000000000000000000000000000000000000000000000000000000000004"
             ],
             "gasLimit" : [
-                "300000"
+                "0x0493e0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stSolidityTest/TestBlockAndTransactionProperties.json b/GeneralStateTests/stSolidityTest/TestBlockAndTransactionProperties.json
index 43f1b5f40..61c7e6835 100644
--- a/GeneralStateTests/stSolidityTest/TestBlockAndTransactionProperties.json
+++ b/GeneralStateTests/stSolidityTest/TestBlockAndTransactionProperties.json
@@ -1,17 +1,17 @@
 {
     "TestBlockAndTransactionProperties" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "8121b6e7d79c473a20d195b45650a54bd1b95bc9f16392c2ce000e79c2351037",
+                    "hash" : "0x8121b6e7d79c473a20d195b45650a54bd1b95bc9f16392c2ce000e79c2351037",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "8121b6e7d79c473a20d195b45650a54bd1b95bc9f16392c2ce000e79c2351037",
+                    "hash" : "0x8121b6e7d79c473a20d195b45650a54bd1b95bc9f16392c2ce000e79c2351037",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "57eb775f62aeaea7bfcddf7b359b805f5477c8217370d5d3c0e00e582fcfdb91",
+                    "hash" : "0x57eb775f62aeaea7bfcddf7b359b805f5477c8217370d5d3c0e00e582fcfdb91",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "57eb775f62aeaea7bfcddf7b359b805f5477c8217370d5d3c0e00e582fcfdb91",
+                    "hash" : "0x57eb775f62aeaea7bfcddf7b359b805f5477c8217370d5d3c0e00e582fcfdb91",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "8121b6e7d79c473a20d195b45650a54bd1b95bc9f16392c2ce000e79c2351037",
+                    "hash" : "0x8121b6e7d79c473a20d195b45650a54bd1b95bc9f16392c2ce000e79c2351037",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x60606040526000357c010000000000000000000000000000000000000000000000000000000090048063c040622614610044578063e97384dc1461006957610042565b005b610051600480505061008e565b60405180821515815260200191505060405180910390f35b61007660048050506100c9565b60405180821515815260200191505060405180910390f35b60006100986100c9565b600060006101000a81548160ff02191690830217905550600060009054906101000a900460ff1690506100c6565b90565b6000600190508050732adc25665018aa1fe0e6bc666dac8fc2697ff9ba4173ffffffffffffffffffffffffffffffffffffffff1614151561010d57600090506101f7565b6302b8feb04414151561012357600090506101f7565b677fffffffffffffff4514151561013d57600090506101f7565b60784314151561015057600090506101f7565b6078405042505a5073a94f5374fce5edbc8e2a8697c15331677e6ebf0b3373ffffffffffffffffffffffffffffffffffffffff1614151561019457600090506101f7565b6064341415156101a757600090506101f7565b60013a1415156101ba57600090506101f7565b73a94f5374fce5edbc8e2a8697c15331677e6ebf0b3273ffffffffffffffffffffffffffffffffffffffff161415156101f657600090506101f7565b5b9056",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 "0xc0406226"
             ],
             "gasLimit" : [
-                "350000"
+                "0x055730"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100"
+                "0x64"
             ]
         }
     }
diff --git a/GeneralStateTests/stSolidityTest/TestContractInteraction.json b/GeneralStateTests/stSolidityTest/TestContractInteraction.json
index a28082472..b25aaa8b9 100644
--- a/GeneralStateTests/stSolidityTest/TestContractInteraction.json
+++ b/GeneralStateTests/stSolidityTest/TestContractInteraction.json
@@ -1,17 +1,17 @@
 {
     "TestContractInteraction" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x05f5e100",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "db558b22b3ae033794cf060d0800f57623b57015bbeaeef0ed64c97766768dca",
+                    "hash" : "0xdb558b22b3ae033794cf060d0800f57623b57015bbeaeef0ed64c97766768dca",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "bbb317fbcb82c1477976d9720818306902a4da39aa3fbaa8b1d6e1c41199c8df",
+                    "hash" : "0xbbb317fbcb82c1477976d9720818306902a4da39aa3fbaa8b1d6e1c41199c8df",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "8af7e668bc981aaa612683f34062e73fbcbb262d9394b199bdb08663d93c53c0",
+                    "hash" : "0x8af7e668bc981aaa612683f34062e73fbcbb262d9394b199bdb08663d93c53c0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "8af7e668bc981aaa612683f34062e73fbcbb262d9394b199bdb08663d93c53c0",
+                    "hash" : "0x8af7e668bc981aaa612683f34062e73fbcbb262d9394b199bdb08663d93c53c0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "bbb317fbcb82c1477976d9720818306902a4da39aa3fbaa8b1d6e1c41199c8df",
+                    "hash" : "0xbbb317fbcb82c1477976d9720818306902a4da39aa3fbaa8b1d6e1c41199c8df",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463c04062268114610039578063ed973fe91461004b57005b6100416100ea565b8060005260206000f35b61005361005d565b8060005260206000f35b60006000608161011a600039608160006000f0905073ffffffffffffffffffffffffffffffffffffffff811663b9c3d0a5602060007fb9c3d0a50000000000000000000000000000000000000000000000000000000081526004600060008660325a03f16100c757005b505060005160e1146100d8576100e1565b600191506100e6565b600091505b5090565b60006100f461005d565b600060006101000a81548160ff0219169083021790555060ff600160005404169050905600607580600c6000396000f3007c01000000000000000000000000000000000000000000000000000000006000350462f55d9d81146036578063b9c3d0a514604557005b603f6004356055565b60006000f35b604b6070565b8060005260206000f35b8073ffffffffffffffffffffffffffffffffffffffff16ff50565b60e19056",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 "0xc0406226"
             ],
             "gasLimit" : [
-                "350000"
+                "0x055730"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stSolidityTest/TestContractSuicide.json b/GeneralStateTests/stSolidityTest/TestContractSuicide.json
index 5667c0de4..649f10213 100644
--- a/GeneralStateTests/stSolidityTest/TestContractSuicide.json
+++ b/GeneralStateTests/stSolidityTest/TestContractSuicide.json
@@ -1,17 +1,17 @@
 {
     "TestContractSuicide" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x05f5e100",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "fd54bdda8e31060ef262e7b63839f8d089db9f8997e1a675ad99fa592f314f00",
+                    "hash" : "0xfd54bdda8e31060ef262e7b63839f8d089db9f8997e1a675ad99fa592f314f00",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e75c86e24250e8c07574d7dbcf71440edabda1fc340eedcf88069de1e4419694",
+                    "hash" : "0xe75c86e24250e8c07574d7dbcf71440edabda1fc340eedcf88069de1e4419694",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "367a4e05a146eef4824adcbb8c7e445dc01852707762a005b01b97ce1eb8622f",
+                    "hash" : "0x367a4e05a146eef4824adcbb8c7e445dc01852707762a005b01b97ce1eb8622f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "367a4e05a146eef4824adcbb8c7e445dc01852707762a005b01b97ce1eb8622f",
+                    "hash" : "0x367a4e05a146eef4824adcbb8c7e445dc01852707762a005b01b97ce1eb8622f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e75c86e24250e8c07574d7dbcf71440edabda1fc340eedcf88069de1e4419694",
+                    "hash" : "0xe75c86e24250e8c07574d7dbcf71440edabda1fc340eedcf88069de1e4419694",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463a60eedda8114610039578063c04062261461004b57005b61004161005d565b8060005260206000f35b61005361015a565b8060005260206000f35b60006000608161018a600039608160006000f0905073ffffffffffffffffffffffffffffffffffffffff811662f55d9d6000807ef55d9d00000000000000000000000000000000000000000000000000000000825260044173ffffffffffffffffffffffffffffffffffffffff168152602001600060008660325a03f16100e057005b505073ffffffffffffffffffffffffffffffffffffffff811663b9c3d0a5602060007fb9c3d0a50000000000000000000000000000000000000000000000000000000081526004600060008660325a03f161013757005b505060005160e11461014857610151565b60019150610156565b600091505b5090565b600061016461005d565b600060006101000a81548160ff0219169083021790555060ff600160005404169050905600607580600c6000396000f3007c01000000000000000000000000000000000000000000000000000000006000350462f55d9d81146036578063b9c3d0a514604557005b603f600435605a565b60006000f35b604b6055565b8060005260206000f35b60e190565b8073ffffffffffffffffffffffffffffffffffffffff16ff5056",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 "0xc0406226"
             ],
             "gasLimit" : [
-                "350000"
+                "0x055730"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stSolidityTest/TestCryptographicFunctions.json b/GeneralStateTests/stSolidityTest/TestCryptographicFunctions.json
index fe931582d..2cdf16694 100644
--- a/GeneralStateTests/stSolidityTest/TestCryptographicFunctions.json
+++ b/GeneralStateTests/stSolidityTest/TestCryptographicFunctions.json
@@ -1,17 +1,17 @@
 {
     "TestCryptographicFunctions" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "0174852c4e603778f14fdc2c67ab61f72d13b9c5122e6050bf7c0560c83a02e3",
+                    "hash" : "0x0174852c4e603778f14fdc2c67ab61f72d13b9c5122e6050bf7c0560c83a02e3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "88b66fadcd2608906c1ceabb95144359b5d5c2f05a6c08ce5f9ced551bb49c96",
+                    "hash" : "0x88b66fadcd2608906c1ceabb95144359b5d5c2f05a6c08ce5f9ced551bb49c96",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3e2d93fa99efc8b83dfd38acc31be9d3f22d5336401f530127d8e976a111d756",
+                    "hash" : "0x3e2d93fa99efc8b83dfd38acc31be9d3f22d5336401f530127d8e976a111d756",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3e2d93fa99efc8b83dfd38acc31be9d3f22d5336401f530127d8e976a111d756",
+                    "hash" : "0x3e2d93fa99efc8b83dfd38acc31be9d3f22d5336401f530127d8e976a111d756",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "88b66fadcd2608906c1ceabb95144359b5d5c2f05a6c08ce5f9ced551bb49c96",
+                    "hash" : "0x88b66fadcd2608906c1ceabb95144359b5d5c2f05a6c08ce5f9ced551bb49c96",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x6000357c010000000000000000000000000000000000000000000000000000000090048063c04062261461003a578063e0a9fd281461004c57005b61004261005e565b8060005260206000f35b610054610099565b8060005260206000f35b6000610068610099565b600060006101000a81548160ff02191690830217905550600060009054906101000a900460ff169050610096565b90565b60006001905080507f43c4b4524adb81e4e9a5c4648a98e9d320e3908ac5b6c889144b642cd08ae16d60010260407f74657374737472696e67000000000000000000000000000000000000000000008152600a016040900360402014156100ff57610108565b600090506102ec565b7f3c8727e019a42b444667a587b6001251becadabbb36bfed8087a92c18882d11160010260026020600060007f74657374737472696e67000000000000000000000000000000000000000000008152600a0160006000856161da5a03f161016b57005b50600051141561017a57610183565b600090506102ec565b73cd566972b5e50104011a92b59fa8e0b1234851ae6c010000000000000000000000000260036020600060007f74657374737472696e67000000000000000000000000000000000000000000008152600a0160006000856161da5a03f16101e657005b506000516c010000000000000000000000000214156102045761020d565b600090506102ec565b73a94f5374fce5edbc8e2a8697c15331677e6ebf0b60016020600060007f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c6001028152602001601c81526020017f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f60010281526020017feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549600102815260200160006000856161da5a03f16102bd57005b5060005173ffffffffffffffffffffffffffffffffffffffff1614156102e2576102eb565b600090506102ec565b5b9056",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x02faf080",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 "0xc0406226"
             ],
             "gasLimit" : [
-                "35000000"
+                "0x02160ec0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100"
+                "0x64"
             ]
         }
     }
diff --git a/GeneralStateTests/stSolidityTest/TestKeywords.json b/GeneralStateTests/stSolidityTest/TestKeywords.json
index b4478b75e..eae86257e 100644
--- a/GeneralStateTests/stSolidityTest/TestKeywords.json
+++ b/GeneralStateTests/stSolidityTest/TestKeywords.json
@@ -1,17 +1,17 @@
 {
     "TestKeywords" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x05f5e100",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "2974402c2b5431807dc95248df9ca5e8869b4c77e23172d33bfa8bb77248a915",
+                    "hash" : "0x2974402c2b5431807dc95248df9ca5e8869b4c77e23172d33bfa8bb77248a915",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "2974402c2b5431807dc95248df9ca5e8869b4c77e23172d33bfa8bb77248a915",
+                    "hash" : "0x2974402c2b5431807dc95248df9ca5e8869b4c77e23172d33bfa8bb77248a915",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5d9414ffd30ec040a59e0a99b7a54097306ee5d426bd8adf8e5a99490ad083c5",
+                    "hash" : "0x5d9414ffd30ec040a59e0a99b7a54097306ee5d426bd8adf8e5a99490ad083c5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5d9414ffd30ec040a59e0a99b7a54097306ee5d426bd8adf8e5a99490ad083c5",
+                    "hash" : "0x5d9414ffd30ec040a59e0a99b7a54097306ee5d426bd8adf8e5a99490ad083c5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "2974402c2b5431807dc95248df9ca5e8869b4c77e23172d33bfa8bb77248a915",
+                    "hash" : "0x2974402c2b5431807dc95248df9ca5e8869b4c77e23172d33bfa8bb77248a915",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463380e439681146037578063c040622614604757005b603d6084565b8060005260206000f35b604d6057565b8060005260206000f35b6000605f6084565b600060006101000a81548160ff0219169083021790555060ff60016000540416905090565b6000808160011560cd575b600a82121560a157600190910190608f565b81600a1460ac5760c9565b50600a5b60008160ff16111560c85760019182900391900360b0565b5b60d5565b6000925060ed565b8160001460e05760e8565b6001925060ed565b600092505b50509056",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 "0xc0406226"
             ],
             "gasLimit" : [
-                "350000"
+                "0x055730"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stSolidityTest/TestOverflow.json b/GeneralStateTests/stSolidityTest/TestOverflow.json
index 6d44f465f..d0b70eba2 100644
--- a/GeneralStateTests/stSolidityTest/TestOverflow.json
+++ b/GeneralStateTests/stSolidityTest/TestOverflow.json
@@ -1,17 +1,17 @@
 {
     "TestOverflow" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7c490eb6a0b4ac8bedc69db1542a68292124b7fb81f1d37c0fe1a538f7fcb96c",
+                    "hash" : "0x7c490eb6a0b4ac8bedc69db1542a68292124b7fb81f1d37c0fe1a538f7fcb96c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7c490eb6a0b4ac8bedc69db1542a68292124b7fb81f1d37c0fe1a538f7fcb96c",
+                    "hash" : "0x7c490eb6a0b4ac8bedc69db1542a68292124b7fb81f1d37c0fe1a538f7fcb96c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "24c1690cfd30246726282bd723e2efc208a1bd3f734465a5c18b7fa81c4242c2",
+                    "hash" : "0x24c1690cfd30246726282bd723e2efc208a1bd3f734465a5c18b7fa81c4242c2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "24c1690cfd30246726282bd723e2efc208a1bd3f734465a5c18b7fa81c4242c2",
+                    "hash" : "0x24c1690cfd30246726282bd723e2efc208a1bd3f734465a5c18b7fa81c4242c2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7c490eb6a0b4ac8bedc69db1542a68292124b7fb81f1d37c0fe1a538f7fcb96c",
+                    "hash" : "0x7c490eb6a0b4ac8bedc69db1542a68292124b7fb81f1d37c0fe1a538f7fcb96c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x6000357c0100000000000000000000000000000000000000000000000000000000900480638040cac41461003a578063c04062261461004c57005b610042610099565b8060005260206000f35b61005461005e565b8060005260206000f35b6000610068610099565b600060006101000a81548160ff02191690830217905550600060009054906101000a900460ff169050610096565b90565b60006000600060006001935083507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff925060006001840114156100db576100e4565b6000935061013b565b63ffffffff915060006001830163ffffffff1614156101025761010b565b6000935061013b565b67ffffffffffffffff905060006001820167ffffffffffffffff1614156101315761013a565b6000935061013b565b5b5050509056",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x02faf080",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 "0xc0406226"
             ],
             "gasLimit" : [
-                "35000000"
+                "0x02160ec0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stSolidityTest/TestStoreGasPrices.json b/GeneralStateTests/stSolidityTest/TestStoreGasPrices.json
index 307f7bdd0..e559dd213 100644
--- a/GeneralStateTests/stSolidityTest/TestStoreGasPrices.json
+++ b/GeneralStateTests/stSolidityTest/TestStoreGasPrices.json
@@ -1,17 +1,17 @@
 {
     "TestStoreGasPrices" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e7b615fa0b33e1df7d7d59712c767013787a9f549cd65a4d22c8f143283ec4bb",
+                    "hash" : "0xe7b615fa0b33e1df7d7d59712c767013787a9f549cd65a4d22c8f143283ec4bb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e7b615fa0b33e1df7d7d59712c767013787a9f549cd65a4d22c8f143283ec4bb",
+                    "hash" : "0xe7b615fa0b33e1df7d7d59712c767013787a9f549cd65a4d22c8f143283ec4bb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e7b615fa0b33e1df7d7d59712c767013787a9f549cd65a4d22c8f143283ec4bb",
+                    "hash" : "0xe7b615fa0b33e1df7d7d59712c767013787a9f549cd65a4d22c8f143283ec4bb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e7b615fa0b33e1df7d7d59712c767013787a9f549cd65a4d22c8f143283ec4bb",
+                    "hash" : "0xe7b615fa0b33e1df7d7d59712c767013787a9f549cd65a4d22c8f143283ec4bb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e7b615fa0b33e1df7d7d59712c767013787a9f549cd65a4d22c8f143283ec4bb",
+                    "hash" : "0xe7b615fa0b33e1df7d7d59712c767013787a9f549cd65a4d22c8f143283ec4bb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463c04062268114602d57005b6033603d565b8060005260206000f35b600060005a600160205590505a81036000555a600260205590505a81036001555a600260205590505a81036002555a65168aa8d53fe660205590505a81036003555a600260205590505a81036004555a600060205590505a81036005555a5060019291505056",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x02faf080",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 "0xc0406226"
             ],
             "gasLimit" : [
-                "35000000"
+                "0x02160ec0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stSolidityTest/TestStructuresAndVariabless.json b/GeneralStateTests/stSolidityTest/TestStructuresAndVariabless.json
index 139dc67f1..603a54123 100644
--- a/GeneralStateTests/stSolidityTest/TestStructuresAndVariabless.json
+++ b/GeneralStateTests/stSolidityTest/TestStructuresAndVariabless.json
@@ -1,17 +1,17 @@
 {
     "TestStructuresAndVariabless" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "3c7eb90840853b3cea537fa2488045f4ec9be9ddb1469e0958e4dd90cf87cb49",
+                    "hash" : "0x3c7eb90840853b3cea537fa2488045f4ec9be9ddb1469e0958e4dd90cf87cb49",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "3c7eb90840853b3cea537fa2488045f4ec9be9ddb1469e0958e4dd90cf87cb49",
+                    "hash" : "0x3c7eb90840853b3cea537fa2488045f4ec9be9ddb1469e0958e4dd90cf87cb49",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "fabbcefefcd34f324da40464c4bd8df7a21d379e0a897796d290a2b49e974e88",
+                    "hash" : "0xfabbcefefcd34f324da40464c4bd8df7a21d379e0a897796d290a2b49e974e88",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "fabbcefefcd34f324da40464c4bd8df7a21d379e0a897796d290a2b49e974e88",
+                    "hash" : "0xfabbcefefcd34f324da40464c4bd8df7a21d379e0a897796d290a2b49e974e88",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "3c7eb90840853b3cea537fa2488045f4ec9be9ddb1469e0958e4dd90cf87cb49",
+                    "hash" : "0x3c7eb90840853b3cea537fa2488045f4ec9be9ddb1469e0958e4dd90cf87cb49",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x7c010000000000000000000000000000000000000000000000000000000060003504632a9afb838114610039578063c04062261461004b57005b61004161005d565b8060005260206000f35b61005361016c565b8060005260206000f35b600160ff8154141561006e57610076565b506000610169565b60015460035414156100875761008f565b506000610169565b73a94f5374fce5edbc8e2a8697c15331677e6ebf0b73ffffffffffffffffffffffffffffffffffffffff60016002540481161614156100cd576100d5565b506000610169565b7f676c6f62616c2064617461203332206c656e67746820737472696e670000000060045414156101045761010c565b506000610169565b6005600080815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673a94f5374fce5edbc8e2a8697c15331677e6ebf0b141561016057610168565b506000610169565b5b90565b600060ff806001555073a94f5374fce5edbc8e2a8697c15331677e6ebf0b6002805473ffffffffffffffffffffffffffffffffffffffff1916821790555060ff80600355507f676c6f62616c2064617461203332206c656e67746820737472696e6700000000806004555073a94f5374fce5edbc8e2a8697c15331677e6ebf0b6005600080815260200190815260200160002060006101000a81548173ffffffffffffffffffffffffffffffffffffffff0219169083021790555061022f61005d565b600060006101000a81548160ff0219169083021790555060ff6001600054041690509056",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 "0xc0406226"
             ],
             "gasLimit" : [
-                "350000"
+                "0x055730"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100"
+                "0x64"
             ]
         }
     }
diff --git a/GeneralStateTests/stSpecialTest/BadStateRootTx.json b/GeneralStateTests/stSpecialTest/BadStateRootTx.json
index f85f46843..b1bdb4b49 100644
--- a/GeneralStateTests/stSpecialTest/BadStateRootTx.json
+++ b/GeneralStateTests/stSpecialTest/BadStateRootTx.json
@@ -1,17 +1,17 @@
 {
     "BadStateRootTx" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f8705795c59bf2298bf493132c473a02b63e64ee8d7d5661c7bc32fc18965cdf",
+                    "hash" : "0xf8705795c59bf2298bf493132c473a02b63e64ee8d7d5661c7bc32fc18965cdf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f8705795c59bf2298bf493132c473a02b63e64ee8d7d5661c7bc32fc18965cdf",
+                    "hash" : "0xf8705795c59bf2298bf493132c473a02b63e64ee8d7d5661c7bc32fc18965cdf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f8705795c59bf2298bf493132c473a02b63e64ee8d7d5661c7bc32fc18965cdf",
+                    "hash" : "0xf8705795c59bf2298bf493132c473a02b63e64ee8d7d5661c7bc32fc18965cdf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f8705795c59bf2298bf493132c473a02b63e64ee8d7d5661c7bc32fc18965cdf",
+                    "hash" : "0xf8705795c59bf2298bf493132c473a02b63e64ee8d7d5661c7bc32fc18965cdf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f8705795c59bf2298bf493132c473a02b63e64ee8d7d5661c7bc32fc18965cdf",
+                    "hash" : "0xf8705795c59bf2298bf493132c473a02b63e64ee8d7d5661c7bc32fc18965cdf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "1baf27b88c48dd02b744999cf3522766929d2b2a" : {
+            "0x1baf27b88c48dd02b744999cf3522766929d2b2a" : {
                 "balance" : "0x03e8",
                 "code" : "0x600073a94f5374fce5edbc8e2a8697c15331677e6ebf0b3314156023573540602035145b15602e576040356000555b",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1e8480",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 "0x00000000000000000000000000000000000000000000000000000000000bc03712fac13c68425054e372b0861af05648614d69d32800fba9ad4522238d4b937a0000000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit" : [
-                "200000"
+                "0x030d40"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1baf27b88c48dd02b744999cf3522766929d2b2a",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1baf27b88c48dd02b744999cf3522766929d2b2a",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stSpecialTest/JUMPDEST_Attack.json b/GeneralStateTests/stSpecialTest/JUMPDEST_Attack.json
index a9bb62f96..be49baba3 100644
--- a/GeneralStateTests/stSpecialTest/JUMPDEST_Attack.json
+++ b/GeneralStateTests/stSpecialTest/JUMPDEST_Attack.json
@@ -1,17 +1,17 @@
 {
     "JUMPDEST_Attack" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x05f5e100",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "eafa4f52c37d24c6f3cbfba876bb75b68c25f43851c9b2b136a28baa1aafcf5a",
+                    "hash" : "0xeafa4f52c37d24c6f3cbfba876bb75b68c25f43851c9b2b136a28baa1aafcf5a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "eafa4f52c37d24c6f3cbfba876bb75b68c25f43851c9b2b136a28baa1aafcf5a",
+                    "hash" : "0xeafa4f52c37d24c6f3cbfba876bb75b68c25f43851c9b2b136a28baa1aafcf5a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "33bd0cb07d88b4708a23ec8e264813c207ea04a3bea49d632ff3556273d8e242",
+                    "hash" : "0x33bd0cb07d88b4708a23ec8e264813c207ea04a3bea49d632ff3556273d8e242",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "33bd0cb07d88b4708a23ec8e264813c207ea04a3bea49d632ff3556273d8e242",
+                    "hash" : "0x33bd0cb07d88b4708a23ec8e264813c207ea04a3bea49d632ff3556273d8e242",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "eafa4f52c37d24c6f3cbfba876bb75b68c25f43851c9b2b136a28baa1aafcf5a",
+                    "hash" : "0xeafa4f52c37d24c6f3cbfba876bb75b68c25f43851c9b2b136a28baa1aafcf5a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x600060006000600060003061c3505a03f1005b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "100000000"
+                "0x05f5e100"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSpecialTest/JUMPDEST_AttackwithJump.json b/GeneralStateTests/stSpecialTest/JUMPDEST_AttackwithJump.json
index 614e44a9a..533018049 100644
--- a/GeneralStateTests/stSpecialTest/JUMPDEST_AttackwithJump.json
+++ b/GeneralStateTests/stSpecialTest/JUMPDEST_AttackwithJump.json
@@ -1,17 +1,17 @@
 {
     "JUMPDEST_AttackwithJump" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x05f5e100",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "fac04cf2479ecd0c28ed146800a0014f3776d44b39fb09f7c8f047400488fb0b",
+                    "hash" : "0xfac04cf2479ecd0c28ed146800a0014f3776d44b39fb09f7c8f047400488fb0b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "fac04cf2479ecd0c28ed146800a0014f3776d44b39fb09f7c8f047400488fb0b",
+                    "hash" : "0xfac04cf2479ecd0c28ed146800a0014f3776d44b39fb09f7c8f047400488fb0b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f121c5c2d9dd75894d849c8a96ff1817ef5999d7e9928cf952554935c7a8e82e",
+                    "hash" : "0xf121c5c2d9dd75894d849c8a96ff1817ef5999d7e9928cf952554935c7a8e82e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f121c5c2d9dd75894d849c8a96ff1817ef5999d7e9928cf952554935c7a8e82e",
+                    "hash" : "0xf121c5c2d9dd75894d849c8a96ff1817ef5999d7e9928cf952554935c7a8e82e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "fac04cf2479ecd0c28ed146800a0014f3776d44b39fb09f7c8f047400488fb0b",
+                    "hash" : "0xfac04cf2479ecd0c28ed146800a0014f3776d44b39fb09f7c8f047400488fb0b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6003565b600060006000600060003061c3505a03f1005b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "100000000"
+                "0x05f5e100"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSpecialTest/OverflowGasMakeMoney.json b/GeneralStateTests/stSpecialTest/OverflowGasMakeMoney.json
index 7cf95cfe3..03144a44d 100644
--- a/GeneralStateTests/stSpecialTest/OverflowGasMakeMoney.json
+++ b/GeneralStateTests/stSpecialTest/OverflowGasMakeMoney.json
@@ -1,17 +1,17 @@
 {
     "OverflowGasMakeMoney" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a60566e0ecd43f9224e59c41de05e376869357327052aba6a61614fbcccf32ac",
+                    "hash" : "0xa60566e0ecd43f9224e59c41de05e376869357327052aba6a61614fbcccf32ac",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a60566e0ecd43f9224e59c41de05e376869357327052aba6a61614fbcccf32ac",
+                    "hash" : "0xa60566e0ecd43f9224e59c41de05e376869357327052aba6a61614fbcccf32ac",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a60566e0ecd43f9224e59c41de05e376869357327052aba6a61614fbcccf32ac",
+                    "hash" : "0xa60566e0ecd43f9224e59c41de05e376869357327052aba6a61614fbcccf32ac",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a60566e0ecd43f9224e59c41de05e376869357327052aba6a61614fbcccf32ac",
+                    "hash" : "0xa60566e0ecd43f9224e59c41de05e376869357327052aba6a61614fbcccf32ac",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a60566e0ecd43f9224e59c41de05e376869357327052aba6a61614fbcccf32ac",
+                    "hash" : "0xa60566e0ecd43f9224e59c41de05e376869357327052aba6a61614fbcccf32ac",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x03e8",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -78,10 +78,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "501"
+                "0x01f5"
             ]
         }
     }
diff --git a/GeneralStateTests/stSpecialTest/StackDepthLimitSEC.json b/GeneralStateTests/stSpecialTest/StackDepthLimitSEC.json
index ed5d8d4a1..97916448a 100644
--- a/GeneralStateTests/stSpecialTest/StackDepthLimitSEC.json
+++ b/GeneralStateTests/stSpecialTest/StackDepthLimitSEC.json
@@ -1,17 +1,17 @@
 {
     "StackDepthLimitSEC" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "68f497ee77ebf9247fe0c5df49aae2b78bc0010983cec0f79b1cb440652bfd06",
+                    "hash" : "0x68f497ee77ebf9247fe0c5df49aae2b78bc0010983cec0f79b1cb440652bfd06",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "833aa0052cff19618ec94e8996dbc8fc5e1722a37dec95e11dbdcb072bc279aa",
+                    "hash" : "0x833aa0052cff19618ec94e8996dbc8fc5e1722a37dec95e11dbdcb072bc279aa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "00056a5cf74634e496d1eba26e3a027b0d2c679333b923053fad7918e882c9aa",
+                    "hash" : "0x00056a5cf74634e496d1eba26e3a027b0d2c679333b923053fad7918e882c9aa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "68f497ee77ebf9247fe0c5df49aae2b78bc0010983cec0f79b1cb440652bfd06",
+                    "hash" : "0x68f497ee77ebf9247fe0c5df49aae2b78bc0010983cec0f79b1cb440652bfd06",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "833aa0052cff19618ec94e8996dbc8fc5e1722a37dec95e11dbdcb072bc279aa",
+                    "hash" : "0x833aa0052cff19618ec94e8996dbc8fc5e1722a37dec95e11dbdcb072bc279aa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f5e100",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -74,14 +74,14 @@
                 "305032503350600460006000396000515060046000600037600051506f600060006000600060003060405a03f160005260106010f3"
             ],
             "gasLimit" : [
-                "1000000"
+                "0x0f4240"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stSpecialTest/block504980.json b/GeneralStateTests/stSpecialTest/block504980.json
index a81752d32..96062cc70 100644
--- a/GeneralStateTests/stSpecialTest/block504980.json
+++ b/GeneralStateTests/stSpecialTest/block504980.json
@@ -1,17 +1,17 @@
 {
     "block504980" : {
         "env" : {
-            "currentCoinbase" : "1cdc8315bdb1362de8b7b2fa9ee75dc873037179",
+            "currentCoinbase" : "0x1cdc8315bdb1362de8b7b2fa9ee75dc873037179",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x2fefd8",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "9ff4de714e01da9f8b61992efdab9b51ca14ac42d43f4c24df1d002a1239b1e9"
+            "previousHash" : "0x9ff4de714e01da9f8b61992efdab9b51ca14ac42d43f4c24df1d002a1239b1e9"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "933c40bf2ae3cb437f9ae9a3fb2fa5f69b74ef40a6ee6fcd592e114d39242904",
+                    "hash" : "0x933c40bf2ae3cb437f9ae9a3fb2fa5f69b74ef40a6ee6fcd592e114d39242904",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "933c40bf2ae3cb437f9ae9a3fb2fa5f69b74ef40a6ee6fcd592e114d39242904",
+                    "hash" : "0x933c40bf2ae3cb437f9ae9a3fb2fa5f69b74ef40a6ee6fcd592e114d39242904",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "feecee5008c30a0e1ea56177c862cdee3a3c356a6c1d2d7732e6c5989f5f53e4",
+                    "hash" : "0xfeecee5008c30a0e1ea56177c862cdee3a3c356a6c1d2d7732e6c5989f5f53e4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "feecee5008c30a0e1ea56177c862cdee3a3c356a6c1d2d7732e6c5989f5f53e4",
+                    "hash" : "0xfeecee5008c30a0e1ea56177c862cdee3a3c356a6c1d2d7732e6c5989f5f53e4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "933c40bf2ae3cb437f9ae9a3fb2fa5f69b74ef40a6ee6fcd592e114d39242904",
+                    "hash" : "0x933c40bf2ae3cb437f9ae9a3fb2fa5f69b74ef40a6ee6fcd592e114d39242904",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,42 +61,42 @@
             ]
         },
         "pre" : {
-            "0000000000000000000000000000000000000000" : {
+            "0x0000000000000000000000000000000000000000" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0000000000000000000000000000000000000001" : {
+            "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0000000000000000000000000000000000000002" : {
+            "0x0000000000000000000000000000000000000002" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0000000000000000000000000000000000000003" : {
+            "0x0000000000000000000000000000000000000003" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0000000000000000000000000000000000000004" : {
+            "0x0000000000000000000000000000000000000004" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0ea65418d7bf32680f55572c943a94b590804998" : {
+            "0x0ea65418d7bf32680f55572c943a94b590804998" : {
                 "balance" : "0x00",
                 "code" : "0x600061289f537c01000000000000000000000000000000000000000000000000000000006000350473c9ae5868651bf7b7db6e360217db49ce4e69c07e60205263c4982a8581141561012757600435606052602435608052608060805990590160009052600081526060518160200152608051816040015260008160600152809050205460a05260a051806020026020015990590160009052818152602081019050905060e0526000610140525b60a05161014051121561010b5760a060a0599059016000905260008152606051816020015260805181604001526001816060015261014051816080015280905020546101405160200260e051015260016101405101610140526100ad565b60e05160206040820352602060208203510260400160408203f3505b63cc1c944e8114156101765760043560605260243560805260806080599059016000905260008152606051816020015260805181604001526000816060015280905020546101a05260206101a0f35b6395a405b98114156101d5576004356060526024356080526044356101e05260a060a059905901600090526000815260605181602001526080518160400152600181606001526101e05181608001528090502054610200526020610200f35b6371ebb662811415610224576004356060526024356080526080608059905901600090526000815260605181602001526080518160400152600281606001528090502054610240526020610240f35b637a57a3db811415610325576004356060526024356080526044356102805260c060c0599059016000905260008152606051816020015260805181604001526003816060015261028051816080015260008160a0015280905020608060805990590160009052600081526060518160200152608051816040015260008160600152809050205460200280806020015990590160009052818152602081019050905060005b602083048112156102e95780840154816020028301526001810190506102c8565b602083066020036101000a60000381850154168160200283015281905090509050905060206040820352602060208203510260400160408203f3505b63f73dc690811415610394576004356060526024356080526044356103c0526064356103e05260c060c059905901600090526000815260605181602001526080518160400152600381606001526103c05181608001526103e0518160a001528090502054610400526020610400f35b6354cc61098114156103f3576004356060526024356080526044356103c05260a060a059905901600090526000815260605181602001526080518160400152600481606001526103c05181608001528090502054610440526020610440f35b63c63ef546811415610442576004356060526024356080526080608059905901600090526000815260605181602001526080518160400152600581606001528090502054610480526020610480f35b639381779b8114156105335760043560605260243560805260a060a059905901600090526000815260605181602001526080518160400152600681606001526000816080015280905020608060805990590160009052600081526060518160200152608051816040015260058160600152809050205460200280806020015990590160009052818152602081019050905060005b602083048112156104f75780840154816020028301526001810190506104d6565b602083066020036101000a60000381850154168160200283015281905090509050905060206040820352602060208203510260400160408203f3505b634f9c6eeb8114156106245760043560605260243560805260a060a059905901600090526000815260605181602001526080518160400152600781606001526000816080015280905020608060805990590160009052600081526060518160200152608051816040015260058160600152809050205460200280806020015990590160009052818152602081019050905060005b602083048112156105e85780840154816020028301526001810190506105c7565b602083066020036101000a60000381850154168160200283015281905090509050905060206040820352602060208203510260400160408203f3505b637dc121958114156107155760043560605260243560805260a060a059905901600090526000815260605181602001526080518160400152600881606001526000816080015280905020608060805990590160009052600081526060518160200152608051816040015260058160600152809050205460200280806020015990590160009052818152602081019050905060005b602083048112156106d95780840154816020028301526001810190506106b8565b602083066020036101000a60000381850154168160200283015281905090509050905060206040820352602060208203510260400160408203f3505b63fa9832d18114156108065760043560605260243560805260a060a059905901600090526000815260605181602001526080518160400152600981606001526000816080015280905020608060805990590160009052600081526060518160200152608051816040015260008160600152809050205460200280806020015990590160009052818152602081019050905060005b602083048112156107ca5780840154816020028301526001810190506107a9565b602083066020036101000a60000381850154168160200283015281905090509050905060206040820352602060208203510260400160408203f3505b632c5a40d58114156108f75760043560605260243560805260a060a059905901600090526000815260605181602001526080518160400152600a81606001526000816080015280905020608060805990590160009052600081526060518160200152608051816040015260058160600152809050205460200280806020015990590160009052818152602081019050905060005b602083048112156108bb57808401548160200283015260018101905061089a565b602083066020036101000a60000381850154168160200283015281905090509050905060206040820352602060208203510260400160408203f3505b63e05dcb568114156109eb5760043560605260243560805260a060a059905901600090526000815260605181602001526080518160400152600b81606001526000816080015280905020600260806080599059016000905260008152606051816020015260805181604001526000816060015280905020546020020180806020015990590160009052818152602081019050905060005b602083048112156109af57808401548160200283015260018101905061098e565b602083066020036101000a60000381850154168160200283015281905090509050905060206040820352602060208203510260400160408203f3505b63586b5be0811415610a3a576004356060526024356080526080608059905901600090526000815260605181602001526080518160400152600c81606001528090502054610b80526020610b80f35b63eb8af5aa811415610b585760043560605260243560805260a060a059905901600090526000815260605181602001526080518160400152600d81606001526000816080015280905020608060805990590160009052600081526060518160200152608051816040015260008160600152809050205460806080599059016000905260008152606051816020015260805181604001526005816060015280905020540560200280806020015990590160009052818152602081019050905060005b60208304811215610b1c578084015481602002830152600181019050610afb565b602083066020036101000a60000381850154168160200283015281905090509050905060206040820352602060208203510260400160408203f3505b637ab6ea8a811415610c765760043560605260243560805260a060a059905901600090526000815260605181602001526080518160400152600e81606001526000816080015280905020608060805990590160009052600081526060518160200152608051816040015260008160600152809050205460806080599059016000905260008152606051816020015260805181604001526005816060015280905020540560200280806020015990590160009052818152602081019050905060005b60208304811215610c3a578084015481602002830152600181019050610c19565b602083066020036101000a60000381850154168160200283015281905090509050905060206040820352602060208203510260400160408203f3505b632b810cb9811415610d945760043560605260243560805260a060a059905901600090526000815260605181602001526080518160400152600f81606001526000816080015280905020608060805990590160009052600081526060518160200152608051816040015260008160600152809050205460806080599059016000905260008152606051816020015260805181604001526005816060015280905020540560200280806020015990590160009052818152602081019050905060005b60208304811215610d58578084015481602002830152600181019050610d37565b602083066020036101000a60000381850154168160200283015281905090509050905060206040820352602060208203510260400160408203f3505b637fb42e46811415610e855760043560605260243560805260a060a059905901600090526000815260605181602001526080518160400152601081606001526000816080015280905020608060805990590160009052600081526060518160200152608051816040015260008160600152809050205460200280806020015990590160009052818152602081019050905060005b60208304811215610e49578084015481602002830152600181019050610e28565b602083066020036101000a60000381850154168160200283015281905090509050905060206040820352602060208203510260400160408203f3505b63734fa727811415610f765760043560605260243560805260a060a059905901600090526000815260605181602001526080518160400152601181606001526000816080015280905020608060805990590160009052600081526060518160200152608051816040015260008160600152809050205460200280806020015990590160009052818152602081019050905060005b60208304811215610f3a578084015481602002830152600181019050610f19565b602083066020036101000a60000381850154168160200283015281905090509050905060206040820352602060208203510260400160408203f3505b63c67fa8578114156110675760043560605260243560805260a060a059905901600090526000815260605181602001526080518160400152601281606001526000816080015280905020608060805990590160009052600081526060518160200152608051816040015260008160600152809050205460200280806020015990590160009052818152602081019050905060005b6020830481121561102b57808401548160200283015260018101905061100a565b602083066020036101000a60000381850154168160200283015281905090509050905060206040820352602060208203510260400160408203f3505b635ed853e48114156111855760043560605260243560805260a060a059905901600090526000815260605181602001526080518160400152601381606001526000816080015280905020608060805990590160009052600081526060518160200152608051816040015260008160600152809050205460806080599059016000905260008152606051816020015260805181604001526005816060015280905020540560200280806020015990590160009052818152602081019050905060005b60208304811215611149578084015481602002830152600181019050611128565b602083066020036101000a60000381850154168160200283015281905090509050905060206040820352602060208203510260400160408203f3505b63b86f51258114156112a35760043560605260243560805260a060a059905901600090526000815260605181602001526080518160400152601481606001526000816080015280905020608060805990590160009052600081526060518160200152608051816040015260008160600152809050205460806080599059016000905260008152606051816020015260805181604001526005816060015280905020540560200280806020015990590160009052818152602081019050905060005b60208304811215611267578084015481602002830152600181019050611246565b602083066020036101000a60000381850154168160200283015281905090509050905060206040820352602060208203510260400160408203f3505b63bc3d7d858114156113945760043560605260243560805260a060a059905901600090526000815260605181602001526080518160400152601581606001526000816080015280905020608060805990590160009052600081526060518160200152608051816040015260008160600152809050205460200280806020015990590160009052818152602081019050905060005b60208304811215611358578084015481602002830152600181019050611337565b602083066020036101000a60000381850154168160200283015281905090509050905060206040820352602060208203510260400160408203f3505b63a2302f2f81141561148157600435606052602435611680526044356116a0526116a05160a060a0599059016000905260008152606051816020015261168051816040015260018160600152608060805990590160009052600081526060518160200152611680518160400152600081606001528090502054816080015280905020556001608060805990590160009052600081526060518160200152611680518160400152600081606001528090502054016080608059905901600090526000815260605181602001526116805181604001526000816060015280905020556001611740526020611740f35b63058ca2bc8114156114dd576004356060526024356080526044356117605261176051608060805990590160009052600081526060518160200152608051816040015260028160600152809050205560016117a05260206117a0f35b635d3b965b8114156116175736599059016000905236600482376004356060526024356080526044356102805260643560208201016117e052608435611800525060c060c0599059016000905260008152606051816020015260805181604001526003816060015261028051816080015260008160a001528090502060206117e05103516020026020810460005b8181121561158c57806020026117e05101518482015560018101905061156b565b602083066020036101000a600003816020026117e05101511684820155505050506118005160806080599059016000905260008152606051816020015260805181604001526002816060015280905020540160806080599059016000905260008152606051816020015260805181604001526002816060015280905020556001611900526020611900f35b63b0e14f0f81141561167357600435606052602435608052604435611920526119205160806080599059016000905260008152606051816020015260805181604001526005816060015280905020556001611960526020611960f35b636acccdbc8114156117395736599059016000905236600482376004356060526024356080526044356020820101611980525060a060a05990590160009052600081526060518160200152608051816040015260068160600152600081608001528090502060206119805103516020026020810460005b8181121561170b5780602002611980510151848201556001810190506116ea565b602083066020036101000a600003816020026119805101511684820155505050506001611a40526020611a40f35b63a1fa51f98114156117ff5736599059016000905236600482376004356060526024356080526044356020820101611a60525060a060a0599059016000905260008152606051816020015260805181604001526007816060015260008160800152809050206020611a605103516020026020810460005b818112156117d15780602002611a60510151848201556001810190506117b0565b602083066020036101000a60000381602002611a605101511684820155505050506001611b20526020611b20f35b63cd87f43a8114156118c55736599059016000905236600482376004356060526024356080526044356020820101611b40525060a060a0599059016000905260008152606051816020015260805181604001526008816060015260008160800152809050206020611b405103516020026020810460005b818112156118975780602002611b4051015184820155600181019050611876565b602083066020036101000a60000381602002611b405101511684820155505050506001611c00526020611c00f35b63222a866381141561198b5736599059016000905236600482376004356060526024356080526044356020820101611c20525060a060a0599059016000905260008152606051816020015260805181604001526009816060015260008160800152809050206020611c205103516020026020810460005b8181121561195d5780602002611c205101518482015560018101905061193c565b602083066020036101000a60000381602002611c205101511684820155505050506001611ce0526020611ce0f35b63b39e1faa811415611a515736599059016000905236600482376004356060526024356080526044356020820101611d00525060a060a059905901600090526000815260605181602001526080518160400152600a816060015260008160800152809050206020611d005103516020026020810460005b81811215611a235780602002611d0051015184820155600181019050611a02565b602083066020036101000a60000381602002611d005101511684820155505050506001611dc0526020611dc0f35b63e365736b811415611b175736599059016000905236600482376004356060526024356080526044356020820101611de0525060a060a059905901600090526000815260605181602001526080518160400152600b816060015260008160800152809050206020611de05103516020026020810460005b81811215611ae95780602002611de051015184820155600181019050611ac8565b602083066020036101000a60000381602002611de05101511684820155505050506001611ea0526020611ea0f35b63aad7d6e3811415611b7357600435606052602435608052604435611ec052611ec0516080608059905901600090526000815260605181602001526080518160400152600c816060015280905020556001611f00526020611f00f35b6301112b27811415611c395736599059016000905236600482376004356060526024356080526044356020820101611f20525060a060a059905901600090526000815260605181602001526080518160400152600d816060015260008160800152809050206020611f205103516020026020810460005b81811215611c0b5780602002611f2051015184820155600181019050611bea565b602083066020036101000a60000381602002611f205101511684820155505050506001611fe0526020611fe0f35b63bdbb239b811415611cff5736599059016000905236600482376004356060526024356080526044356020820101612000525060a060a059905901600090526000815260605181602001526080518160400152600e8160600152600081608001528090502060206120005103516020026020810460005b81811215611cd1578060200261200051015184820155600181019050611cb0565b602083066020036101000a6000038160200261200051015116848201555050505060016120c05260206120c0f35b6305a0cd48811415611dc557365990590160009052366004823760043560605260243560805260443560208201016120e0525060a060a059905901600090526000815260605181602001526080518160400152600f8160600152600081608001528090502060206120e05103516020026020810460005b81811215611d9757806020026120e051015184820155600181019050611d76565b602083066020036101000a600003816020026120e051015116848201555050505060016121a05260206121a0f35b63aaa1fe35811415611e8b57365990590160009052366004823760043560605260243560805260443560208201016121c0525060a060a05990590160009052600081526060518160200152608051816040015260108160600152600081608001528090502060206121c05103516020026020810460005b81811215611e5d57806020026121c051015184820155600181019050611e3c565b602083066020036101000a600003816020026121c05101511684820155505050506001612280526020612280f35b632be4935d811415611f5157365990590160009052366004823760043560605260243560805260443560208201016122a0525060a060a05990590160009052600081526060518160200152608051816040015260118160600152600081608001528090502060206122a05103516020026020810460005b81811215611f2357806020026122a051015184820155600181019050611f02565b602083066020036101000a600003816020026122a05101511684820155505050506001612360526020612360f35b6313a8350d8114156120175736599059016000905236600482376004356060526024356080526044356020820101612380525060a060a05990590160009052600081526060518160200152608051816040015260128160600152600081608001528090502060206123805103516020026020810460005b81811215611fe9578060200261238051015184820155600181019050611fc8565b602083066020036101000a600003816020026123805101511684820155505050506001612440526020612440f35b63cb540b458114156120dd5736599059016000905236600482376004356060526024356080526044356020820101612460525060a060a05990590160009052600081526060518160200152608051816040015260138160600152600081608001528090502060206124605103516020026020810460005b818112156120af57806020026124605101518482015560018101905061208e565b602083066020036101000a600003816020026124605101511684820155505050506001612520526020612520f35b63be0306278114156121a35736599059016000905236600482376004356060526024356080526044356020820101612540525060a060a05990590160009052600081526060518160200152608051816040015260148160600152600081608001528090502060206125405103516020026020810460005b81811215612175578060200261254051015184820155600181019050612154565b602083066020036101000a600003816020026125405101511684820155505050506001612600526020612600f35b6383fd77f08114156122695736599059016000905236600482376004356060526024356080526044356020820101612620525060a060a05990590160009052600081526060518160200152608051816040015260158160600152600081608001528090502060206126205103516020026020810460005b8181121561223b57806020026126205101518482015560018101905061221a565b602083066020036101000a6000038160200261262051015116848201555050505060016126e05260206126e0f35b63594622058114156122d5576004356060526024356080526044356103c052606435612700526127005160a060a059905901600090526000815260605181602001526080518160400152600481606001526103c051816080015280905020556001612740526020612740f35b63bb8e419681141561244857600435606052602435612760526044356127805260006127a0525b6080608059905901600090526000815260605181602001526001612760510381604001526000816060015280905020546127a051121561243b5760a060a05990590160009052600081526060518160200152600161276051038160400152600181606001526127a0518160800152809050205460a060a05990590160009052600081526060518160200152612780518160400152600181606001526080608059905901600090526000815260605181602001526127805181604001526000816060015280905020548160800152809050205560016080608059905901600090526000815260605181602001526127805181604001526000816060015280905020540160806080599059016000905260008152606051816020015261278051816040015260008160600152809050205560016127a051016127a0526122fc565b6001612880526020612880f35b50",
                 "nonce" : "0x00",
@@ -165,42 +165,42 @@
                     "0xfd280ac5182d5b2366122f38acfa6dc471240ffde9d5feb985ce7a2325c960e7" : "0x03"
                 }
             },
-            "142a6927cf0060133187ba8a8e74d641438f0c1c" : {
+            "0x142a6927cf0060133187ba8a8e74d641438f0c1c" : {
                 "balance" : "0x00",
                 "code" : "0x600061031f537c01000000000000000000000000000000000000000000000000000000006000350473c9ae5868651bf7b7db6e360217db49ce4e69c07e602052730ea65418d7bf32680f55572c943a94b5908049986040526327138bfb81141561038d57600435608052601c6044599059016000905201637a66d7ca601c8203526080516004820152602060e06024836000602051602d5a03f15060e051905060a052601c604459905901600090520163c60409c6601c820352608051600482015260206101206024836000602051602d5a03f150610120519050430561010052600061014052600061016052600061018052600260a051016101005112151561010a576001610140525b60006101a052610100516101c0525b606461010051016101c051121561018457601c606459905901600090520163cc1c944e601c82035260805160048201526101c051602482015260206101e06044836000604051602d5a03f1506101e05190506101a051016101a05260016101c051016101c052610119565b6005601c606459905901600090520163cc1c944e601c820352608051600482015260a051602482015260206102006044836000604051602d5a03f1506102005190501280156101d357806101db565b600a6101a051125b9050156101eb57610140516101ee565b60005b1561033657601c604459905901600090520163c5476efe601c820352608051600482015260206102406024836000602051602d5a03f15061024051905050601c6064599059016000905201637265802d601c82035260805160048201526000602482015260206102606044836000602051602d5a03f15061026051905050601c606459905901600090520163c286273a601c82035260805160048201526000602482015260206102806044836000602051602d5a03f15061028051905050601c6044599059016000905201637a66d7ca601c820352608051600482015260206102a06024836000602051602d5a03f1506102a051905060a052601c608459905901600090520163bb8e4196601c820352608051600482015260a051602482015261010051604482015260206102c06064836000604051602d5a03f1506102c051905050610343565b6001610160526001610180525b61014051156103555761016051610358565b60005b156103665761018051610369565b60005b1561037f5760016102e05260206102e0f361038c565b6000610300526020610300f35b5b50",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1cdc8315bdb1362de8b7b2fa9ee75dc873037179" : {
+            "0x1cdc8315bdb1362de8b7b2fa9ee75dc873037179" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "9761fecf88590592cf05ce545504d376d1693ab3" : {
+            "0x9761fecf88590592cf05ce545504d376d1693ab3" : {
                 "balance" : "0x00",
                 "code" : "0x60006105df537c010000000000000000000000000000000000000000000000000000000060003504730ea65418d7bf32680f55572c943a94b59080499860205273e509e3a93beb1eba72f8cb8d25f93a85e2d54afb60405273c9ae5868651bf7b7db6e360217db49ce4e69c07e60605273f1562e1c0d0baa3ea746442bb7f11153fcf5cfda60805263546fdeb381141561038d5760043560c05260243560e05260443561010052606435610120526084356101405260026101005101601c606459905901600090520163e05dcb56601c82035260c051600482015260e05160248201526002610100510160408160200201599059016000905281602002604001816044856000602051602d5a03f150604081019050905090506000600161010051016020028201511415610250576060601c61014c59905901600090520163e365736b601c82035260c051600482015260e0516024820152601c6084599059016000905201632f300bee601c82035260026004820152600560248201526101005160448201528460408160200201599059016000905281602002604001816064856000608051602d5a03f1506040810190509050905060208103516020026020018360448401526020820360a4840152806101088401528084019350505081600401599059016000905260648160648460006004601cf16101fc57fe5b6064810192506101088201518080858260a487015160006004600a8705601201f161022357fe5b50808401935050808303602061028082846000602051602d5a03f15061028051905090509050905061037d565b6060601c61014c59905901600090520163e365736b601c82035260c051600482015260e0516024820152601c6084599059016000905201632f300bee601c820352600160016101005101602002850151036004820152600560248201526101005160448201528460408160200201599059016000905281602002604001816064856000608051602d5a03f1506040810190509050905060208103516020026020018360448401526020820360a4840152806101088401528084019350505081600401599059016000905260648160648460006004601cf161032d57fe5b6064810192506101088201518080858260a487015160006004600a8705601201f161035457fe5b5080840193505080830360206102c082846000602051602d5a03f1506102c05190509050905090505b5060016102e05260206102e0f350505b63de9080c88114156107645760043560c05260243560e05260443561010052606435610120526084356101405260026101005101601c606459905901600090520163e05dcb56601c82035260c051600482015260e05160248201528160408160200201599059016000905281602002604001816044856000602051602d5a03f15060408101905090509050601c6064599059016000905201632c5a40d5601c82035260c051600482015260e05160248201526101405160408160200201599059016000905281602002604001816044856000602051602d5a03f1506040810190509050905061012051806020026020015990590160009052818152602081019050905060005b610120518112156104ee57601c60645990590160009052016328c8b315601c82035260c051600482015281602482015260206103606044836000604051602d5a03f15061036051905081602002830152600181019050610493565b5060a0601c61020c59905901600090520163a647a5b9601c8203528460208103516020026020018360048401526020820360a484015280610148840152808401935050508360208103516020026020018360248401526020820360c484015280610168840152808401935050508260208103516020026020018360448401526020820360e4840152806101888401528084019350505061012051606482015261010051608482015281600401599059016000905260a48160a484600060046022f16105b557fe5b60a4810192506101488201518080858260a487015160006004600a8705601201f16105dc57fe5b508084019350506101688201518080858260c487015160006004600a8705601201f161060457fe5b508084019350506101888201518080858260e487015160006004600a8705601201f161062c57fe5b5080840193505080830387604081602002015990590160009052816020026040018184866000608051602d5a03f1506040810190509050905090509050905092506060601c61014c59905901600090520163e365736b601c82035260c051600482015260e05160248201528460208103516020026020018360448401526020820360a4840152806101088401528084019350505081600401599059016000905260648160648460006004601cf16106df57fe5b6064810192506101088201518080858260a487015160006004600a8705601201f161070657fe5b5080840193505080830360206103c082846000602051602d5a03f1506103c05190509050905090505060006101005160200284015114156107525760006103e05260206103e0f361075f565b6001610400526020610400f35b505050505b63384ca8dd811415610a665760043560c05260243560e052604435610100526064356101205260843561014052601c606459905901600090520163e05dcb56601c82035260c051600482015260e05160248201526002610100510160408160200201599059016000905281602002604001816044856000602051602d5a03f15060408101905090509050601c606459905901600090520163fa9832d1601c82035260c051600482015260e05160248201526101005160408160200201599059016000905281602002604001816044856000602051602d5a03f15060408101905090509050601c608459905901600090520163aad7d6e3601c82035260c051600482015260e05160248201526060601c61014c599059016000905201635b180229601c8203528360208103516020026020018360048401526020820360648401528060c8840152808401935050508460208103516020026020018360248401526020820360848401528060e88401528084019350505061010051604482015281600401599059016000905260648160648460006004601cf161090157fe5b60648101925060c882015180808582606487015160006004600a8705601201f161092757fe5b5080840193505060e882015180808582608487015160006004600a8705601201f161094e57fe5b50808401935050808303602061044082846000608051602d5a03f150610440519050905090509050604482015260206104606064836000602051602d5a03f150610460519050506060601c61014c59905901600090520163222a8663601c82035260c051600482015260e05160248201528260208103516020026020018360448401526020820360a4840152806101088401528084019350505081600401599059016000905260648160648460006004601cf1610a0757fe5b6064810192506101088201518080858260a487015160006004600a8705601201f1610a2e57fe5b50808401935050808303602061048082846000602051602d5a03f1506104805190509050905090505060016104a05260206104a0f350505b63d5dc5af1811415610d4b5760043560c05260243560e052604435610100526064356101205260843561014052601c606459905901600090520163e05dcb56601c82035260c051600482015260e05160248201526002610100510160408160200201599059016000905281602002604001816044856000602051602d5a03f15060408101905090509050601c6064599059016000905201632c5a40d5601c82035260c051600482015260e05160248201526101405160408160200201599059016000905281602002604001816044856000602051602d5a03f150604081019050905090506080601c6101ac59905901600090520163f4ca7dc4601c82035283602081035160200260200183600484015260208203608484015280610108840152808401935050508260208103516020026020018360248401526020820360a4840152806101288401528084019350505061012051604482015261010051606482015281600401599059016000905260848160848460006004601ff1610be757fe5b60848101925061010882015180808582608487015160006004600a8705601201f1610c0e57fe5b508084019350506101288201518080858260a487015160006004600a8705601201f1610c3657fe5b5080840193505080830361014051604081602002015990590160009052816020026040018184866000608051602d5a03f1506040810190509050905090509050905090506060601c61014c59905901600090520163b39e1faa601c82035260c051600482015260e05160248201528260208103516020026020018360448401526020820360a4840152806101088401528084019350505081600401599059016000905260648160648460006004601cf1610cec57fe5b6064810192506101088201518080858260a487015160006004600a8705601201f1610d1357fe5b5080840193505080830360206104c082846000602051602d5a03f1506104c05190509050905090505060016104e05260206104e0f350505b630939aa8c81141561114c5760043560c05260243560e052604435610100526064356101205260843561014052601c606459905901600090520163e05dcb56601c82035260c051600482015260e05160248201526002610100510160408160200201599059016000905281602002604001816044856000602051602d5a03f15060408101905090509050601c6064599059016000905201637dc12195601c82035260c051600482015260e05160248201526101405160408160200201599059016000905281602002604001816044856000602051602d5a03f15060408101905090509050601c606459905901600090520163586b5be0601c82035260c051600482015260e051602482015260206105006044836000602051602d5a03f150610500519050601c606459905901600090520163eb8af5aa601c82035260c051600482015260e05160248201526101205160408160200201599059016000905281602002604001816044856000602051602d5a03f1506040810190509050905060c0601c61026c59905901600090520163232b2734601c8203528260208103516020026020018360048401526020820360c484015280610188840152808401935050508560208103516020026020018360248401526020820360e4840152806101a88401528084019350505084602081035160200260200183604484015260208203610104840152806101c8840152808401935050508360648201526101205160848201526101005160a482015281600401599059016000905260c48160c484600060046025f1610f9657fe5b60c4810192506101888201518080858260c487015160006004600a8705601201f1610fbd57fe5b508084019350506101a88201518080858260e487015160006004600a8705601201f1610fe557fe5b508084019350506101c88201518080858261010487015160006004600a8705601201f161100e57fe5b5080840193505080830361012051604081602002015990590160009052816020026040018184866000608051602d5a03f1506040810190509050905090509050905090506060601c61014c5990590160009052016301112b27601c82035260c051600482015260e05160248201528260208103516020026020018360448401526020820360a4840152806101088401528084019350505081600401599059016000905260648160648460006004601cf16110c457fe5b6064810192506101088201518080858260a487015160006004600a8705601201f16110eb57fe5b50808401935050808303602061058082846000602051602d5a03f15061058051905090509050905050600060016101005101602002850151141561113a5760006105a05260206105a0f3611147565b60016105c05260206105c0f35b505050505b50",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xd8d726b7177a800000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b03f030056db7d467d778326658bac0d1b35d8f7" : {
+            "0xb03f030056db7d467d778326658bac0d1b35d8f7" : {
                 "balance" : "0x00",
                 "code" : "0x600061075f537c010000000000000000000000000000000000000000000000000000000060003504731e147037f0a63df228fe6e7aef730f1ea31c8ce3602052730ea65418d7bf32680f55572c943a94b59080499860405273e509e3a93beb1eba72f8cb8d25f93a85e2d54afb60605273c9ae5868651bf7b7db6e360217db49ce4e69c07e60805273142a6927cf0060133187ba8a8e74d641438f0c1c60a05273b163e767e4c1ba5ae88b2ee7594f3a3fec2bb09660c05273ba7b277319128ef4c22635534d0f61dffdaa13ab60e052739761fecf88590592cf05ce545504d376d1693ab36101005273f70bbc50f1468cecae0761ef09386a87c1c696ea6101205273a89d22f049aaa5bbfb5f1a1939fff3ae7a26ae746101405273174827f7e53e8ce13b047adcac0eb3f2cb0c3285610160526336a560bd811415610a88576004356101a052601c60445990590160009052016327138bfb601c8203526101a051600482015260206101e0602483600060a051602d5a03f1506101e05190501515610195576001600003610200526020610200f35b601c6044599059016000905201637a66d7ca601c8203526101a051600482015260206102206024836000608051602d5a03f150610220519050601c606459905901600090520163cc1c944e601c8203526101a05160048201528160248201526020610260604483600061028051602d5a03f150610260519050601c60445990590160009052016380b5e7bd601c8203526101a051600482015260206102a06024836000606051602d5a03f1506102a0519050808202601c60445990590160009052016318633576601c8203526101a051600482015260206103006024836000608051602d5a03f150610300519050600981141561036d57601c60c459905901600090520163ac44d71e601c8203526101a0516004820152856024820152846044820152836064820152826084820152602061036060a483600061016051602d5a03f15061036051905050601c6064599059016000905201637265802d601c8203526101a05160048201526000602482015260206103806044836000608051602d5a03f15061038051905050601c604459905901600090520163c5476efe601c8203526101a051600482015260206103a06024836000608051602d5a03f1506103a051905050600185016103c05260206103c0f3610a3a565b60008114156103cd57601c60c459905901600090520163ef72638a601c8203526101a051600482015285602482015284604482015283606482015282608482015260206103e060a483600060c051602d5a03f1506103e051905050610a39565b600181141561042d57601c60c459905901600090520163a63e976c601c8203526101a0516004820152856024820152846044820152836064820152826084820152602061040060a483600060e051602d5a03f15061040051905050610a38565b600281141561048d57601c60c459905901600090520163533ea0ed601c8203526101a0516004820152856024820152846044820152836064820152826084820152602061042060a483600060e051602d5a03f15061042051905050610a37565b600381141561085057601c606459905901600090520163e05dcb56601c8203526101a0516004820152856024820152600285016040816020020159905901600090528160200260400181604485600061028051602d5a03f15060408101905090509050601c6044599059016000905201633d905045601c8203526101a051600482015260206104806024836000608051602d5a03f150610480519050600481141561063357601c60c4599059016000905201630939aa8c601c8203526101a051600482015287602482015286604482015285606482015284608482015260206104e060a483600061010051602d5a03f1506104e05190506104c052601c606459905901600090520163c286273a601c8203526101a05160048201526000602482015260206105006044836000608051602d5a03f1506105005190505060016104c05114156105e55782610520526020610520f361062e565b601c604459905901600090520163aac2ffb5601c8203526101a051600482015260206105406024836000608051602d5a03f1506105405190505060018301610560526020610560f35b610804565b600081141561069457601c60c459905901600090520163546fdeb3601c8203526101a0516004820152876024820152866044820152856064820152846084820152602061058060a483600061010051602d5a03f15061058051905050610803565b6001811415610742576000601c60c459905901600090520163de9080c8601c8203526101a051600482015288602482015287604482015286606482015285608482015260206105a060a483600061010051602d5a03f1506105a0519050141561073257601c6044599059016000905201631cda01ef601c8203526101a051600482015260206105c06024836000608051602d5a03f1506105c0519050505b826105e05260206105e0f3610802565b60028114156107a357601c60c459905901600090520163384ca8dd601c8203526101a0516004820152876024820152866044820152856064820152846084820152602061060060a483600061010051602d5a03f15061060051905050610801565b600381141561080057601c60c459905901600090520163d5dc5af1601c8203526101a0516004820152876024820152866044820152856064820152846084820152602061062060a483600061010051602d5a03f150610620519050505b5b5b5b5b601c6044599059016000905201631cda01ef601c8203526101a051600482015260206106406024836000608051602d5a03f1506106405190505082610660526020610660f35050610a36565b60048114156108b157601c60c459905901600090520163f6559853601c8203526101a0516004820152856024820152846044820152836064820152826084820152602061068060a483600061012051602d5a03f15061068051905050610a35565b600581141561091257601c60c459905901600090520163d8e5473d601c8203526101a051600482015285602482015284604482015283606482015282608482015260206106a060a483600061012051602d5a03f1506106a051905050610a34565b600681141561097357601c60c459905901600090520163090507ea601c8203526101a051600482015285602482015284604482015283606482015282608482015260206106c060a483600061012051602d5a03f1506106c051905050610a33565b60078114156109d457601c60c4599059016000905201635b911842601c8203526101a051600482015285602482015284604482015283606482015282608482015260206106e060a483600061014051602d5a03f1506106e051905050610a32565b6008811415610a3157601c60c459905901600090520163abe22b84601c8203526101a0516004820152856024820152846044820152836064820152826084820152602061070060a483600061014051602d5a03f150610700519050505b5b5b5b5b5b5b5b5b5b601c604459905901600090520163aac2ffb5601c8203526101a051600482015260206107206024836000608051602d5a03f1506107205190505060018101610740526020610740f350505050505b50",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c9ae5868651bf7b7db6e360217db49ce4e69c07e" : {
+            "0xc9ae5868651bf7b7db6e360217db49ce4e69c07e" : {
                 "balance" : "0x00",
                 "code" : "0x600061083f537c010000000000000000000000000000000000000000000000000000000060003504637a66d7ca8114156100665760043560405260606060599059016000905260008152604051816020015260008160400152809050205460605260206060f35b63c60409c68114156100a55760043560405260606060599059016000905260008152604051816020015260018160400152809050205460a052602060a0f35b63186335768114156100e45760043560405260606060599059016000905260008152604051816020015260028160400152809050205460e052602060e0f35b63b3903c8a8114156101bc57600435604052606060605990590160009052600081526040518160200152600581604001528090502054610120526101205180602002602001599059016000905281815260208101905090506101605260006101c0525b610120516101c051121561019f57608060805990590160009052600081526040518160200152600481604001526101c051816060015280905020546101c05160200261016051015260016101c051016101c052610147565b6101605160206040820352602060208203510260400160408203f3505b636824e0fb8114156101fd57600435604052606060605990590160009052600081526040518160200152600581604001528090502054610220526020610220f35b633db16be381141561023e57600435604052606060605990590160009052600081526040518160200152600681604001528090502054610260526020610260f35b63c33878588114156102e05760006102a0526000546102c0526102c05180602002602001599059016000905281815260208101905090506102e0525b6102c0516102a05112156102c357604060405990590160009052600181526102a051816020015280905020546102a0516020026102e051015260016102a051016102a05261027a565b6102e05160206040820352602060208203510260400160408203f3505b63175c63228114156102fa57600054610380526020610380f35b63d861f2b4811415610336576004356103a052604060405990590160009052600181526103a051816020015280905020546103c05260206103c0f35b63b0dab01f81141561044f57600435610400526024356104205260443561044052606435610460526000606060605990590160009052600081526104005181602001526001816040015280905020541415610441576104205160606060599059016000905260008152610400518160200152600081604001528090502055610440516060606059905901600090526000815261040051816020015260018160400152809050205561046051606060605990590160009052600081526104005181602001526006816040015280905020556104005160406040599059016000905260018152600054816020015280905020556001600054016000556001610520526020610520f361044e565b6000610540526020610540f35b5b63aac2ffb58114156104b95760043560405260016060606059905901600090526000815260405181602001526002816040015280905020540160606060599059016000905260008152604051816020015260028160400152809050205560016105a05260206105a0f35b637265802d811415610507576004356040526024356105c0526105c0516060606059905901600090526000815260405181602001526002816040015280905020556001610600526020610600f35b63c5476efe811415610571576004356040526001606060605990590160009052600081526040518160200152600081604001528090502054016060606059905901600090526000815260405181602001526000816040015280905020556001610660526020610660f35b63c551e31e81141561063b576004356040526024356106805260606060599059016000905260008152604051816020015260058160400152809050205461012052610680516080608059905901600090526000815260405181602001526004816040015261012051816060015280905020556001606060605990590160009052600081526040518160200152600581604001528090502054016060606059905901600090526000815260405181602001526005816040015280905020556001610720526020610720f35b633d90504581141561067c57600435604052606060605990590160009052600081526040518160200152600381604001528090502054610740526020610740f35b631cda01ef8114156106e65760043560405260016060606059905901600090526000815260405181602001526003816040015280905020540160606060599059016000905260008152604051816020015260038160400152809050205560016107c05260206107c0f35b63c286273a811415610734576004356040526024356107e0526107e0516060606059905901600090526000815260405181602001526003816040015280905020556001610820526020610820f35b50",
                 "nonce" : "0x00",
@@ -243,7 +243,7 @@
                     "0xf9a3bf5f2ccb903ee1a7644113b794db0260de404fb8f11203e75a7fff151618" : "0xbd94773c0d85c68240ae8dfd53d9d33cd137509bfc5d3433381299df768c8377"
                 }
             },
-            "e509e3a93beb1eba72f8cb8d25f93a85e2d54afb" : {
+            "0xe509e3a93beb1eba72f8cb8d25f93a85e2d54afb" : {
                 "balance" : "0x00",
                 "code" : "0x6000610b7f537c01000000000000000000000000000000000000000000000000000000006000350473c9ae5868651bf7b7db6e360217db49ce4e69c07e6020526308d3d58781141561024557600435606052606060605990590160009052600081526060518160200152600181604001528090502054608052600060806080599059016000905260008152606051816020015260028160400152328160600152809050205414151561014e57608060805990590160009052600081526060518160200152600281604001523281606001528090502054608052682f000000000000000060a060a059905901600090526000815260605181602001526000816040015260805181606001526000816080015280905020553260a060a05990590160009052600081526060518160200152600081604001526080518160600152600181608001528090502055610238565b608051608060805990590160009052600081526060518160200152600281604001523281606001528090502055682f000000000000000060a060a059905901600090526000815260605181602001526000816040015260805181606001526000816080015280905020553260a060a059905901600090526000815260605181602001526000816040015260805181606001526001816080015280905020556001606060605990590160009052600081526060518160200152600181604001528090502054016060606059905901600090526000815260605181602001526001816040015280905020555b60016101e05260206101e0f35b6328c8b31581141561029d576004356060526024356102005260a060a0599059016000905260008152606051816020015260008160400152610200518160600152600081608001528090502054610220526020610220f35b6374af23ec8114156103865760043560605260243561026052608060805990590160009052600081526060518160200152600281604001526102605181606001528090502054610200526000610200511415610332576102605160a060a05990590160009052600081526060518160200152600081604001526102005181606001526001816080015280905020541415610335565b60005b156103475760006102c05260206102c0f35b60a060a05990590160009052600081526060518160200152600081604001526102005181606001526000816080015280905020546102e05260206102e0f35b6384d646ee8114156103dc5760043560605260243560805260a060a05990590160009052600081526060518160200152600081604001526080518160600152600181608001528090502054610320526020610320f35b63f42294278114156106f45760043561026052601c602459905901600090520163175c6322601c82035260206103a06004836000602051602d5a03f1506103a0519050610360526102605115610581576103605160020280602002602001599059016000905281815260208101905090506103c05261036051806020026020015990590160009052818152602081019050905061042052601c602459905901600090520163c3387858601c8203526103605160408160200201599059016000905281602002604001816004856000602051602d5a03f150604081019050905090506104205260006104c05260006104e0525b610360516104c051121561057c576104c051602002610420510151606052601c60645990590160009052016374af23ec601c82035260605160048201526102605160248201526020610520604483600030602d5a03f1506105205190506105005260006105005114151561056c576060516104e0516020026103c05101526105005160016104e051016020026103c051015260026104e051016104e0525b60016104c051016104c0526104ce565b6106d7565b32610260526103605160020280602002602001599059016000905281815260208101905090506103c05261036051806020026020015990590160009052818152602081019050905061042052601c602459905901600090520163c3387858601c8203526103605160408160200201599059016000905281602002604001816004856000602051602d5a03f150604081019050905090506104205260006104c05260006104e0525b610360516104c05112156106d6576104c051602002610420510151606052601c60645990590160009052016374af23ec601c820352606051600482015261026051602482015260206105c0604483600030602d5a03f1506105c0519050610500526000610500511415156106c6576060516104e0516020026103c05101526105005160016104e051016020026103c051015260026104e051016104e0525b60016104c051016104c052610628565b5b6103c05160206040820352602060208203510260400160408203f3505b6380b5e7bd81141561073557600435606052606060605990590160009052600081526060518160200152600181604001528090502054610600526020610600f35b63156f1c328114156107865760043560605260243561064052608060805990590160009052600081526060518160200152600281604001526106405181606001528090502054610660526020610660f35b63b3a24fc081141561087857365990590160009052366004823760043560208201016106c0526024356106e05250600260206106c0510351018060200260200159905901600090528181526020810190509050610700523261070051526106e051602061070051015260026104c0525b600260206106c0510351016104c05112156108385760026104c051036020026106c05101516104c05160200261070051015260016104c051016104c0526107f6565b60206107005103516020026020599059016000905260208183610700516000600287604801f15080519050905061076052610760516107c05260206107c0f35b63e346f5fc811415610a1c576004356107e0526024356108005260006104c0525b606060605990590160009052600081526107e05181602001526001816040015280905020546104c05112156109e65760a060a05990590160009052600081526107e0518160200152600081604001526104c0518160600152600181608001528090502054610840526108405160a060a0599059016000905260008152610800518160200152600081604001526104c051816060015260018160800152809050205560a060a05990590160009052600081526107e0518160200152600081604001526104c051816060015260008160800152809050205460a060a0599059016000905260008152610800518160200152600081604001526104c05181606001526000816080015280905020556104c0516080608059905901600090526000815261080051816020015260028160400152610840518160600152809050205560016104c051016104c052610899565b6104c051606060605990590160009052600081526108005181602001526001816040015280905020556001610920526020610920f35b633fb57036811415610b5457600435606052602435610940526060606059905901600090526000815260605181602001526001816040015280905020546109605261096051608060805990590160009052600081526060518160200152600281604001526109405181606001528090502055600060a060a05990590160009052600081526060518160200152600081604001526109605181606001526000816080015280905020556109405160a060a05990590160009052600081526060518160200152600081604001526109605181606001526001816080015280905020556001606060605990590160009052600081526060518160200152600181604001528090502054016060606059905901600090526000815260605181602001526001816040015280905020556001610a40526020610a40f35b6312709a33811415610beb57600435606052602435608052604435610a6052610a605160a060a059905901600090526000815260605181602001526000816040015260805181606001526000816080015280905020540160a060a059905901600090526000815260605181602001526000816040015260805181606001526000816080015280905020556001610ac0526020610ac0f35b633229cf6e811415610c8257600435606052602435608052604435610a6052610a605160a060a059905901600090526000815260605181602001526000816040015260805181606001526000816080015280905020540360a060a059905901600090526000815260605181602001526000816040015260805181606001526000816080015280905020556001610b20526020610b20f35b63a75f5c6a811415610ce557600435606052602435608052604435610a6052610a605160a060a059905901600090526000815260605181602001526000816040015260805181606001526000816080015280905020556001610b60526020610b60f35b50",
                 "nonce" : "0x00",
@@ -256,7 +256,7 @@
                     "0xec5e7f54fa5e516e616b04f9d5a0ee433a80e09ed47d7e5269afd76c05ff251e" : "0x02"
                 }
             },
-            "f1562e1c0d0baa3ea746442bb7f11153fcf5cfda" : {
+            "0xf1562e1c0d0baa3ea746442bb7f11153fcf5cfda" : {
                 "balance" : "0x00",
                 "code" : "0x600061067f537c010000000000000000000000000000000000000000000000000000000060003504632f300bee8114156100ac576004356040526024356060526044356080526002608051018080602002602001599059016000905281815260208101905090506801000000000000000081526060516080516020028201526001604051036001608051016020028201528060206040820352602060208203510260400160408203f35050505b63a647a5b98114156102c85736599059016000905236600482376004356020820101610100526024356020820101610160526044356020820101610180526064356101a05260843560805250602061010051035180806020026020015990590160009052818152602081019050905060005b6101a0518112156101d557600060005b608051811215610162578060200261010051015181608051850201602002610160510151028201915060018101905061012e565b50680100000000000000008105905060005b6080518112156101c857700100000000000000000000000000000000836020026101805101518260805186020160200261016051015184020205816020028501510381602002850152600181019050610174565b505060018101905061011e565b50600060005b60805181121561020357806020028301518160200284015102820191506001810190506101db565b5068010000000000000000810590506002810560005b600b81121561024257600282680100000000000000008502058301059150600181019050610219565b5060005b60805181121561027657816801000000000000000082602002860151020581602002850152600181019050610246565b5050506001608051602002610100510151036080516020028201526001608051016020026101005101516001608051016020028201528060206040820352602060208203510260400160408203f35050505b635b18022981141561037957365990590160009052366004823760043560208201016103005260243560208201016103205260443560805250600060005b60805181121561033f57680100000000000000008160200261032051015182602002610300510151020582019150600181019050610306565b6000610320515114151561036657610320515168010000000000000000830205915061036b565b600091505b81610380526020610380f350505b63f4ca7dc481141561057157365990590160009052366004823760043560208201016103a05260243560208201016103c0526044356101a0526064356080525060206103c051035160026080510a806020026020015990590160009052818152602081019050905060005b60805181121561044d5760005b6080518112156104415768010000000000000000816020026103a0510151836020026103a051015102058160805184020160200284015101816080518402016020028401526001810190506103f1565b506001810190506103e4565b81905090508180602002602001599059016000905281815260208101905090506080516101a05102806020026020015990590160009052818152602081019050905060005b6101a05181121561051e5760005b6080518112156105125760005b608051811215610506576801000000000000000082608051830201602002870151826080518602016020026103c051015102058260805185020160200285015101826080518502016020028501526001810190506104ad565b506001810190506104a0565b50600181019050610492565b819050905060005b848112156105525780602002820151816020026103c05101510381602002840152600181019050610526565b508160206040820352602060208203510260400160408203f350505050505b63232b273481141561069d57365990590160009052366004823760043560208201016106205260243560208201016102805260443560208201016103c052606435610640526084356101a05260a435608052506000610280515112156106025760005b6080518112156106005780602002610280510151600003816020026102805101526001810190506105d4565b505b60005b6101a05181121561067f5760005b60805181121561067357680100000000000000006801000000000000000082602002610280510151610640510205826080518502016020026103c05101510205826020026106205101510182602002610620510152600181019050610613565b50600181019050610605565b6106205160206040820352602060208203510260400160408203f350505b50",
                 "nonce" : "0x00",
@@ -269,14 +269,14 @@
                 "0x36a560bd00000000000000000000000000000000000000000000000000000000000f69b5"
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x09184e72a000",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b03f030056db7d467d778326658bac0d1b35d8f7",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb03f030056db7d467d778326658bac0d1b35d8f7",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stSpecialTest/deploymentError.json b/GeneralStateTests/stSpecialTest/deploymentError.json
index cb789c46b..10c13afd3 100644
--- a/GeneralStateTests/stSpecialTest/deploymentError.json
+++ b/GeneralStateTests/stSpecialTest/deploymentError.json
@@ -1,17 +1,17 @@
 {
     "deploymentError" : {
         "env" : {
-            "currentCoinbase" : "68795C4AA09D6f4Ed3E5DeDDf8c2AD3049A601da",
+            "currentCoinbase" : "0x68795C4AA09D6f4Ed3E5DeDDf8c2AD3049A601da",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x12b9b060",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "2682565f0c945052f21b2ed7f39fa832749c79f6181e2f66f7a5cb87eb65c74d",
+                    "hash" : "0x2682565f0c945052f21b2ed7f39fa832749c79f6181e2f66f7a5cb87eb65c74d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "ae4a5e0ae12bf4a52102c2c5b87ebf80e02cbd61418c18ab8e8a9ed3ddc14092",
+                    "hash" : "0xae4a5e0ae12bf4a52102c2c5b87ebf80e02cbd61418c18ab8e8a9ed3ddc14092",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f085769bc64edb479bdbaeb689cdd2ca57d2c3656d388222a5e738e48f6331a6",
+                    "hash" : "0xf085769bc64edb479bdbaeb689cdd2ca57d2c3656d388222a5e738e48f6331a6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "d08738c9f0db382b49272bafd3332654cdf0548bad79bd3cc2193c517d0307f8",
+                    "hash" : "0xd08738c9f0db382b49272bafd3332654cdf0548bad79bd3cc2193c517d0307f8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "ae4a5e0ae12bf4a52102c2c5b87ebf80e02cbd61418c18ab8e8a9ed3ddc14092",
+                    "hash" : "0xae4a5e0ae12bf4a52102c2c5b87ebf80e02cbd61418c18ab8e8a9ed3ddc14092",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -74,14 +74,14 @@
                 "0x606060405260405160608061100383395060c06040525160805160a05160028054600160a060020a031916909317909255600355600455610fbf806100446000396000f3606060405236156100a35760e060020a60003504630a19b14a81146100ab578063278b8c0e146100e25780632e1a7d4d14610111578063338b5dea14610125578063577863941461015057806365e17c9d146101595780636c86888b1461016b57806393f0bb51146101da5780639e281a9814610207578063c281309e14610232578063d0e30db01461023b578063f7888aec14610287578063fb6e155f146102bb575b6103e6610002565b6103e660043560243560443560643560843560a43560c43560e4356101043561012435610144356000600034111561042b57610002565b6103e660043560243560443560643560843560a43560c43560e43561010435600060003411156108b457610002565b6103e66004356000341115610ab357610002565b6103e66004356024356000341180610146575081600160a060020a03166000145b15610b6157610002565b6103e860035481565b6103fa600254600160a060020a031681565b61041760043560243560443560643560843560a43560c43560e43561010435610124356101443561016435600160a060020a038c8116600090815260208181526040808320938516835292905290812054839010801590610c96575082610c938e8e8e8e8e8e8e8e8e8e6102df565b6103e660043560243560443560643560843560a43560c43560e435610104356000341115610ca457610002565b6103e66004356024356000341180610228575081600160a060020a03166000145b15610d3057610002565b6103e860045481565b6103e633600160a060020a03166000908152600080516020610f9f8339815191526020526040902054610ea390345b6000828201610f8f8482108015906102825750838210155b610660565b6103e8600435602435600160a060020a03828116600090815260208181526040808320938516835292905220545b92915050565b6103e860043560243560443560643560843560a43560c43560e43561010435610124355b600060006000600060028e8e8e8e8e8e6040518087600160a060020a0316606060020a02815260140186815260200185600160a060020a0316606060020a02815260140184815260200183815260200182815260200196505050505050506020604051808303816000866161da5a03f1156100025750506040805180516000828152602083810180865283905260ff8c1684860152606084018b9052608084018a90529351919650600160a060020a038c169360019360a0808201949293601f19840193928390039091019190866161da5a03f11561000257505060206040510351600160a060020a03161480156103d75750894311155b1515610f295760009350610f18565b005b60408051918252519081900360200190f35b60408051600160a060020a03929092168252519081900360200190f35b604080519115158252519081900360200190f35b60028c8c8c8c8c8c6040518087600160a060020a0316606060020a02815260140186815260200185600160a060020a0316606060020a02815260140184815260200183815260200182815260200196505050505050506020604051808303816000866161da5a03f1156100025750506040805180516000828152602083810180865283905260ff8a168486015260608401899052608084018890529351919450600160a060020a038a169360019360a0818101949293601f19840193928390039091019190866161da5a03f11561000257505060206040510351600160a060020a031614801561051b5750874311155b801561054057506000818152600160205260409020548b9061053d908461026a565b11155b80156105715750600160a060020a038c81166000908152602081815260408083203390941683529290522054829010155b80156105b457508a6105838a8461060a565b811561000257600160a060020a038c8116600090815260208181526040808320938c16835292905220549190049010155b151561062b57610002565b600160a060020a038d81166000908152602081815260408083203385168452909152808220939093559088168152205460035461066c9190670de0b6b3a7640000906106bc90869083035b6000828202610f8f8483148061028257508385838115610002570414610660565b600160a060020a038c811660009081526020818152604080832033909416835292905220546105bf90835b6000610f96838311155b801515610ab057610002565b600160a060020a038d81166000908152602081815260408083208b8516845290915280822093909355600254909116815220546003546106c89190670de0b6b3a7640000906106bc90869061060a565b8115610002570461026a565b600160a060020a038d8116600090815260208181526040808320600254851684528252808320949094558d83168252818152838220928a168252919091522054610717908c61076c8c8661060a565b600160a060020a038b81166000908152602081815260408083208b851684529091528082209390935533909116815220546004546107789190670de0b6b3a7640000908e906107cd906107e09084038f61060a565b81156100025704610656565b600160a060020a038b8116600090815260208181526040808320338516845290915280822093909355600254909116815220546004546107e69190670de0b6b3a7640000908e906107cd906107e0908f61060a565b811561000257048115610002570461026a565b8761060a565b600160a060020a038b81166000908152602081815260408083206002549094168352928152828220939093558381526001909252902054610827908361026a565b6000828152600160205260409020557f6effdda786735d5033bfad5f53e5131abcced9e52be6c507b62d639685fbed6d8c838c8e8d830281156100025760408051600160a060020a03968716815260208101959095529285168484015204606083015289831660808301523390921660a082015290519081900360c00190a1505050505050505050505050565b60028a8a8a8a8a8a6040518087600160a060020a0316606060020a02815260140186815260200185600160a060020a0316606060020a02815260140184815260200183815260200182815260200196505050505050506020604051808303816000866161da5a03f1156100025750506040805180516000828152602083810180865283905260ff8916848601526060840188905260808401879052935191945033600160a060020a03169360019360a0818101949293601f19840193928390039091019190866161da5a03f115610002575050604051601f190151600160a060020a0316146109a257610002565b6000818152600160209081526040918290208b90558151600160a060020a038d811682529181018c90528a821681840152606081018a90526080810189905260a081018890523390911660c082015260ff861660e08201526101008101859052610120810184905290517f1e0b760c386003e9cb9bcf4fcf3997886042859d9b6ed6320e804597fcdb28b0918190036101400190a150505050505050505050565b33600160a060020a03166000818152600080516020610f9f8339815191526020908152604080832054815193845291830193909352818301849052606082015290517ff341246adaac6f497bc2a656f546ab9e182111d630394f0c57c710a59a2cb5679181900360800190a15b50565b33600160a060020a03166000908152600080516020610f9f833981519152602052604090205481901015610ae657610002565b33600160a060020a03166000908152600080516020610f9f8339815191526020526040902054610b169082610656565b33600160a060020a03166000818152600080516020610f9f8339815191526020526040808220939093559151909183919081818185876185025a03f1925050501515610a4357610002565b81600160a060020a03166323b872dd3330846040518460e060020a0281526004018084600160a060020a0316815260200183600160a060020a031681526020018281526020019350505050602060405180830381600087803b15610002576161da5a03f1156100025750506040515115159050610bdd57610002565b600160a060020a038281166000908152602081815260408083203390941683529290522054610c0c908261026a565b600160a060020a03838116600081815260208181526040808320339095168084529482529182902085905581519283528201929092528082018490526060810192909252517fdcbc1c05240f31ff3ad067ef1ee35ce4997762752e3a095284754544f4c709d79181900360800190a15050565b5060015b9c9b505050505050505050505050565b10155b1515610c7f57506000610c83565b60408051600160a060020a038b81168252602082018b905289811682840152606082018990526080820188905260a08201879052331660c082015260ff851660e08201526101008101849052610120810183905290517f91daf02b6d1454acd74c097a67e389a9d9371da3ff51366947022dc36748ce4d918190036101400190a1505050505050505050565b600160a060020a03828116600090815260208181526040808320339094168352929052205481901015610d6257610002565b600160a060020a038281166000908152602081815260408083203390941683529290522054610d919082610656565b600160a060020a03838116600081815260208181526040808320339095168084529482528083209590955584517fa9059cbb0000000000000000000000000000000000000000000000000000000081526004810194909452602484018690529351919363a9059cbb936044818101949293918390030190829087803b15610002576161da5a03f1156100025750506040515115159050610e3057610002565b600160a060020a03828116600081815260208181526040808320339095168084529482529182902054825193845290830193909352818101849052606082019290925290517ff341246adaac6f497bc2a656f546ab9e182111d630394f0c57c710a59a2cb5679181900360800190a15050565b33600160a060020a03166000818152600080516020610f9f8339815191526020908152604080832085905580519283529082019290925234818301526060810192909252517fdcbc1c05240f31ff3ad067ef1ee35ce4997762752e3a095284754544f4c709d79181900360800190a1565b8093505b5050509a9950505050505050505050565b600083815260016020526040902054610f43908e90610656565b600160a060020a038d8116600090815260208181526040808320938d16835292905220549092508b90610f76908f61060a565b81156100025704905080821015610f1457819350610f18565b9392505050565b508082036102b556ad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb50000000000000000000000001ed014aec47fae44c9e55bac7662c0b78ae617980000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000aa87bee538000"
             ],
             "gasLimit" : [
-                "5000000"
+                "0x4c4b40"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stSpecialTest/failed_tx_xcf416c53.json b/GeneralStateTests/stSpecialTest/failed_tx_xcf416c53.json
index 549c89458..da7dac98e 100644
--- a/GeneralStateTests/stSpecialTest/failed_tx_xcf416c53.json
+++ b/GeneralStateTests/stSpecialTest/failed_tx_xcf416c53.json
@@ -1,17 +1,17 @@
 {
     "failed_tx_xcf416c53" : {
         "env" : {
-            "currentCoinbase" : "68795C4AA09D6f4Ed3E5DeDDf8c2AD3049A601da",
+            "currentCoinbase" : "0x68795C4AA09D6f4Ed3E5DeDDf8c2AD3049A601da",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x1e8480",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "3192d913153747df2aa2ec3d9438840392d389e78e79d129a7feff2c150e42ba",
+                    "hash" : "0xb40c387efa7f872d7230dd5afe903c671154c575d4d290019bc972b1a5383227",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "66a9925175bce994449c63c1181ca9f1bb7d03530e8cb521ae11280b4550d092",
+                    "hash" : "0x66a9925175bce994449c63c1181ca9f1bb7d03530e8cb521ae11280b4550d092",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3192d913153747df2aa2ec3d9438840392d389e78e79d129a7feff2c150e42ba",
+                    "hash" : "0xb40c387efa7f872d7230dd5afe903c671154c575d4d290019bc972b1a5383227",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3192d913153747df2aa2ec3d9438840392d389e78e79d129a7feff2c150e42ba",
+                    "hash" : "0xb40c387efa7f872d7230dd5afe903c671154c575d4d290019bc972b1a5383227",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "66a9925175bce994449c63c1181ca9f1bb7d03530e8cb521ae11280b4550d092",
+                    "hash" : "0x66a9925175bce994449c63c1181ca9f1bb7d03530e8cb521ae11280b4550d092",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,23 @@
             ]
         },
         "pre" : {
-            "0e879ae28cdddeb31a405a9db354505a5560b0bd" : {
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0e879ae28cdddeb31a405a9db354505a5560b0bd" : {
                 "balance" : "0x00",
                 "code" : "0x7c0100000000000000000000000000000000000000000000000000000000600035046397dd3054811415610065576004356040526024356060526040516060515b808212156100625760006000600060006000866000f150600182019150610040565b50505b50",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
@@ -81,14 +88,14 @@
                 "0x97dd3054000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002bc"
             ],
             "gasLimit" : [
-                "630000"
+                "0x099cf0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x01",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0e879AE28cdDdEB31A405A9dB354505a5560b0Bd",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0e879AE28cdDdEB31A405A9dB354505a5560b0Bd",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stSpecialTest/gasPrice0.json b/GeneralStateTests/stSpecialTest/gasPrice0.json
index 138ee6d3a..1911a7592 100644
--- a/GeneralStateTests/stSpecialTest/gasPrice0.json
+++ b/GeneralStateTests/stSpecialTest/gasPrice0.json
@@ -1,17 +1,17 @@
 {
     "gasPrice0" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "4509680f4d6552e9a010b76297aa20291eb22b08d9e12c5bca49dbe3b5be2338",
+                    "hash" : "0x4509680f4d6552e9a010b76297aa20291eb22b08d9e12c5bca49dbe3b5be2338",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "676ebf8512ef329b64106651e27d1432e328b24f84914b4f691533eaae9e6bd7",
+                    "hash" : "0x676ebf8512ef329b64106651e27d1432e328b24f84914b4f691533eaae9e6bd7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4509680f4d6552e9a010b76297aa20291eb22b08d9e12c5bca49dbe3b5be2338",
+                    "hash" : "0x4509680f4d6552e9a010b76297aa20291eb22b08d9e12c5bca49dbe3b5be2338",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4509680f4d6552e9a010b76297aa20291eb22b08d9e12c5bca49dbe3b5be2338",
+                    "hash" : "0x4509680f4d6552e9a010b76297aa20291eb22b08d9e12c5bca49dbe3b5be2338",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "676ebf8512ef329b64106651e27d1432e328b24f84914b4f691533eaae9e6bd7",
+                    "hash" : "0x676ebf8512ef329b64106651e27d1432e328b24f84914b4f691533eaae9e6bd7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600101600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -85,10 +85,10 @@
             ],
             "gasPrice" : "0x00",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSpecialTest/makeMoney.json b/GeneralStateTests/stSpecialTest/makeMoney.json
index dba91f0d1..f3461fe19 100644
--- a/GeneralStateTests/stSpecialTest/makeMoney.json
+++ b/GeneralStateTests/stSpecialTest/makeMoney.json
@@ -1,17 +1,17 @@
 {
     "makeMoney" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a9c1df14913efcb44c8d214bae45f7c164073e66023871276e7254f502573080",
+                    "hash" : "0xa9c1df14913efcb44c8d214bae45f7c164073e66023871276e7254f502573080",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a9c1df14913efcb44c8d214bae45f7c164073e66023871276e7254f502573080",
+                    "hash" : "0xa9c1df14913efcb44c8d214bae45f7c164073e66023871276e7254f502573080",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "deecad9edcf67263e8e8f56c4db89a1620a964da88dac1734461ebc1126682cf",
+                    "hash" : "0xdeecad9edcf67263e8e8f56c4db89a1620a964da88dac1734461ebc1126682cf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "deecad9edcf67263e8e8f56c4db89a1620a964da88dac1734461ebc1126682cf",
+                    "hash" : "0xdeecad9edcf67263e8e8f56c4db89a1620a964da88dac1734461ebc1126682cf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a9c1df14913efcb44c8d214bae45f7c164073e66023871276e7254f502573080",
+                    "hash" : "0xa9c1df14913efcb44c8d214bae45f7c164073e66023871276e7254f502573080",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7b601080600c6000396000f200600035541560095700602035600035556000526000600060006000601773aaaaaaaaace5edbc8e2a8697c15331677e6ebf0b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffecf1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaaaaaaace5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaaaaaaace5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x600160015532600255",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "228500"
+                "0x037c94"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stSpecialTest/sha3_deja.json b/GeneralStateTests/stSpecialTest/sha3_deja.json
index 88c776029..4eceff97f 100644
--- a/GeneralStateTests/stSpecialTest/sha3_deja.json
+++ b/GeneralStateTests/stSpecialTest/sha3_deja.json
@@ -1,17 +1,17 @@
 {
     "sha3_deja" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1eb8a3f2d301b0446b95f139e15de683840c1186c564d8e1abb950a26f041523",
+                    "hash" : "0x1eb8a3f2d301b0446b95f139e15de683840c1186c564d8e1abb950a26f041523",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "0bc2ff4ebf6438bc4280ff67c468803703c387fa89a2e4941a041672c2b1d507",
+                    "hash" : "0x0bc2ff4ebf6438bc4280ff67c468803703c387fa89a2e4941a041672c2b1d507",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "1eb8a3f2d301b0446b95f139e15de683840c1186c564d8e1abb950a26f041523",
+                    "hash" : "0x1eb8a3f2d301b0446b95f139e15de683840c1186c564d8e1abb950a26f041523",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "1eb8a3f2d301b0446b95f139e15de683840c1186c564d8e1abb950a26f041523",
+                    "hash" : "0x1eb8a3f2d301b0446b95f139e15de683840c1186c564d8e1abb950a26f041523",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0bc2ff4ebf6438bc4280ff67c468803703c387fa89a2e4941a041672c2b1d507",
+                    "hash" : "0x0bc2ff4ebf6438bc4280ff67c468803703c387fa89a2e4941a041672c2b1d507",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6042601f53600064ffffffffff2080",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1000000"
+                "0x0f4240"
             ],
             "gasPrice" : "0x00",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSpecialTest/txCost-sec73.json b/GeneralStateTests/stSpecialTest/txCost-sec73.json
index cfdebd9ea..3c8dfcc54 100644
--- a/GeneralStateTests/stSpecialTest/txCost-sec73.json
+++ b/GeneralStateTests/stSpecialTest/txCost-sec73.json
@@ -1,17 +1,17 @@
 {
     "txCost-sec73" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b73f1ed022d056909f34484fa432461e4702c1db53c2b8f532a59518620d30ff",
+                    "hash" : "0xb73f1ed022d056909f34484fa432461e4702c1db53c2b8f532a59518620d30ff",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b73f1ed022d056909f34484fa432461e4702c1db53c2b8f532a59518620d30ff",
+                    "hash" : "0xb73f1ed022d056909f34484fa432461e4702c1db53c2b8f532a59518620d30ff",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b73f1ed022d056909f34484fa432461e4702c1db53c2b8f532a59518620d30ff",
+                    "hash" : "0xb73f1ed022d056909f34484fa432461e4702c1db53c2b8f532a59518620d30ff",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b73f1ed022d056909f34484fa432461e4702c1db53c2b8f532a59518620d30ff",
+                    "hash" : "0xb73f1ed022d056909f34484fa432461e4702c1db53c2b8f532a59518620d30ff",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b73f1ed022d056909f34484fa432461e4702c1db53c2b8f532a59518620d30ff",
+                    "hash" : "0xb73f1ed022d056909f34484fa432461e4702c1db53c2b8f532a59518620d30ff",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 "0x00"
             ],
             "gasLimit" : [
-                "21000"
+                "0x5208"
             ],
             "gasPrice" : "0x00",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSpecialTest/tx_e1c174e2.json b/GeneralStateTests/stSpecialTest/tx_e1c174e2.json
index cc77ad2ed..0efffbefc 100644
--- a/GeneralStateTests/stSpecialTest/tx_e1c174e2.json
+++ b/GeneralStateTests/stSpecialTest/tx_e1c174e2.json
@@ -1,17 +1,17 @@
 {
     "tx_e1c174e2" : {
         "env" : {
-            "currentCoinbase" : "68795C4AA09D6f4Ed3E5DeDDf8c2AD3049A601da",
+            "currentCoinbase" : "0x68795C4AA09D6f4Ed3E5DeDDf8c2AD3049A601da",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x2fefd8",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "ef25be43bc2e668d61fe245c2c7695668c8bb5c3d321ecdd680c28151be8400d",
+                    "hash" : "0xef25be43bc2e668d61fe245c2c7695668c8bb5c3d321ecdd680c28151be8400d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b0d7510fe1d954482f89f01207879978500e963164659976b31477f90d707844",
+                    "hash" : "0xb0d7510fe1d954482f89f01207879978500e963164659976b31477f90d707844",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "941c8ac149ed268eb2e05084c435e5c0338cd382ad8a0d2583904bd8c2f8a6b4",
+                    "hash" : "0x941c8ac149ed268eb2e05084c435e5c0338cd382ad8a0d2583904bd8c2f8a6b4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "941c8ac149ed268eb2e05084c435e5c0338cd382ad8a0d2583904bd8c2f8a6b4",
+                    "hash" : "0x941c8ac149ed268eb2e05084c435e5c0338cd382ad8a0d2583904bd8c2f8a6b4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b0d7510fe1d954482f89f01207879978500e963164659976b31477f90d707844",
+                    "hash" : "0xb0d7510fe1d954482f89f01207879978500e963164659976b31477f90d707844",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,7 +61,7 @@
             ]
         },
         "pre" : {
-            "0dc02922f33e45537411b9f92a1dcc9750ba9932" : {
+            "0x0dc02922f33e45537411b9f92a1dcc9750ba9932" : {
                 "balance" : "0x00",
                 "code" : "0x600061155f537c0100000000000000000000000000000000000000000000000000000000600035046355f10aaf8114156100655760043560405260003413156100525760006000600060003433611388f1505b600c604051026007015460605260206060f35b6369e0998b81141561053f5760043560805260243560a052604435604052600060805113151561009a57600260c052602060c0f35b600060a0511315156100b157600360e052602060e0f35b60006040511315156100ca576004610100526020610100f35b670de0b6b3a7640000600c6040510260030154600a0a600c60405102600401540260a05160805102050261012052600c604051026005015434121561012f5760003413156101225760006000600060003433611388f1505b600b610140526020610140f35b610120513412156101605760003413156101535760006000600060003433611388f1505b6014610160526020610160f35b6101205134131561018057600060006000600061012051340333611388f1505b60e0599059016000905260068152600160208201526040516040820152608051606082015260a05160808201523360a08201524360c082015260208101905061018052610180516020602082035102812090506101c05260086101c05102740e0000000000000000000000000000000000000000015415156104be576101c05160086101c05102740e00000000000000000000000000000000000000000155600160086101c05102740e0000000000000000000000000000000000000001015560405160086101c05102740e0000000000000000000000000000000000000002015560805160086101c05102740e0000000000000000000000000000000000000003015560a05160086101c05102740e000000000000000000000000000000000000000401553360086101c05102740e000000000000000000000000000000000000000501554360086101c05102740e0000000000000000000000000000000000000006015560086101c05102740e00000000000000000000000000000000000000000160086101c05102740e00000000000000000000000000000000000000070155600c60405102600b0154610200526101c05160a060a05990590160009052600081526040518160200152600c81604001526102005181606001526001816080015280905020556102005160a060a05990590160009052600081526040518160200152600c81604001526101c05181606001526002816080015280905020556101c05160a060a05990590160009052600081526040518160200152600c81604001526101c05181606001526000816080015280905020556101c051600c60405102600b01556001600c60405102600a015401600c60405102600a01556002600114156104b95760805160806080599059016000905260048152338160200152604051816040015260008160600152809050205403608060805990590160009052600481523381602001526040518160400152600081606001528090502055608051608060805990590160009052600481523381602001526040518160400152600181606001528090502054016080608059905901600090526004815233816020015260405181604001526001816060015280905020555b6104cb565b6015610300526020610300f35b601c60c05990590160009052013381526001602082015260a051604082015260805160608201526101c05160808201526040517f9463d1cc4aa2db0dc624c996b1846f028d43c48cfc8b9f427f13336e4a73226460a083a2506101c051610340526020610340f36000610360526020610360f35b630909f073811415610a0c5760043560805260243560a0526044356040526000608051131515610576576002610380526020610380f35b600060a05113151561058f5760036103a05260206103a0f35b60006040511315156105a85760046103c05260206103c0f35b670de0b6b3a7640000600c6040510260030154600a0a600c60405102600401540260a05160805102050261012052600c60405102600501546101205112156106105760003413156106035760006000600060003433611388f1505b600b6103e05260206103e0f35b60806080599059016000905260048152338160200152604051816040015260008160600152809050205461040052608051610400511215156109ff5760e0599059016000905260068152600260208201526040516040820152608051606082015260a05160808201523360a08201524360c082015260208101905061018052610180516020602082035102812090506101c05260086101c05102740e00000000000000000000000000000000000000000154151561098a576101c05160086101c05102740e00000000000000000000000000000000000000000155600260086101c05102740e0000000000000000000000000000000000000001015560405160086101c05102740e0000000000000000000000000000000000000002015560805160086101c05102740e0000000000000000000000000000000000000003015560a05160086101c05102740e000000000000000000000000000000000000000401553360086101c05102740e000000000000000000000000000000000000000501554360086101c05102740e0000000000000000000000000000000000000006015560086101c05102740e00000000000000000000000000000000000000000160086101c05102740e00000000000000000000000000000000000000070155600c60405102600b0154610200526101c05160a060a05990590160009052600081526040518160200152600c81604001526102005181606001526001816080015280905020556102005160a060a05990590160009052600081526040518160200152600c81604001526101c05181606001526002816080015280905020556101c05160a060a05990590160009052600081526040518160200152600c81604001526101c05181606001526000816080015280905020556101c051600c60405102600b01556001600c60405102600a015401600c60405102600a01556002600214156109855760805160806080599059016000905260048152338160200152604051816040015260008160600152809050205403608060805990590160009052600481523381602001526040518160400152600081606001528090502055608051608060805990590160009052600481523381602001526040518160400152600181606001528090502054016080608059905901600090526004815233816020015260405181604001526001816060015280905020555b610997565b6015610560526020610560f35b601c60c05990590160009052013381526002602082015260a051604082015260805160608201526101c05160808201526040517f9463d1cc4aa2db0dc624c996b1846f028d43c48cfc8b9f427f13336e4a73226460a083a2506101c051610580526020610580f35b60006105a05260206105a0f35b639998bd008114156117335736599059016000905236600482376004356105e0526024356020820101610600525034610620526000610640525b602061060051035161064051121561170a57610640516020026106005101516101c05260086101c05102740e0000000000000000000000000000000000000006015443131515610a9d576016610660526020610660f35b60086101c05102740e00000000000000000000000000000000000000020154604052600c604051026002015461068052600c60405102600301546106a052600c60405102600401546106c052600c60405102600501546106e05260086101c05102740e000000000000000000000000000000000000000101546107005260086101c05102740e0000000000000000000000000000000000000003015460805260086101c05102740e0000000000000000000000000000000000000004015460a05260086101c05102740e0000000000000000000000000000000000000005015461072052600161070051141561110e576080608059905901600090526004815233816020015260405181604001526000816060015280905020546104005260006104005113156110fc57608051610400516105e05180821215610be05781610be2565b805b9050905080821215610bf45781610bf6565b805b90509050610760526106a051600a0a6106c05102670de0b6b3a764000060a05161076051020205610120526106e051610120511215610c5b576000610620511315610c4e5760006000600060006106205133611388f1505b600c610800526020610800f35b608051610760511215610cb0576107605160086101c05102740e000000000000000000000000000000000000000301540360086101c05102740e00000000000000000000000000000000000000030155610fd4565b600060086101c05102740e00000000000000000000000000000000000000000155600060086101c05102740e00000000000000000000000000000000000000010155600060086101c05102740e00000000000000000000000000000000000000020155600060086101c05102740e00000000000000000000000000000000000000030155600060086101c05102740e00000000000000000000000000000000000000040155600060086101c05102740e00000000000000000000000000000000000000050155600060086101c05102740e00000000000000000000000000000000000000060155600060086101c05102740e0000000000000000000000000000000000000007015560a060a05990590160009052600081526040518160200152600c81604001526101c05181606001526002816080015280905020546108205260a060a05990590160009052600081526040518160200152600c81604001526101c0518160600152600181608001528090502054610860526108205115610e3a5761086051610e3d565b60005b15610eb7576108605160a060a05990590160009052600081526040518160200152600c81604001526108205181606001526001816080015280905020556108205160a060a05990590160009052600081526040518160200152600c8160400152610860518160600152600281608001528090502055610f06565b6108205115610f055761082051600c60405102600b0155600060a060a05990590160009052600081526040518160200152600c81604001526108205181606001526001816080015280905020555b5b6108605115610f4657600060a060a05990590160009052600081526040518160200152600c81604001526101c05181606001526001816080015280905020555b6108205115610f8657600060a060a05990590160009052600081526040518160200152600c81604001526101c05181606001526002816080015280905020555b600060a060a05990590160009052600081526040518160200152600c81604001526101c05181606001526000816080015280905020556001600c60405102600a015403600c60405102600a01555b6107605160806080599059016000905260048152338160200152604051816040015260008160600152809050205403608060805990590160009052600481523381602001526040518160400152600081606001528090502055610760516080608059905901600090526004815261072051816020015260405181604001526000816060015280905020540160806080599059016000905260048152610720518160200152604051816040015260008160600152809050205560006000600060006101205133611388f150601c60a05990590160009052016002815260a05160208201526107605160408201526101c051606082015261072051336040517f0f9fe89f83633cc2eca9b17e1f77422f037cb026eaca4e6a5337fa1595f50a81608085a450611109565b600a6109e05260206109e0f35b611680565b600261070051141561167f576000610620511315611671576106e0516106205112156111605760006106205113156111535760006000600060006106205133611388f1505b600c610a00526020610a00f35b6106a051600a0a6106c05102670de0b6b3a764000060a051608051020205610a205261062051610a205180821215611198578161119a565b805b9050905061012052610a205161012051121561121b57670de0b6b3a764000060a0516106a051600a0a6106c0510261012051020505610760526107605160086101c05102740e000000000000000000000000000000000000000301540360086101c05102740e00000000000000000000000000000000000000030155611546565b60805161076052600060086101c05102740e00000000000000000000000000000000000000000155600060086101c05102740e00000000000000000000000000000000000000010155600060086101c05102740e00000000000000000000000000000000000000020155600060086101c05102740e00000000000000000000000000000000000000030155600060086101c05102740e00000000000000000000000000000000000000040155600060086101c05102740e00000000000000000000000000000000000000050155600060086101c05102740e00000000000000000000000000000000000000060155600060086101c05102740e0000000000000000000000000000000000000007015560a060a05990590160009052600081526040518160200152600c81604001526101c05181606001526002816080015280905020546108205260a060a05990590160009052600081526040518160200152600c81604001526101c05181606001526001816080015280905020546108605261082051156113ac57610860516113af565b60005b15611429576108605160a060a05990590160009052600081526040518160200152600c81604001526108205181606001526001816080015280905020556108205160a060a05990590160009052600081526040518160200152600c8160400152610860518160600152600281608001528090502055611478565b61082051156114775761082051600c60405102600b0155600060a060a05990590160009052600081526040518160200152600c81604001526108205181606001526001816080015280905020555b5b61086051156114b857600060a060a05990590160009052600081526040518160200152600c81604001526101c05181606001526001816080015280905020555b61082051156114f857600060a060a05990590160009052600081526040518160200152600c81604001526101c05181606001526002816080015280905020555b600060a060a05990590160009052600081526040518160200152600c81604001526101c05181606001526000816080015280905020556001600c60405102600a015403600c60405102600a01555b6107605160806080599059016000905260048152610720518160200152604051816040015260018160600152809050205403608060805990590160009052600481526107205181602001526040518160400152600181606001528090502055610760516080608059905901600090526004815233816020015260405181604001526000816060015280905020540160806080599059016000905260048152338160200152604051816040015260008160600152809050205560006000600060006101205161072051611388f150601c60a05990590160009052016001815260a05160208201526107605160408201526101c051606082015261072051336040517f0f9fe89f83633cc2eca9b17e1f77422f037cb026eaca4e6a5337fa1595f50a81608085a45061167e565b600a610c00526020610c00f35b5b5b60a051600c6040510260070155601c60a059905901600090520161070051815260a05160208201526107605160408201524260608201526040517f50944f09ce56f9f0e2cb67683c9b451049c39f60452b850b169148f3daa51ed6608083a250610760516105e051036105e052610120516106205103610620526001610640510161064052610a46565b61062051156117265760006000600060006106205133611388f1505b6001610c20526020610c20f35b6334a501c781141561185b57600435608052602435604052601c60845990590160009052016327f08b00601c82035233600482015230602482015260805160448201526020610c406064836000600c6040510260020154602d5a03f150610c405190501561184e57608060805990590160009052600481523381602001526040518160400152600081606001528090502054610400526080516104005101610c8052610c8051608060805990590160009052600481523381602001526040518160400152600081606001528090502055601c60405990590160009052016080518152336040517f301cd746dbb5e7f9ade2bcd9e8a849b968bfcc222de48d2086ba200184acc83d602084a350610c8051610cc0526020610cc0f35b6000610ce0526020610ce0f35b63e1ed3ad3811415611982576004356080526024356040526080608059905901600090526004815233816020015260405181604001526000816060015280905020546104005260805161040051121515611975576080516104005103608060805990590160009052600481523381602001526040518160400152600081606001528090502055601c60645990590160009052016386744558601c82035233600482015260805160248201526020610d606044836000600c6040510260020154602d5a03f150610d60519050610d4052601c60405990590160009052016080518152336040517ffa4460934f383b326d79dcd4f1e59a17ac8ee9a87312169933e7f68b85c1a8ce602084a350610d4051610d80526020610d80f35b6000610da0526020610da0f35b63327a22f1811415611f08576004356101c05260086101c05102740e000000000000000000000000000000000000000101546107005260086101c05102740e0000000000000000000000000000000000000003015460805260086101c05102740e0000000000000000000000000000000000000004015460a05260086101c05102740e000000000000000000000000000000000000000501546107205260086101c05102740e00000000000000000000000000000000000000020154604052600c604051026002015461068052600c60405102600301546106a052600c60405102600401546106c05261072051331415611efb57600060086101c05102740e00000000000000000000000000000000000000000155600060086101c05102740e00000000000000000000000000000000000000010155600060086101c05102740e00000000000000000000000000000000000000020155600060086101c05102740e00000000000000000000000000000000000000030155600060086101c05102740e00000000000000000000000000000000000000040155600060086101c05102740e00000000000000000000000000000000000000050155600060086101c05102740e00000000000000000000000000000000000000060155600060086101c05102740e0000000000000000000000000000000000000007015560a060a05990590160009052600081526040518160200152600c81604001526101c05181606001526002816080015280905020546108205260a060a05990590160009052600081526040518160200152600c81604001526101c0518160600152600181608001528090502054610860526108205115611c005761086051611c03565b60005b15611c7d576108605160a060a05990590160009052600081526040518160200152600c81604001526108205181606001526001816080015280905020556108205160a060a05990590160009052600081526040518160200152600c8160400152610860518160600152600281608001528090502055611ccc565b6108205115611ccb5761082051600c60405102600b0155600060a060a05990590160009052600081526040518160200152600c81604001526108205181606001526001816080015280905020555b5b6108605115611d0c57600060a060a05990590160009052600081526040518160200152600c81604001526101c05181606001526001816080015280905020555b6108205115611d4c57600060a060a05990590160009052600081526040518160200152600c81604001526101c05181606001526002816080015280905020555b600060a060a05990590160009052600081526040518160200152600c81604001526101c05181606001526000816080015280905020556001600c60405102600a015403600c60405102600a01556001610700511415611dde57670de0b6b3a76400006106a051600a0a6106c0510260a0516080510205026101205260006000600060006101205133611388f150611e9c565b6002610700511415611e9b5760805160806080599059016000905260048152338160200152604051816040015260018160600152809050205403608060805990590160009052600481523381602001526040518160400152600181606001528090502055608051608060805990590160009052600481523381602001526040518160400152600081606001528090502054016080608059905901600090526004815233816020015260405181604001526000816060015280905020555b5b601c60a059905901600090520133815260a051602082015260805160408201526101c05160608201526040517f0ac6333455d304288767a0f1039d666d16882d10b6ea83693d2556e4c8098001608083a2506001610f40526020610f40f35b6000610f60526020610f60f35b63d91e22f48114156122f057600435610f8052602435610680526044356106a0526064356106c0526084356106e05260a435610fa0526001741600000000000000000000000000000000000000005401610fc0526000610f8051131515611f7657601e610fe0526020610fe0f35b610f8051740d0000000000000000000000000000000000000000015415611fa457601f611000526020611000f35b600061068051131515611fbe576020611020526020611020f35b6000610fa0511215611fd7576021611040526020611040f35b60006106a0511215611ff0576022611060526020611060f35b60006106c0511215612009576023611080526020611080f35b60006106e05112156120225760246110a05260206110a0f35b6000601c606459905901600090520163c32d01a1601c82035233600482015230602482015260206110c0604483600061068051602d5a03f1506110c05190501415156120755760286110e05260206110e0f35b6001601c60645990590160009052016383b58638601c820352306004820152600060248201526020611100604483600061068051602d5a03f1506111005190501415156120c9576029611120526020611120f35b6000601c60445990590160009052016326690247601c8203523060048201526020611140602483600061068051602d5a03f15061114051905014151561211657602a611160526020611160f35b6000601c60645990590160009052016386744558601c820352336004820152600060248201526020611180604483600061068051602d5a03f15061118051905014151561216a57602b6111a05260206111a0f35b6000601c60845990590160009052016327f08b00601c8203523060048201523360248201526000604482015260206111c0606483600061068051602d5a03f1506111c05190501415156121c457602c6111e05260206111e0f35b610fc051600c610fc0510255610f8051600c610fc051026001015561068051600c610fc0510260020155610fa051600c610fc05102600601556106a051600c610fc05102600301556106c051600c610fc05102600401556106e051600c610fc05102600501556001600c610fc051026007015533600c610fc051026008015543600c610fc0510260090155610fc05161068051740c00000000000000000000000000000000000000000155610fc051610f8051740d00000000000000000000000000000000000000000155610fc0517416000000000000000000000000000000000000000055601c6040599059016000905201610fc05181527f1238fe6d44cf796960d61b74766b3a383110e472d849f5ca16ae50215bc05e58602082a1506001611200526020611200f35b634156966181141561232a576004356112205261122051740c00000000000000000000000000000000000000000154611240526020611240f35b63fcde9f7881141561236457600435610f8052610f8051740d00000000000000000000000000000000000000000154611260526020611260f35b636e5b4343811415612392577416000000000000000000000000000000000000000054611280526020611280f35b63fafa69c28114156124e657600435610fc0526101805990590160009052600b81526020810190506112a052600c610fc05102546112a05152600c610fc051026001015460206112a0510152600c610fc051026002015460406112a0510152600c610fc051026003015460606112a0510152600c610fc051026004015460806112a0510152600c610fc051026005015460a06112a0510152600c610fc051026007015460c06112a0510152600c610fc051026008015460e06112a0510152600c610fc05102600901546101006112a0510152600c610fc05102600a01546101206112a0510152600c610fc05102600601546101406112a05101526112a051156124b2576112a05160206040820352602060208203510260400160408203f3505b60405990590160009052600181526000602082015260208101905060206040820352602060208203510260400160408203f3505b639cfc153581141561262e57600435604052600c60405102600a015461134052600c60405102600b01546101c0526113405180602002602001599059016000905281815260208101905090506106005260006113a0525b611340516113a05112156125d45760a060a05990590160009052600081526040518160200152600c81604001526101c05181606001526000816080015280905020546113a05160200261060051015260a060a05990590160009052600081526040518160200152600c81604001526101c05181606001526002816080015280905020546101c05260016113a051016113a05261253d565b61060051156125fa576106005160206040820352602060208203510260400160408203f3505b60405990590160009052600181526000602082015260208101905060206040820352602060208203510260400160408203f3505b630f7181908114156127e957600435610fc052610120599059016000905260088152602081019050610180526008610fc05102740e0000000000000000000000000000000000000000015461018051526008610fc05102740e0000000000000000000000000000000000000001015460206101805101526008610fc05102740e0000000000000000000000000000000000000002015460406101805101526008610fc05102740e0000000000000000000000000000000000000003015460606101805101526008610fc05102740e0000000000000000000000000000000000000004015460806101805101526008610fc05102740e0000000000000000000000000000000000000005015460a06101805101526008610fc05102740e0000000000000000000000000000000000000006015460c06101805101526008610fc05102740e0000000000000000000000000000000000000007015460e061018051015261018051156127b5576101805160206040820352602060208203510260400160408203f3505b60405990590160009052600181526000602082015260208101905060206040820352602060208203510260400160408203f3505b631c9aa4b6811415612893576004356112205260243560405260605990590160009052600281526080608059905901600090526004815261122051816020015260405181604001526000816060015280905020546020820152608060805990590160009052600481526112205181602001526040518160400152600181606001528090502054604082015260208101905060206040820352602060208203510260400160408203f3505b50",
                 "nonce" : "0x00",
@@ -69,9 +69,9 @@
                     "0x160000000000000000000000000000000000000000" : "0x01"
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x18",
                 "storage" : {
                 }
@@ -82,14 +82,14 @@
                 "0xd91e22f40000000000000000000000000000000000000000000000000000000000505347000000000000000000000000000000000000000000000000000000002450534700000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000005f5e100000000000000000000000000000000000000000000000000002386f26fc100000000000000000000000000000000000000000000000000000000000000000001"
             ],
             "gasLimit" : [
-                "500000"
+                "0x07a120"
             ],
             "gasPrice" : "0x0c416c1984",
             "nonce" : "0x18",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0dc02922f33e45537411b9f92a1dcc9750ba9932",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0dc02922f33e45537411b9f92a1dcc9750ba9932",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stStackTests/shallowStack.json b/GeneralStateTests/stStackTests/shallowStack.json
index 87250a806..63d05ea90 100644
--- a/GeneralStateTests/stStackTests/shallowStack.json
+++ b/GeneralStateTests/stStackTests/shallowStack.json
@@ -1,17 +1,17 @@
 {
     "shallowStack" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -27,7 +27,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -35,7 +35,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -43,7 +43,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 0,
@@ -51,7 +51,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 0,
@@ -59,7 +59,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 6,
                         "gas" : 0,
@@ -67,7 +67,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 7,
                         "gas" : 0,
@@ -75,7 +75,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 8,
                         "gas" : 0,
@@ -83,7 +83,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 9,
                         "gas" : 0,
@@ -91,7 +91,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 10,
                         "gas" : 0,
@@ -99,7 +99,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 11,
                         "gas" : 0,
@@ -107,7 +107,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 12,
                         "gas" : 0,
@@ -115,7 +115,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 13,
                         "gas" : 0,
@@ -123,7 +123,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 14,
                         "gas" : 0,
@@ -131,7 +131,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 15,
                         "gas" : 0,
@@ -139,7 +139,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 16,
                         "gas" : 0,
@@ -147,7 +147,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 17,
                         "gas" : 0,
@@ -155,7 +155,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 18,
                         "gas" : 0,
@@ -163,7 +163,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 19,
                         "gas" : 0,
@@ -171,7 +171,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 20,
                         "gas" : 0,
@@ -179,7 +179,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 21,
                         "gas" : 0,
@@ -187,7 +187,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 22,
                         "gas" : 0,
@@ -195,7 +195,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 23,
                         "gas" : 0,
@@ -203,7 +203,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 24,
                         "gas" : 0,
@@ -211,7 +211,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 25,
                         "gas" : 0,
@@ -219,7 +219,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 26,
                         "gas" : 0,
@@ -227,7 +227,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 27,
                         "gas" : 0,
@@ -235,7 +235,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 28,
                         "gas" : 0,
@@ -243,7 +243,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 29,
                         "gas" : 0,
@@ -251,7 +251,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 30,
                         "gas" : 0,
@@ -259,7 +259,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 31,
                         "gas" : 0,
@@ -267,7 +267,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 32,
                         "gas" : 0,
@@ -275,7 +275,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 33,
                         "gas" : 0,
@@ -283,7 +283,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 34,
                         "gas" : 0,
@@ -291,7 +291,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 35,
                         "gas" : 0,
@@ -299,7 +299,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 36,
                         "gas" : 0,
@@ -307,7 +307,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 37,
                         "gas" : 0,
@@ -315,7 +315,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 38,
                         "gas" : 0,
@@ -323,7 +323,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 39,
                         "gas" : 0,
@@ -331,7 +331,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 40,
                         "gas" : 0,
@@ -339,7 +339,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 41,
                         "gas" : 0,
@@ -347,7 +347,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 42,
                         "gas" : 0,
@@ -355,7 +355,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 43,
                         "gas" : 0,
@@ -363,7 +363,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 44,
                         "gas" : 0,
@@ -371,7 +371,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 45,
                         "gas" : 0,
@@ -379,7 +379,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 46,
                         "gas" : 0,
@@ -387,7 +387,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 47,
                         "gas" : 0,
@@ -395,7 +395,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 48,
                         "gas" : 0,
@@ -403,7 +403,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 49,
                         "gas" : 0,
@@ -411,7 +411,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 50,
                         "gas" : 0,
@@ -419,7 +419,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 51,
                         "gas" : 0,
@@ -427,7 +427,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 52,
                         "gas" : 0,
@@ -435,7 +435,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 53,
                         "gas" : 0,
@@ -443,7 +443,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 54,
                         "gas" : 0,
@@ -451,7 +451,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 55,
                         "gas" : 0,
@@ -459,7 +459,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 56,
                         "gas" : 0,
@@ -467,7 +467,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 57,
                         "gas" : 0,
@@ -475,7 +475,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 58,
                         "gas" : 0,
@@ -483,7 +483,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 59,
                         "gas" : 0,
@@ -491,7 +491,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 60,
                         "gas" : 0,
@@ -499,7 +499,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 61,
                         "gas" : 0,
@@ -507,7 +507,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 62,
                         "gas" : 0,
@@ -515,7 +515,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 63,
                         "gas" : 0,
@@ -523,7 +523,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 64,
                         "gas" : 0,
@@ -531,7 +531,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 65,
                         "gas" : 0,
@@ -539,7 +539,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 66,
                         "gas" : 0,
@@ -547,7 +547,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 67,
                         "gas" : 0,
@@ -555,7 +555,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 68,
                         "gas" : 0,
@@ -563,7 +563,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 69,
                         "gas" : 0,
@@ -571,7 +571,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 70,
                         "gas" : 0,
@@ -579,7 +579,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 71,
                         "gas" : 0,
@@ -587,7 +587,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 72,
                         "gas" : 0,
@@ -595,7 +595,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 73,
                         "gas" : 0,
@@ -603,7 +603,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 74,
                         "gas" : 0,
@@ -611,7 +611,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 75,
                         "gas" : 0,
@@ -619,7 +619,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 76,
                         "gas" : 0,
@@ -627,7 +627,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 77,
                         "gas" : 0,
@@ -635,7 +635,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 78,
                         "gas" : 0,
@@ -643,7 +643,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 79,
                         "gas" : 0,
@@ -651,7 +651,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 80,
                         "gas" : 0,
@@ -661,7 +661,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -669,7 +669,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -677,7 +677,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -685,7 +685,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -693,7 +693,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 0,
@@ -701,7 +701,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 0,
@@ -709,7 +709,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 6,
                         "gas" : 0,
@@ -717,7 +717,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 7,
                         "gas" : 0,
@@ -725,7 +725,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 8,
                         "gas" : 0,
@@ -733,7 +733,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 9,
                         "gas" : 0,
@@ -741,7 +741,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 10,
                         "gas" : 0,
@@ -749,7 +749,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 11,
                         "gas" : 0,
@@ -757,7 +757,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 12,
                         "gas" : 0,
@@ -765,7 +765,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 13,
                         "gas" : 0,
@@ -773,7 +773,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 14,
                         "gas" : 0,
@@ -781,7 +781,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 15,
                         "gas" : 0,
@@ -789,7 +789,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 16,
                         "gas" : 0,
@@ -797,7 +797,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 17,
                         "gas" : 0,
@@ -805,7 +805,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 18,
                         "gas" : 0,
@@ -813,7 +813,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 19,
                         "gas" : 0,
@@ -821,7 +821,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 20,
                         "gas" : 0,
@@ -829,7 +829,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 21,
                         "gas" : 0,
@@ -837,7 +837,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 22,
                         "gas" : 0,
@@ -845,7 +845,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 23,
                         "gas" : 0,
@@ -853,7 +853,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 24,
                         "gas" : 0,
@@ -861,7 +861,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 25,
                         "gas" : 0,
@@ -869,7 +869,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 26,
                         "gas" : 0,
@@ -877,7 +877,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 27,
                         "gas" : 0,
@@ -885,7 +885,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 28,
                         "gas" : 0,
@@ -893,7 +893,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 29,
                         "gas" : 0,
@@ -901,7 +901,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 30,
                         "gas" : 0,
@@ -909,7 +909,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 31,
                         "gas" : 0,
@@ -917,7 +917,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 32,
                         "gas" : 0,
@@ -925,7 +925,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 33,
                         "gas" : 0,
@@ -933,7 +933,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 34,
                         "gas" : 0,
@@ -941,7 +941,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 35,
                         "gas" : 0,
@@ -949,7 +949,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 36,
                         "gas" : 0,
@@ -957,7 +957,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 37,
                         "gas" : 0,
@@ -965,7 +965,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 38,
                         "gas" : 0,
@@ -973,7 +973,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 39,
                         "gas" : 0,
@@ -981,7 +981,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 40,
                         "gas" : 0,
@@ -989,7 +989,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 41,
                         "gas" : 0,
@@ -997,7 +997,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 42,
                         "gas" : 0,
@@ -1005,7 +1005,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 43,
                         "gas" : 0,
@@ -1013,7 +1013,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 44,
                         "gas" : 0,
@@ -1021,7 +1021,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 45,
                         "gas" : 0,
@@ -1029,7 +1029,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 46,
                         "gas" : 0,
@@ -1037,7 +1037,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 47,
                         "gas" : 0,
@@ -1045,7 +1045,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 48,
                         "gas" : 0,
@@ -1053,7 +1053,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 49,
                         "gas" : 0,
@@ -1061,7 +1061,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 50,
                         "gas" : 0,
@@ -1069,7 +1069,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 51,
                         "gas" : 0,
@@ -1077,7 +1077,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 52,
                         "gas" : 0,
@@ -1085,7 +1085,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 53,
                         "gas" : 0,
@@ -1093,7 +1093,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 54,
                         "gas" : 0,
@@ -1101,7 +1101,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 55,
                         "gas" : 0,
@@ -1109,7 +1109,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 56,
                         "gas" : 0,
@@ -1117,7 +1117,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 57,
                         "gas" : 0,
@@ -1125,7 +1125,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 58,
                         "gas" : 0,
@@ -1133,7 +1133,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 59,
                         "gas" : 0,
@@ -1141,7 +1141,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 60,
                         "gas" : 0,
@@ -1149,7 +1149,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 61,
                         "gas" : 0,
@@ -1157,7 +1157,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 62,
                         "gas" : 0,
@@ -1165,7 +1165,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 63,
                         "gas" : 0,
@@ -1173,7 +1173,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 64,
                         "gas" : 0,
@@ -1181,7 +1181,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 65,
                         "gas" : 0,
@@ -1189,7 +1189,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 66,
                         "gas" : 0,
@@ -1197,7 +1197,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 67,
                         "gas" : 0,
@@ -1205,7 +1205,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 68,
                         "gas" : 0,
@@ -1213,7 +1213,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 69,
                         "gas" : 0,
@@ -1221,7 +1221,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 70,
                         "gas" : 0,
@@ -1229,7 +1229,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 71,
                         "gas" : 0,
@@ -1237,7 +1237,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 72,
                         "gas" : 0,
@@ -1245,7 +1245,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 73,
                         "gas" : 0,
@@ -1253,7 +1253,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 74,
                         "gas" : 0,
@@ -1261,7 +1261,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 75,
                         "gas" : 0,
@@ -1269,7 +1269,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 76,
                         "gas" : 0,
@@ -1277,7 +1277,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 77,
                         "gas" : 0,
@@ -1285,7 +1285,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 78,
                         "gas" : 0,
@@ -1293,7 +1293,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 79,
                         "gas" : 0,
@@ -1301,7 +1301,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 80,
                         "gas" : 0,
@@ -1311,7 +1311,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -1319,7 +1319,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -1327,7 +1327,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -1335,7 +1335,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -1343,7 +1343,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 0,
@@ -1351,7 +1351,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 0,
@@ -1359,7 +1359,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 6,
                         "gas" : 0,
@@ -1367,7 +1367,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 7,
                         "gas" : 0,
@@ -1375,7 +1375,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 8,
                         "gas" : 0,
@@ -1383,7 +1383,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 9,
                         "gas" : 0,
@@ -1391,7 +1391,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 10,
                         "gas" : 0,
@@ -1399,7 +1399,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 11,
                         "gas" : 0,
@@ -1407,7 +1407,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 12,
                         "gas" : 0,
@@ -1415,7 +1415,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 13,
                         "gas" : 0,
@@ -1423,7 +1423,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 14,
                         "gas" : 0,
@@ -1431,7 +1431,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 15,
                         "gas" : 0,
@@ -1439,7 +1439,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 16,
                         "gas" : 0,
@@ -1447,7 +1447,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 17,
                         "gas" : 0,
@@ -1455,7 +1455,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 18,
                         "gas" : 0,
@@ -1463,7 +1463,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 19,
                         "gas" : 0,
@@ -1471,7 +1471,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 20,
                         "gas" : 0,
@@ -1479,7 +1479,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 21,
                         "gas" : 0,
@@ -1487,7 +1487,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 22,
                         "gas" : 0,
@@ -1495,7 +1495,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 23,
                         "gas" : 0,
@@ -1503,7 +1503,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 24,
                         "gas" : 0,
@@ -1511,7 +1511,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 25,
                         "gas" : 0,
@@ -1519,7 +1519,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 26,
                         "gas" : 0,
@@ -1527,7 +1527,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 27,
                         "gas" : 0,
@@ -1535,7 +1535,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 28,
                         "gas" : 0,
@@ -1543,7 +1543,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 29,
                         "gas" : 0,
@@ -1551,7 +1551,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 30,
                         "gas" : 0,
@@ -1559,7 +1559,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 31,
                         "gas" : 0,
@@ -1567,7 +1567,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 32,
                         "gas" : 0,
@@ -1575,7 +1575,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 33,
                         "gas" : 0,
@@ -1583,7 +1583,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 34,
                         "gas" : 0,
@@ -1591,7 +1591,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 35,
                         "gas" : 0,
@@ -1599,7 +1599,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 36,
                         "gas" : 0,
@@ -1607,7 +1607,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 37,
                         "gas" : 0,
@@ -1615,7 +1615,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 38,
                         "gas" : 0,
@@ -1623,7 +1623,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 39,
                         "gas" : 0,
@@ -1631,7 +1631,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 40,
                         "gas" : 0,
@@ -1639,7 +1639,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 41,
                         "gas" : 0,
@@ -1647,7 +1647,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 42,
                         "gas" : 0,
@@ -1655,7 +1655,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 43,
                         "gas" : 0,
@@ -1663,7 +1663,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 44,
                         "gas" : 0,
@@ -1671,7 +1671,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 45,
                         "gas" : 0,
@@ -1679,7 +1679,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 46,
                         "gas" : 0,
@@ -1687,7 +1687,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 47,
                         "gas" : 0,
@@ -1695,7 +1695,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 48,
                         "gas" : 0,
@@ -1703,7 +1703,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 49,
                         "gas" : 0,
@@ -1711,7 +1711,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 50,
                         "gas" : 0,
@@ -1719,7 +1719,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 51,
                         "gas" : 0,
@@ -1727,7 +1727,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 52,
                         "gas" : 0,
@@ -1735,7 +1735,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 53,
                         "gas" : 0,
@@ -1743,7 +1743,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 54,
                         "gas" : 0,
@@ -1751,7 +1751,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 55,
                         "gas" : 0,
@@ -1759,7 +1759,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 56,
                         "gas" : 0,
@@ -1767,7 +1767,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 57,
                         "gas" : 0,
@@ -1775,7 +1775,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 58,
                         "gas" : 0,
@@ -1783,7 +1783,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 59,
                         "gas" : 0,
@@ -1791,7 +1791,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 60,
                         "gas" : 0,
@@ -1799,7 +1799,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 61,
                         "gas" : 0,
@@ -1807,7 +1807,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 62,
                         "gas" : 0,
@@ -1815,7 +1815,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 63,
                         "gas" : 0,
@@ -1823,7 +1823,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 64,
                         "gas" : 0,
@@ -1831,7 +1831,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 65,
                         "gas" : 0,
@@ -1839,7 +1839,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 66,
                         "gas" : 0,
@@ -1847,7 +1847,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 67,
                         "gas" : 0,
@@ -1855,7 +1855,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 68,
                         "gas" : 0,
@@ -1863,7 +1863,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 69,
                         "gas" : 0,
@@ -1871,7 +1871,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 70,
                         "gas" : 0,
@@ -1879,7 +1879,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 71,
                         "gas" : 0,
@@ -1887,7 +1887,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 72,
                         "gas" : 0,
@@ -1895,7 +1895,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 73,
                         "gas" : 0,
@@ -1903,7 +1903,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 74,
                         "gas" : 0,
@@ -1911,7 +1911,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 75,
                         "gas" : 0,
@@ -1919,7 +1919,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 76,
                         "gas" : 0,
@@ -1927,7 +1927,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 77,
                         "gas" : 0,
@@ -1935,7 +1935,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 78,
                         "gas" : 0,
@@ -1943,7 +1943,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 79,
                         "gas" : 0,
@@ -1951,7 +1951,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 80,
                         "gas" : 0,
@@ -1961,7 +1961,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -1969,7 +1969,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -1977,7 +1977,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -1985,7 +1985,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -1993,7 +1993,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 0,
@@ -2001,7 +2001,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 0,
@@ -2009,7 +2009,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 6,
                         "gas" : 0,
@@ -2017,7 +2017,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 7,
                         "gas" : 0,
@@ -2025,7 +2025,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 8,
                         "gas" : 0,
@@ -2033,7 +2033,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 9,
                         "gas" : 0,
@@ -2041,7 +2041,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 10,
                         "gas" : 0,
@@ -2049,7 +2049,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 11,
                         "gas" : 0,
@@ -2057,7 +2057,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 12,
                         "gas" : 0,
@@ -2065,7 +2065,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 13,
                         "gas" : 0,
@@ -2073,7 +2073,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 14,
                         "gas" : 0,
@@ -2081,7 +2081,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 15,
                         "gas" : 0,
@@ -2089,7 +2089,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 16,
                         "gas" : 0,
@@ -2097,7 +2097,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 17,
                         "gas" : 0,
@@ -2105,7 +2105,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 18,
                         "gas" : 0,
@@ -2113,7 +2113,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 19,
                         "gas" : 0,
@@ -2121,7 +2121,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 20,
                         "gas" : 0,
@@ -2129,7 +2129,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 21,
                         "gas" : 0,
@@ -2137,7 +2137,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 22,
                         "gas" : 0,
@@ -2145,7 +2145,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 23,
                         "gas" : 0,
@@ -2153,7 +2153,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 24,
                         "gas" : 0,
@@ -2161,7 +2161,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 25,
                         "gas" : 0,
@@ -2169,7 +2169,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 26,
                         "gas" : 0,
@@ -2177,7 +2177,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 27,
                         "gas" : 0,
@@ -2185,7 +2185,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 28,
                         "gas" : 0,
@@ -2193,7 +2193,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 29,
                         "gas" : 0,
@@ -2201,7 +2201,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 30,
                         "gas" : 0,
@@ -2209,7 +2209,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 31,
                         "gas" : 0,
@@ -2217,7 +2217,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 32,
                         "gas" : 0,
@@ -2225,7 +2225,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 33,
                         "gas" : 0,
@@ -2233,7 +2233,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 34,
                         "gas" : 0,
@@ -2241,7 +2241,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 35,
                         "gas" : 0,
@@ -2249,7 +2249,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 36,
                         "gas" : 0,
@@ -2257,7 +2257,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 37,
                         "gas" : 0,
@@ -2265,7 +2265,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 38,
                         "gas" : 0,
@@ -2273,7 +2273,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 39,
                         "gas" : 0,
@@ -2281,7 +2281,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 40,
                         "gas" : 0,
@@ -2289,7 +2289,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 41,
                         "gas" : 0,
@@ -2297,7 +2297,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 42,
                         "gas" : 0,
@@ -2305,7 +2305,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 43,
                         "gas" : 0,
@@ -2313,7 +2313,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 44,
                         "gas" : 0,
@@ -2321,7 +2321,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 45,
                         "gas" : 0,
@@ -2329,7 +2329,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 46,
                         "gas" : 0,
@@ -2337,7 +2337,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 47,
                         "gas" : 0,
@@ -2345,7 +2345,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 48,
                         "gas" : 0,
@@ -2353,7 +2353,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 49,
                         "gas" : 0,
@@ -2361,7 +2361,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 50,
                         "gas" : 0,
@@ -2369,7 +2369,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 51,
                         "gas" : 0,
@@ -2377,7 +2377,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 52,
                         "gas" : 0,
@@ -2385,7 +2385,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 53,
                         "gas" : 0,
@@ -2393,7 +2393,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 54,
                         "gas" : 0,
@@ -2401,7 +2401,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 55,
                         "gas" : 0,
@@ -2409,7 +2409,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 56,
                         "gas" : 0,
@@ -2417,7 +2417,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 57,
                         "gas" : 0,
@@ -2425,7 +2425,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 58,
                         "gas" : 0,
@@ -2433,7 +2433,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 59,
                         "gas" : 0,
@@ -2441,7 +2441,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 60,
                         "gas" : 0,
@@ -2449,7 +2449,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 61,
                         "gas" : 0,
@@ -2457,7 +2457,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 62,
                         "gas" : 0,
@@ -2465,7 +2465,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 63,
                         "gas" : 0,
@@ -2473,7 +2473,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 64,
                         "gas" : 0,
@@ -2481,7 +2481,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 65,
                         "gas" : 0,
@@ -2489,7 +2489,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 66,
                         "gas" : 0,
@@ -2497,7 +2497,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 67,
                         "gas" : 0,
@@ -2505,7 +2505,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 68,
                         "gas" : 0,
@@ -2513,7 +2513,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 69,
                         "gas" : 0,
@@ -2521,7 +2521,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 70,
                         "gas" : 0,
@@ -2529,7 +2529,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 71,
                         "gas" : 0,
@@ -2537,7 +2537,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 72,
                         "gas" : 0,
@@ -2545,7 +2545,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 73,
                         "gas" : 0,
@@ -2553,7 +2553,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 74,
                         "gas" : 0,
@@ -2561,7 +2561,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 75,
                         "gas" : 0,
@@ -2569,7 +2569,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 76,
                         "gas" : 0,
@@ -2577,7 +2577,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 77,
                         "gas" : 0,
@@ -2585,7 +2585,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 78,
                         "gas" : 0,
@@ -2593,7 +2593,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 79,
                         "gas" : 0,
@@ -2601,7 +2601,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 80,
                         "gas" : 0,
@@ -2611,7 +2611,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -2619,7 +2619,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -2627,7 +2627,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -2635,7 +2635,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -2643,7 +2643,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 0,
@@ -2651,7 +2651,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 0,
@@ -2659,7 +2659,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 6,
                         "gas" : 0,
@@ -2667,7 +2667,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 7,
                         "gas" : 0,
@@ -2675,7 +2675,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 8,
                         "gas" : 0,
@@ -2683,7 +2683,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 9,
                         "gas" : 0,
@@ -2691,7 +2691,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 10,
                         "gas" : 0,
@@ -2699,7 +2699,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 11,
                         "gas" : 0,
@@ -2707,7 +2707,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 12,
                         "gas" : 0,
@@ -2715,7 +2715,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 13,
                         "gas" : 0,
@@ -2723,7 +2723,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 14,
                         "gas" : 0,
@@ -2731,7 +2731,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 15,
                         "gas" : 0,
@@ -2739,7 +2739,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 16,
                         "gas" : 0,
@@ -2747,7 +2747,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 17,
                         "gas" : 0,
@@ -2755,7 +2755,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 18,
                         "gas" : 0,
@@ -2763,7 +2763,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 19,
                         "gas" : 0,
@@ -2771,7 +2771,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 20,
                         "gas" : 0,
@@ -2779,7 +2779,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 21,
                         "gas" : 0,
@@ -2787,7 +2787,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 22,
                         "gas" : 0,
@@ -2795,7 +2795,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 23,
                         "gas" : 0,
@@ -2803,7 +2803,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 24,
                         "gas" : 0,
@@ -2811,7 +2811,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 25,
                         "gas" : 0,
@@ -2819,7 +2819,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 26,
                         "gas" : 0,
@@ -2827,7 +2827,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 27,
                         "gas" : 0,
@@ -2835,7 +2835,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 28,
                         "gas" : 0,
@@ -2843,7 +2843,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 29,
                         "gas" : 0,
@@ -2851,7 +2851,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 30,
                         "gas" : 0,
@@ -2859,7 +2859,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 31,
                         "gas" : 0,
@@ -2867,7 +2867,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 32,
                         "gas" : 0,
@@ -2875,7 +2875,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 33,
                         "gas" : 0,
@@ -2883,7 +2883,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 34,
                         "gas" : 0,
@@ -2891,7 +2891,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 35,
                         "gas" : 0,
@@ -2899,7 +2899,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 36,
                         "gas" : 0,
@@ -2907,7 +2907,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 37,
                         "gas" : 0,
@@ -2915,7 +2915,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 38,
                         "gas" : 0,
@@ -2923,7 +2923,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 39,
                         "gas" : 0,
@@ -2931,7 +2931,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 40,
                         "gas" : 0,
@@ -2939,7 +2939,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 41,
                         "gas" : 0,
@@ -2947,7 +2947,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 42,
                         "gas" : 0,
@@ -2955,7 +2955,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 43,
                         "gas" : 0,
@@ -2963,7 +2963,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 44,
                         "gas" : 0,
@@ -2971,7 +2971,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 45,
                         "gas" : 0,
@@ -2979,7 +2979,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 46,
                         "gas" : 0,
@@ -2987,7 +2987,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 47,
                         "gas" : 0,
@@ -2995,7 +2995,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 48,
                         "gas" : 0,
@@ -3003,7 +3003,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 49,
                         "gas" : 0,
@@ -3011,7 +3011,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 50,
                         "gas" : 0,
@@ -3019,7 +3019,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 51,
                         "gas" : 0,
@@ -3027,7 +3027,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 52,
                         "gas" : 0,
@@ -3035,7 +3035,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 53,
                         "gas" : 0,
@@ -3043,7 +3043,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 54,
                         "gas" : 0,
@@ -3051,7 +3051,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 55,
                         "gas" : 0,
@@ -3059,7 +3059,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 56,
                         "gas" : 0,
@@ -3067,7 +3067,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 57,
                         "gas" : 0,
@@ -3075,7 +3075,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 58,
                         "gas" : 0,
@@ -3083,7 +3083,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 59,
                         "gas" : 0,
@@ -3091,7 +3091,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 60,
                         "gas" : 0,
@@ -3099,7 +3099,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 61,
                         "gas" : 0,
@@ -3107,7 +3107,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 62,
                         "gas" : 0,
@@ -3115,7 +3115,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 63,
                         "gas" : 0,
@@ -3123,7 +3123,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 64,
                         "gas" : 0,
@@ -3131,7 +3131,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 65,
                         "gas" : 0,
@@ -3139,7 +3139,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 66,
                         "gas" : 0,
@@ -3147,7 +3147,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 67,
                         "gas" : 0,
@@ -3155,7 +3155,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 68,
                         "gas" : 0,
@@ -3163,7 +3163,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 69,
                         "gas" : 0,
@@ -3171,7 +3171,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 70,
                         "gas" : 0,
@@ -3179,7 +3179,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 71,
                         "gas" : 0,
@@ -3187,7 +3187,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 72,
                         "gas" : 0,
@@ -3195,7 +3195,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 73,
                         "gas" : 0,
@@ -3203,7 +3203,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 74,
                         "gas" : 0,
@@ -3211,7 +3211,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 75,
                         "gas" : 0,
@@ -3219,7 +3219,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 76,
                         "gas" : 0,
@@ -3227,7 +3227,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 77,
                         "gas" : 0,
@@ -3235,7 +3235,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 78,
                         "gas" : 0,
@@ -3243,7 +3243,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 79,
                         "gas" : 0,
@@ -3251,7 +3251,7 @@
                     }
                 },
                 {
-                    "hash" : "d1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
+                    "hash" : "0xd1fc169ab5f7dd9892cd52edeac8f586e1969814920c4f33b34d2120b46a08aa",
                     "indexes" : {
                         "data" : 80,
                         "gas" : 0,
@@ -3261,9 +3261,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x271000000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -3354,14 +3354,14 @@
                 "0xff600055"
             ],
             "gasLimit" : [
-                "300000"
+                "0x0493e0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stStackTests/stackOverflow.json b/GeneralStateTests/stStackTests/stackOverflow.json
index c03bb7921..347ecf434 100644
--- a/GeneralStateTests/stStackTests/stackOverflow.json
+++ b/GeneralStateTests/stStackTests/stackOverflow.json
@@ -1,17 +1,17 @@
 {
     "stackOverflow" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -27,7 +27,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -35,7 +35,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -43,7 +43,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 0,
@@ -51,7 +51,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 0,
@@ -59,7 +59,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 6,
                         "gas" : 0,
@@ -67,7 +67,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 7,
                         "gas" : 0,
@@ -75,7 +75,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 8,
                         "gas" : 0,
@@ -83,7 +83,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 9,
                         "gas" : 0,
@@ -91,7 +91,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 10,
                         "gas" : 0,
@@ -99,7 +99,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 11,
                         "gas" : 0,
@@ -107,7 +107,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 12,
                         "gas" : 0,
@@ -115,7 +115,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 13,
                         "gas" : 0,
@@ -123,7 +123,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 14,
                         "gas" : 0,
@@ -131,7 +131,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 15,
                         "gas" : 0,
@@ -141,7 +141,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -149,7 +149,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -157,7 +157,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -165,7 +165,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -173,7 +173,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 0,
@@ -181,7 +181,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 0,
@@ -189,7 +189,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 6,
                         "gas" : 0,
@@ -197,7 +197,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 7,
                         "gas" : 0,
@@ -205,7 +205,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 8,
                         "gas" : 0,
@@ -213,7 +213,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 9,
                         "gas" : 0,
@@ -221,7 +221,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 10,
                         "gas" : 0,
@@ -229,7 +229,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 11,
                         "gas" : 0,
@@ -237,7 +237,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 12,
                         "gas" : 0,
@@ -245,7 +245,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 13,
                         "gas" : 0,
@@ -253,7 +253,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 14,
                         "gas" : 0,
@@ -261,7 +261,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 15,
                         "gas" : 0,
@@ -271,7 +271,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -279,7 +279,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -287,7 +287,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -295,7 +295,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -303,7 +303,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 0,
@@ -311,7 +311,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 0,
@@ -319,7 +319,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 6,
                         "gas" : 0,
@@ -327,7 +327,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 7,
                         "gas" : 0,
@@ -335,7 +335,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 8,
                         "gas" : 0,
@@ -343,7 +343,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 9,
                         "gas" : 0,
@@ -351,7 +351,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 10,
                         "gas" : 0,
@@ -359,7 +359,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 11,
                         "gas" : 0,
@@ -367,7 +367,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 12,
                         "gas" : 0,
@@ -375,7 +375,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 13,
                         "gas" : 0,
@@ -383,7 +383,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 14,
                         "gas" : 0,
@@ -391,7 +391,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 15,
                         "gas" : 0,
@@ -401,7 +401,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -409,7 +409,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -417,7 +417,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -425,7 +425,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -433,7 +433,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 0,
@@ -441,7 +441,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 0,
@@ -449,7 +449,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 6,
                         "gas" : 0,
@@ -457,7 +457,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 7,
                         "gas" : 0,
@@ -465,7 +465,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 8,
                         "gas" : 0,
@@ -473,7 +473,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 9,
                         "gas" : 0,
@@ -481,7 +481,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 10,
                         "gas" : 0,
@@ -489,7 +489,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 11,
                         "gas" : 0,
@@ -497,7 +497,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 12,
                         "gas" : 0,
@@ -505,7 +505,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 13,
                         "gas" : 0,
@@ -513,7 +513,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 14,
                         "gas" : 0,
@@ -521,7 +521,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 15,
                         "gas" : 0,
@@ -531,7 +531,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -539,7 +539,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -547,7 +547,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -555,7 +555,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -563,7 +563,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 0,
@@ -571,7 +571,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 0,
@@ -579,7 +579,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 6,
                         "gas" : 0,
@@ -587,7 +587,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 7,
                         "gas" : 0,
@@ -595,7 +595,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 8,
                         "gas" : 0,
@@ -603,7 +603,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 9,
                         "gas" : 0,
@@ -611,7 +611,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 10,
                         "gas" : 0,
@@ -619,7 +619,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 11,
                         "gas" : 0,
@@ -627,7 +627,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 12,
                         "gas" : 0,
@@ -635,7 +635,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 13,
                         "gas" : 0,
@@ -643,7 +643,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 14,
                         "gas" : 0,
@@ -651,7 +651,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 15,
                         "gas" : 0,
@@ -661,16 +661,16 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a5100000000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a5100000000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -696,14 +696,14 @@
                 "0x60006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000"
             ],
             "gasLimit" : [
-                "6000000"
+                "0x5b8d80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stStackTests/stackOverflowDUP.json b/GeneralStateTests/stStackTests/stackOverflowDUP.json
index 32ed93d8e..af6bfb39e 100644
--- a/GeneralStateTests/stStackTests/stackOverflowDUP.json
+++ b/GeneralStateTests/stStackTests/stackOverflowDUP.json
@@ -1,17 +1,17 @@
 {
     "stackOverflowDUP" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -27,7 +27,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -35,7 +35,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -43,7 +43,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 0,
@@ -51,7 +51,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 0,
@@ -59,7 +59,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 6,
                         "gas" : 0,
@@ -67,7 +67,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 7,
                         "gas" : 0,
@@ -75,7 +75,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 8,
                         "gas" : 0,
@@ -83,7 +83,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 9,
                         "gas" : 0,
@@ -91,7 +91,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 10,
                         "gas" : 0,
@@ -99,7 +99,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 11,
                         "gas" : 0,
@@ -107,7 +107,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 12,
                         "gas" : 0,
@@ -115,7 +115,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 13,
                         "gas" : 0,
@@ -123,7 +123,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 14,
                         "gas" : 0,
@@ -131,7 +131,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 15,
                         "gas" : 0,
@@ -141,7 +141,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -149,7 +149,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -157,7 +157,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -165,7 +165,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -173,7 +173,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 0,
@@ -181,7 +181,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 0,
@@ -189,7 +189,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 6,
                         "gas" : 0,
@@ -197,7 +197,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 7,
                         "gas" : 0,
@@ -205,7 +205,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 8,
                         "gas" : 0,
@@ -213,7 +213,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 9,
                         "gas" : 0,
@@ -221,7 +221,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 10,
                         "gas" : 0,
@@ -229,7 +229,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 11,
                         "gas" : 0,
@@ -237,7 +237,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 12,
                         "gas" : 0,
@@ -245,7 +245,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 13,
                         "gas" : 0,
@@ -253,7 +253,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 14,
                         "gas" : 0,
@@ -261,7 +261,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 15,
                         "gas" : 0,
@@ -271,7 +271,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -279,7 +279,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -287,7 +287,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -295,7 +295,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -303,7 +303,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 0,
@@ -311,7 +311,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 0,
@@ -319,7 +319,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 6,
                         "gas" : 0,
@@ -327,7 +327,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 7,
                         "gas" : 0,
@@ -335,7 +335,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 8,
                         "gas" : 0,
@@ -343,7 +343,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 9,
                         "gas" : 0,
@@ -351,7 +351,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 10,
                         "gas" : 0,
@@ -359,7 +359,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 11,
                         "gas" : 0,
@@ -367,7 +367,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 12,
                         "gas" : 0,
@@ -375,7 +375,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 13,
                         "gas" : 0,
@@ -383,7 +383,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 14,
                         "gas" : 0,
@@ -391,7 +391,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 15,
                         "gas" : 0,
@@ -401,7 +401,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -409,7 +409,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -417,7 +417,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -425,7 +425,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -433,7 +433,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 0,
@@ -441,7 +441,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 0,
@@ -449,7 +449,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 6,
                         "gas" : 0,
@@ -457,7 +457,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 7,
                         "gas" : 0,
@@ -465,7 +465,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 8,
                         "gas" : 0,
@@ -473,7 +473,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 9,
                         "gas" : 0,
@@ -481,7 +481,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 10,
                         "gas" : 0,
@@ -489,7 +489,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 11,
                         "gas" : 0,
@@ -497,7 +497,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 12,
                         "gas" : 0,
@@ -505,7 +505,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 13,
                         "gas" : 0,
@@ -513,7 +513,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 14,
                         "gas" : 0,
@@ -521,7 +521,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 15,
                         "gas" : 0,
@@ -531,7 +531,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -539,7 +539,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -547,7 +547,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -555,7 +555,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -563,7 +563,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 0,
@@ -571,7 +571,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 0,
@@ -579,7 +579,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 6,
                         "gas" : 0,
@@ -587,7 +587,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 7,
                         "gas" : 0,
@@ -595,7 +595,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 8,
                         "gas" : 0,
@@ -603,7 +603,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 9,
                         "gas" : 0,
@@ -611,7 +611,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 10,
                         "gas" : 0,
@@ -619,7 +619,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 11,
                         "gas" : 0,
@@ -627,7 +627,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 12,
                         "gas" : 0,
@@ -635,7 +635,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 13,
                         "gas" : 0,
@@ -643,7 +643,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 14,
                         "gas" : 0,
@@ -651,7 +651,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 15,
                         "gas" : 0,
@@ -661,16 +661,16 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a5100000000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a5100000000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -696,14 +696,14 @@
                 "0x60016002600360046005600660076008600960106011601260136014601560168f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f"
             ],
             "gasLimit" : [
-                "6000000"
+                "0x5b8d80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stStackTests/stackOverflowM1.json b/GeneralStateTests/stStackTests/stackOverflowM1.json
index 0037d078a..a7fca8379 100644
--- a/GeneralStateTests/stStackTests/stackOverflowM1.json
+++ b/GeneralStateTests/stStackTests/stackOverflowM1.json
@@ -1,17 +1,17 @@
 {
     "stackOverflowM1" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
+                    "hash" : "0x1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
+                    "hash" : "0x1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -27,7 +27,7 @@
                     }
                 },
                 {
-                    "hash" : "1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
+                    "hash" : "0x1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -35,7 +35,7 @@
                     }
                 },
                 {
-                    "hash" : "1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
+                    "hash" : "0x1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -43,7 +43,7 @@
                     }
                 },
                 {
-                    "hash" : "1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
+                    "hash" : "0x1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 0,
@@ -51,7 +51,7 @@
                     }
                 },
                 {
-                    "hash" : "1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
+                    "hash" : "0x1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 0,
@@ -59,7 +59,7 @@
                     }
                 },
                 {
-                    "hash" : "1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
+                    "hash" : "0x1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
                     "indexes" : {
                         "data" : 6,
                         "gas" : 0,
@@ -67,7 +67,7 @@
                     }
                 },
                 {
-                    "hash" : "1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
+                    "hash" : "0x1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
                     "indexes" : {
                         "data" : 7,
                         "gas" : 0,
@@ -75,7 +75,7 @@
                     }
                 },
                 {
-                    "hash" : "1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
+                    "hash" : "0x1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
                     "indexes" : {
                         "data" : 8,
                         "gas" : 0,
@@ -83,7 +83,7 @@
                     }
                 },
                 {
-                    "hash" : "1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
+                    "hash" : "0x1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
                     "indexes" : {
                         "data" : 9,
                         "gas" : 0,
@@ -91,7 +91,7 @@
                     }
                 },
                 {
-                    "hash" : "1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
+                    "hash" : "0x1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
                     "indexes" : {
                         "data" : 10,
                         "gas" : 0,
@@ -99,7 +99,7 @@
                     }
                 },
                 {
-                    "hash" : "1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
+                    "hash" : "0x1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
                     "indexes" : {
                         "data" : 11,
                         "gas" : 0,
@@ -107,7 +107,7 @@
                     }
                 },
                 {
-                    "hash" : "1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
+                    "hash" : "0x1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
                     "indexes" : {
                         "data" : 12,
                         "gas" : 0,
@@ -115,7 +115,7 @@
                     }
                 },
                 {
-                    "hash" : "1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
+                    "hash" : "0x1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
                     "indexes" : {
                         "data" : 13,
                         "gas" : 0,
@@ -123,7 +123,7 @@
                     }
                 },
                 {
-                    "hash" : "1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
+                    "hash" : "0x1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
                     "indexes" : {
                         "data" : 14,
                         "gas" : 0,
@@ -131,7 +131,7 @@
                     }
                 },
                 {
-                    "hash" : "0e91f6992d2a2d23ac2d47c66b2eb2089a275a289ad07a47f4a57aa7f73b06be",
+                    "hash" : "0x0e91f6992d2a2d23ac2d47c66b2eb2089a275a289ad07a47f4a57aa7f73b06be",
                     "indexes" : {
                         "data" : 15,
                         "gas" : 0,
@@ -141,7 +141,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
+                    "hash" : "0xe459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -149,7 +149,7 @@
                     }
                 },
                 {
-                    "hash" : "e459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
+                    "hash" : "0xe459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -157,7 +157,7 @@
                     }
                 },
                 {
-                    "hash" : "e459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
+                    "hash" : "0xe459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -165,7 +165,7 @@
                     }
                 },
                 {
-                    "hash" : "e459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
+                    "hash" : "0xe459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -173,7 +173,7 @@
                     }
                 },
                 {
-                    "hash" : "e459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
+                    "hash" : "0xe459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 0,
@@ -181,7 +181,7 @@
                     }
                 },
                 {
-                    "hash" : "e459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
+                    "hash" : "0xe459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 0,
@@ -189,7 +189,7 @@
                     }
                 },
                 {
-                    "hash" : "e459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
+                    "hash" : "0xe459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
                     "indexes" : {
                         "data" : 6,
                         "gas" : 0,
@@ -197,7 +197,7 @@
                     }
                 },
                 {
-                    "hash" : "e459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
+                    "hash" : "0xe459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
                     "indexes" : {
                         "data" : 7,
                         "gas" : 0,
@@ -205,7 +205,7 @@
                     }
                 },
                 {
-                    "hash" : "e459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
+                    "hash" : "0xe459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
                     "indexes" : {
                         "data" : 8,
                         "gas" : 0,
@@ -213,7 +213,7 @@
                     }
                 },
                 {
-                    "hash" : "e459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
+                    "hash" : "0xe459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
                     "indexes" : {
                         "data" : 9,
                         "gas" : 0,
@@ -221,7 +221,7 @@
                     }
                 },
                 {
-                    "hash" : "e459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
+                    "hash" : "0xe459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
                     "indexes" : {
                         "data" : 10,
                         "gas" : 0,
@@ -229,7 +229,7 @@
                     }
                 },
                 {
-                    "hash" : "e459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
+                    "hash" : "0xe459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
                     "indexes" : {
                         "data" : 11,
                         "gas" : 0,
@@ -237,7 +237,7 @@
                     }
                 },
                 {
-                    "hash" : "e459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
+                    "hash" : "0xe459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
                     "indexes" : {
                         "data" : 12,
                         "gas" : 0,
@@ -245,7 +245,7 @@
                     }
                 },
                 {
-                    "hash" : "e459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
+                    "hash" : "0xe459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
                     "indexes" : {
                         "data" : 13,
                         "gas" : 0,
@@ -253,7 +253,7 @@
                     }
                 },
                 {
-                    "hash" : "e459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
+                    "hash" : "0xe459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
                     "indexes" : {
                         "data" : 14,
                         "gas" : 0,
@@ -261,7 +261,7 @@
                     }
                 },
                 {
-                    "hash" : "f9df0dcf5161ca039992eae68ddf660001ae3119efae8a44d9cb1f18b0da093a",
+                    "hash" : "0xf9df0dcf5161ca039992eae68ddf660001ae3119efae8a44d9cb1f18b0da093a",
                     "indexes" : {
                         "data" : 15,
                         "gas" : 0,
@@ -271,7 +271,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "ffac54c53b4f17c1f1688bc1cd83455984ea7c62dd4e62e6f0d7bfec60004c77",
+                    "hash" : "0xffac54c53b4f17c1f1688bc1cd83455984ea7c62dd4e62e6f0d7bfec60004c77",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -279,7 +279,7 @@
                     }
                 },
                 {
-                    "hash" : "ffac54c53b4f17c1f1688bc1cd83455984ea7c62dd4e62e6f0d7bfec60004c77",
+                    "hash" : "0xffac54c53b4f17c1f1688bc1cd83455984ea7c62dd4e62e6f0d7bfec60004c77",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -287,7 +287,7 @@
                     }
                 },
                 {
-                    "hash" : "ffac54c53b4f17c1f1688bc1cd83455984ea7c62dd4e62e6f0d7bfec60004c77",
+                    "hash" : "0xffac54c53b4f17c1f1688bc1cd83455984ea7c62dd4e62e6f0d7bfec60004c77",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -295,7 +295,7 @@
                     }
                 },
                 {
-                    "hash" : "ffac54c53b4f17c1f1688bc1cd83455984ea7c62dd4e62e6f0d7bfec60004c77",
+                    "hash" : "0xffac54c53b4f17c1f1688bc1cd83455984ea7c62dd4e62e6f0d7bfec60004c77",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -303,7 +303,7 @@
                     }
                 },
                 {
-                    "hash" : "ffac54c53b4f17c1f1688bc1cd83455984ea7c62dd4e62e6f0d7bfec60004c77",
+                    "hash" : "0xffac54c53b4f17c1f1688bc1cd83455984ea7c62dd4e62e6f0d7bfec60004c77",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 0,
@@ -311,7 +311,7 @@
                     }
                 },
                 {
-                    "hash" : "ffac54c53b4f17c1f1688bc1cd83455984ea7c62dd4e62e6f0d7bfec60004c77",
+                    "hash" : "0xffac54c53b4f17c1f1688bc1cd83455984ea7c62dd4e62e6f0d7bfec60004c77",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 0,
@@ -319,7 +319,7 @@
                     }
                 },
                 {
-                    "hash" : "ffac54c53b4f17c1f1688bc1cd83455984ea7c62dd4e62e6f0d7bfec60004c77",
+                    "hash" : "0xffac54c53b4f17c1f1688bc1cd83455984ea7c62dd4e62e6f0d7bfec60004c77",
                     "indexes" : {
                         "data" : 6,
                         "gas" : 0,
@@ -327,7 +327,7 @@
                     }
                 },
                 {
-                    "hash" : "ffac54c53b4f17c1f1688bc1cd83455984ea7c62dd4e62e6f0d7bfec60004c77",
+                    "hash" : "0xffac54c53b4f17c1f1688bc1cd83455984ea7c62dd4e62e6f0d7bfec60004c77",
                     "indexes" : {
                         "data" : 7,
                         "gas" : 0,
@@ -335,7 +335,7 @@
                     }
                 },
                 {
-                    "hash" : "ffac54c53b4f17c1f1688bc1cd83455984ea7c62dd4e62e6f0d7bfec60004c77",
+                    "hash" : "0xffac54c53b4f17c1f1688bc1cd83455984ea7c62dd4e62e6f0d7bfec60004c77",
                     "indexes" : {
                         "data" : 8,
                         "gas" : 0,
@@ -343,7 +343,7 @@
                     }
                 },
                 {
-                    "hash" : "ffac54c53b4f17c1f1688bc1cd83455984ea7c62dd4e62e6f0d7bfec60004c77",
+                    "hash" : "0xffac54c53b4f17c1f1688bc1cd83455984ea7c62dd4e62e6f0d7bfec60004c77",
                     "indexes" : {
                         "data" : 9,
                         "gas" : 0,
@@ -351,7 +351,7 @@
                     }
                 },
                 {
-                    "hash" : "ffac54c53b4f17c1f1688bc1cd83455984ea7c62dd4e62e6f0d7bfec60004c77",
+                    "hash" : "0xffac54c53b4f17c1f1688bc1cd83455984ea7c62dd4e62e6f0d7bfec60004c77",
                     "indexes" : {
                         "data" : 10,
                         "gas" : 0,
@@ -359,7 +359,7 @@
                     }
                 },
                 {
-                    "hash" : "ffac54c53b4f17c1f1688bc1cd83455984ea7c62dd4e62e6f0d7bfec60004c77",
+                    "hash" : "0xffac54c53b4f17c1f1688bc1cd83455984ea7c62dd4e62e6f0d7bfec60004c77",
                     "indexes" : {
                         "data" : 11,
                         "gas" : 0,
@@ -367,7 +367,7 @@
                     }
                 },
                 {
-                    "hash" : "ffac54c53b4f17c1f1688bc1cd83455984ea7c62dd4e62e6f0d7bfec60004c77",
+                    "hash" : "0xffac54c53b4f17c1f1688bc1cd83455984ea7c62dd4e62e6f0d7bfec60004c77",
                     "indexes" : {
                         "data" : 12,
                         "gas" : 0,
@@ -375,7 +375,7 @@
                     }
                 },
                 {
-                    "hash" : "ffac54c53b4f17c1f1688bc1cd83455984ea7c62dd4e62e6f0d7bfec60004c77",
+                    "hash" : "0xffac54c53b4f17c1f1688bc1cd83455984ea7c62dd4e62e6f0d7bfec60004c77",
                     "indexes" : {
                         "data" : 13,
                         "gas" : 0,
@@ -383,7 +383,7 @@
                     }
                 },
                 {
-                    "hash" : "ffac54c53b4f17c1f1688bc1cd83455984ea7c62dd4e62e6f0d7bfec60004c77",
+                    "hash" : "0xffac54c53b4f17c1f1688bc1cd83455984ea7c62dd4e62e6f0d7bfec60004c77",
                     "indexes" : {
                         "data" : 14,
                         "gas" : 0,
@@ -391,7 +391,7 @@
                     }
                 },
                 {
-                    "hash" : "1eef0b14ab0d5a3423aa5be12ec01d04ba715dfa37b1fd248f9038e0765df64f",
+                    "hash" : "0x1eef0b14ab0d5a3423aa5be12ec01d04ba715dfa37b1fd248f9038e0765df64f",
                     "indexes" : {
                         "data" : 15,
                         "gas" : 0,
@@ -401,7 +401,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
+                    "hash" : "0x1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -409,7 +409,7 @@
                     }
                 },
                 {
-                    "hash" : "1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
+                    "hash" : "0x1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -417,7 +417,7 @@
                     }
                 },
                 {
-                    "hash" : "1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
+                    "hash" : "0x1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -425,7 +425,7 @@
                     }
                 },
                 {
-                    "hash" : "1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
+                    "hash" : "0x1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -433,7 +433,7 @@
                     }
                 },
                 {
-                    "hash" : "1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
+                    "hash" : "0x1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 0,
@@ -441,7 +441,7 @@
                     }
                 },
                 {
-                    "hash" : "1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
+                    "hash" : "0x1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 0,
@@ -449,7 +449,7 @@
                     }
                 },
                 {
-                    "hash" : "1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
+                    "hash" : "0x1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
                     "indexes" : {
                         "data" : 6,
                         "gas" : 0,
@@ -457,7 +457,7 @@
                     }
                 },
                 {
-                    "hash" : "1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
+                    "hash" : "0x1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
                     "indexes" : {
                         "data" : 7,
                         "gas" : 0,
@@ -465,7 +465,7 @@
                     }
                 },
                 {
-                    "hash" : "1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
+                    "hash" : "0x1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
                     "indexes" : {
                         "data" : 8,
                         "gas" : 0,
@@ -473,7 +473,7 @@
                     }
                 },
                 {
-                    "hash" : "1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
+                    "hash" : "0x1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
                     "indexes" : {
                         "data" : 9,
                         "gas" : 0,
@@ -481,7 +481,7 @@
                     }
                 },
                 {
-                    "hash" : "1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
+                    "hash" : "0x1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
                     "indexes" : {
                         "data" : 10,
                         "gas" : 0,
@@ -489,7 +489,7 @@
                     }
                 },
                 {
-                    "hash" : "1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
+                    "hash" : "0x1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
                     "indexes" : {
                         "data" : 11,
                         "gas" : 0,
@@ -497,7 +497,7 @@
                     }
                 },
                 {
-                    "hash" : "1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
+                    "hash" : "0x1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
                     "indexes" : {
                         "data" : 12,
                         "gas" : 0,
@@ -505,7 +505,7 @@
                     }
                 },
                 {
-                    "hash" : "1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
+                    "hash" : "0x1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
                     "indexes" : {
                         "data" : 13,
                         "gas" : 0,
@@ -513,7 +513,7 @@
                     }
                 },
                 {
-                    "hash" : "1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
+                    "hash" : "0x1bd5dc9f5055704dacbd8823e367b5b1db361df9fbbc8c14e761b6a9ca70f3bc",
                     "indexes" : {
                         "data" : 14,
                         "gas" : 0,
@@ -521,7 +521,7 @@
                     }
                 },
                 {
-                    "hash" : "0e91f6992d2a2d23ac2d47c66b2eb2089a275a289ad07a47f4a57aa7f73b06be",
+                    "hash" : "0x0e91f6992d2a2d23ac2d47c66b2eb2089a275a289ad07a47f4a57aa7f73b06be",
                     "indexes" : {
                         "data" : 15,
                         "gas" : 0,
@@ -531,7 +531,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
+                    "hash" : "0xe459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -539,7 +539,7 @@
                     }
                 },
                 {
-                    "hash" : "e459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
+                    "hash" : "0xe459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -547,7 +547,7 @@
                     }
                 },
                 {
-                    "hash" : "e459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
+                    "hash" : "0xe459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -555,7 +555,7 @@
                     }
                 },
                 {
-                    "hash" : "e459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
+                    "hash" : "0xe459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -563,7 +563,7 @@
                     }
                 },
                 {
-                    "hash" : "e459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
+                    "hash" : "0xe459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 0,
@@ -571,7 +571,7 @@
                     }
                 },
                 {
-                    "hash" : "e459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
+                    "hash" : "0xe459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 0,
@@ -579,7 +579,7 @@
                     }
                 },
                 {
-                    "hash" : "e459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
+                    "hash" : "0xe459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
                     "indexes" : {
                         "data" : 6,
                         "gas" : 0,
@@ -587,7 +587,7 @@
                     }
                 },
                 {
-                    "hash" : "e459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
+                    "hash" : "0xe459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
                     "indexes" : {
                         "data" : 7,
                         "gas" : 0,
@@ -595,7 +595,7 @@
                     }
                 },
                 {
-                    "hash" : "e459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
+                    "hash" : "0xe459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
                     "indexes" : {
                         "data" : 8,
                         "gas" : 0,
@@ -603,7 +603,7 @@
                     }
                 },
                 {
-                    "hash" : "e459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
+                    "hash" : "0xe459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
                     "indexes" : {
                         "data" : 9,
                         "gas" : 0,
@@ -611,7 +611,7 @@
                     }
                 },
                 {
-                    "hash" : "e459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
+                    "hash" : "0xe459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
                     "indexes" : {
                         "data" : 10,
                         "gas" : 0,
@@ -619,7 +619,7 @@
                     }
                 },
                 {
-                    "hash" : "e459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
+                    "hash" : "0xe459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
                     "indexes" : {
                         "data" : 11,
                         "gas" : 0,
@@ -627,7 +627,7 @@
                     }
                 },
                 {
-                    "hash" : "e459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
+                    "hash" : "0xe459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
                     "indexes" : {
                         "data" : 12,
                         "gas" : 0,
@@ -635,7 +635,7 @@
                     }
                 },
                 {
-                    "hash" : "e459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
+                    "hash" : "0xe459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
                     "indexes" : {
                         "data" : 13,
                         "gas" : 0,
@@ -643,7 +643,7 @@
                     }
                 },
                 {
-                    "hash" : "e459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
+                    "hash" : "0xe459d77e670e5efcc1628d8d99fd637457e251ac54562a4f7b679a1700fa8919",
                     "indexes" : {
                         "data" : 14,
                         "gas" : 0,
@@ -651,7 +651,7 @@
                     }
                 },
                 {
-                    "hash" : "f9df0dcf5161ca039992eae68ddf660001ae3119efae8a44d9cb1f18b0da093a",
+                    "hash" : "0xf9df0dcf5161ca039992eae68ddf660001ae3119efae8a44d9cb1f18b0da093a",
                     "indexes" : {
                         "data" : 15,
                         "gas" : 0,
@@ -661,16 +661,16 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a5100000000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a5100000000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -696,14 +696,14 @@
                 "0x6000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000600060006000"
             ],
             "gasLimit" : [
-                "6000000"
+                "0x5b8d80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stStackTests/stackOverflowM1DUP.json b/GeneralStateTests/stStackTests/stackOverflowM1DUP.json
index ec63036e6..9ec9ffe08 100644
--- a/GeneralStateTests/stStackTests/stackOverflowM1DUP.json
+++ b/GeneralStateTests/stStackTests/stackOverflowM1DUP.json
@@ -1,17 +1,17 @@
 {
     "stackOverflowM1DUP" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f50d544c3837d2479abd6433382e919cabd3850240c570adb3b70594125b1185",
+                    "hash" : "0xf50d544c3837d2479abd6433382e919cabd3850240c570adb3b70594125b1185",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "b32ca7dc6f7544dfd510867b5baadb7710c90efc0b76aadd2339a8189fac9bcc",
+                    "hash" : "0xb32ca7dc6f7544dfd510867b5baadb7710c90efc0b76aadd2339a8189fac9bcc",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -27,7 +27,7 @@
                     }
                 },
                 {
-                    "hash" : "0f7e0fbf781147e1c0e869e1afd5afc7ac4bf7c86de3803cfb135908cc6d2b7e",
+                    "hash" : "0x0f7e0fbf781147e1c0e869e1afd5afc7ac4bf7c86de3803cfb135908cc6d2b7e",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -35,7 +35,7 @@
                     }
                 },
                 {
-                    "hash" : "776cf391fcc82d5cff1bc4f8a5be5cbff843a701165b399b1ebb8fe9f894fd99",
+                    "hash" : "0x776cf391fcc82d5cff1bc4f8a5be5cbff843a701165b399b1ebb8fe9f894fd99",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -43,7 +43,7 @@
                     }
                 },
                 {
-                    "hash" : "4ee11f2d50815659666b6c53246f594f66551c62a0df386caa0c36f4553de042",
+                    "hash" : "0x4ee11f2d50815659666b6c53246f594f66551c62a0df386caa0c36f4553de042",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 0,
@@ -51,7 +51,7 @@
                     }
                 },
                 {
-                    "hash" : "0680e98dbd6441ca41cc16a9cfaf127b6207380047ee05ec346a94f9221ee025",
+                    "hash" : "0x0680e98dbd6441ca41cc16a9cfaf127b6207380047ee05ec346a94f9221ee025",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 0,
@@ -59,7 +59,7 @@
                     }
                 },
                 {
-                    "hash" : "c543dcf23d25e4714e95a457c5c5194fc6d6ea0c2c16a44e1db87e2f8db64e5c",
+                    "hash" : "0xc543dcf23d25e4714e95a457c5c5194fc6d6ea0c2c16a44e1db87e2f8db64e5c",
                     "indexes" : {
                         "data" : 6,
                         "gas" : 0,
@@ -67,7 +67,7 @@
                     }
                 },
                 {
-                    "hash" : "1056a1e74dba79d626695fe5ac611cc85a8e05ca1d74e7d957e2d7bfbe0622ee",
+                    "hash" : "0x1056a1e74dba79d626695fe5ac611cc85a8e05ca1d74e7d957e2d7bfbe0622ee",
                     "indexes" : {
                         "data" : 7,
                         "gas" : 0,
@@ -75,7 +75,7 @@
                     }
                 },
                 {
-                    "hash" : "c4820d082d09429e075a295dec187c3c5709c8a88eb0a870d71ef2a18e998325",
+                    "hash" : "0xc4820d082d09429e075a295dec187c3c5709c8a88eb0a870d71ef2a18e998325",
                     "indexes" : {
                         "data" : 8,
                         "gas" : 0,
@@ -83,7 +83,7 @@
                     }
                 },
                 {
-                    "hash" : "c364e245fb623ea7332fbe979dd6493a891c4302ee56eafe9039c0a3c72ffa26",
+                    "hash" : "0xc364e245fb623ea7332fbe979dd6493a891c4302ee56eafe9039c0a3c72ffa26",
                     "indexes" : {
                         "data" : 9,
                         "gas" : 0,
@@ -91,7 +91,7 @@
                     }
                 },
                 {
-                    "hash" : "a5173c5722dad7490b4ba68f0a163cac7e9fed372de223b554340a2fad1d87bf",
+                    "hash" : "0xa5173c5722dad7490b4ba68f0a163cac7e9fed372de223b554340a2fad1d87bf",
                     "indexes" : {
                         "data" : 10,
                         "gas" : 0,
@@ -99,7 +99,7 @@
                     }
                 },
                 {
-                    "hash" : "341f1d39861ddf01216c3cb3c1ed7acb9a2f16f523c3e4bdae702625f65002f5",
+                    "hash" : "0x341f1d39861ddf01216c3cb3c1ed7acb9a2f16f523c3e4bdae702625f65002f5",
                     "indexes" : {
                         "data" : 11,
                         "gas" : 0,
@@ -107,7 +107,7 @@
                     }
                 },
                 {
-                    "hash" : "e85096fdee212f2d60b8d969c1a4ee2aae9a0e148c6cfe8954a4229a871b56c9",
+                    "hash" : "0xe85096fdee212f2d60b8d969c1a4ee2aae9a0e148c6cfe8954a4229a871b56c9",
                     "indexes" : {
                         "data" : 12,
                         "gas" : 0,
@@ -115,7 +115,7 @@
                     }
                 },
                 {
-                    "hash" : "4434bb32d1f614c4430e1227274baa6968fef57c5f34f2adc45e75299fafb250",
+                    "hash" : "0x4434bb32d1f614c4430e1227274baa6968fef57c5f34f2adc45e75299fafb250",
                     "indexes" : {
                         "data" : 13,
                         "gas" : 0,
@@ -123,7 +123,7 @@
                     }
                 },
                 {
-                    "hash" : "b52be7c8ac88a0d8e02d8c848ef9571fcb5a5494de0654afbac7114cb07a8ea2",
+                    "hash" : "0xb52be7c8ac88a0d8e02d8c848ef9571fcb5a5494de0654afbac7114cb07a8ea2",
                     "indexes" : {
                         "data" : 14,
                         "gas" : 0,
@@ -131,7 +131,7 @@
                     }
                 },
                 {
-                    "hash" : "f298e58ad0b783a2f9b6fde92d626005a767210856adb39d3eef2570b96e7097",
+                    "hash" : "0xf298e58ad0b783a2f9b6fde92d626005a767210856adb39d3eef2570b96e7097",
                     "indexes" : {
                         "data" : 15,
                         "gas" : 0,
@@ -141,7 +141,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6a2b1fce8d6f7cc86fd3cb28dd1d70f4b3218684db651c10df20ad89a6db8187",
+                    "hash" : "0x6a2b1fce8d6f7cc86fd3cb28dd1d70f4b3218684db651c10df20ad89a6db8187",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -149,7 +149,7 @@
                     }
                 },
                 {
-                    "hash" : "50c49177df4a6826e582cf54f85cb42bfa62efab22ae99d3bce7c37c77825270",
+                    "hash" : "0x50c49177df4a6826e582cf54f85cb42bfa62efab22ae99d3bce7c37c77825270",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -157,7 +157,7 @@
                     }
                 },
                 {
-                    "hash" : "2f49836573b4bf385930c3ef17478b6709c7ed712f950f7fdaf2cac6ad02ee7b",
+                    "hash" : "0x2f49836573b4bf385930c3ef17478b6709c7ed712f950f7fdaf2cac6ad02ee7b",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -165,7 +165,7 @@
                     }
                 },
                 {
-                    "hash" : "4dfeddb923a4c1a844cfb37e1be7db105b6c624fae60bb85b8e197d3a215c180",
+                    "hash" : "0x4dfeddb923a4c1a844cfb37e1be7db105b6c624fae60bb85b8e197d3a215c180",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -173,7 +173,7 @@
                     }
                 },
                 {
-                    "hash" : "5376fd136b98ee7b42b47c24db51c177625d5bd1859796b985b3141eb9e8099f",
+                    "hash" : "0x5376fd136b98ee7b42b47c24db51c177625d5bd1859796b985b3141eb9e8099f",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 0,
@@ -181,7 +181,7 @@
                     }
                 },
                 {
-                    "hash" : "0b80ab11ad5da5e789c464565d5ebf7879221265a7aeead6921f63df59dc27f2",
+                    "hash" : "0x0b80ab11ad5da5e789c464565d5ebf7879221265a7aeead6921f63df59dc27f2",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 0,
@@ -189,7 +189,7 @@
                     }
                 },
                 {
-                    "hash" : "92ea0d7fb847dd7a084273eb26120559c77b1da506769bec6e9e323c594cf458",
+                    "hash" : "0x92ea0d7fb847dd7a084273eb26120559c77b1da506769bec6e9e323c594cf458",
                     "indexes" : {
                         "data" : 6,
                         "gas" : 0,
@@ -197,7 +197,7 @@
                     }
                 },
                 {
-                    "hash" : "8a1cd80584c67d1c039dac6e19790e7eb07dc0876e5b47fad1d5386247f6ca4d",
+                    "hash" : "0x8a1cd80584c67d1c039dac6e19790e7eb07dc0876e5b47fad1d5386247f6ca4d",
                     "indexes" : {
                         "data" : 7,
                         "gas" : 0,
@@ -205,7 +205,7 @@
                     }
                 },
                 {
-                    "hash" : "a394265a8e2d722986bd36e7eb337ef9c1b4810e82fa436e519a7420075080f9",
+                    "hash" : "0xa394265a8e2d722986bd36e7eb337ef9c1b4810e82fa436e519a7420075080f9",
                     "indexes" : {
                         "data" : 8,
                         "gas" : 0,
@@ -213,7 +213,7 @@
                     }
                 },
                 {
-                    "hash" : "eac2b4c212b8348dc7236c12611be9c7172168946b17f9dc3e64a448a2c166ad",
+                    "hash" : "0xeac2b4c212b8348dc7236c12611be9c7172168946b17f9dc3e64a448a2c166ad",
                     "indexes" : {
                         "data" : 9,
                         "gas" : 0,
@@ -221,7 +221,7 @@
                     }
                 },
                 {
-                    "hash" : "f679fa8443129f0757cce3d0b710301cdc285fe8dce9b02c3c17bc0080f37b37",
+                    "hash" : "0xf679fa8443129f0757cce3d0b710301cdc285fe8dce9b02c3c17bc0080f37b37",
                     "indexes" : {
                         "data" : 10,
                         "gas" : 0,
@@ -229,7 +229,7 @@
                     }
                 },
                 {
-                    "hash" : "1d108141df73a12a50b06e7e2f09f2715a02e2465117cf340c5b66d4103946b0",
+                    "hash" : "0x1d108141df73a12a50b06e7e2f09f2715a02e2465117cf340c5b66d4103946b0",
                     "indexes" : {
                         "data" : 11,
                         "gas" : 0,
@@ -237,7 +237,7 @@
                     }
                 },
                 {
-                    "hash" : "1e00f29606f2a7457ea0a837ba3e26786610cc0b22210f37e443e1db77503430",
+                    "hash" : "0x1e00f29606f2a7457ea0a837ba3e26786610cc0b22210f37e443e1db77503430",
                     "indexes" : {
                         "data" : 12,
                         "gas" : 0,
@@ -245,7 +245,7 @@
                     }
                 },
                 {
-                    "hash" : "3486d0d404fa8c3b6da05ddb4cdef0d234ab023bc2b5a900a31ec86d39238625",
+                    "hash" : "0x3486d0d404fa8c3b6da05ddb4cdef0d234ab023bc2b5a900a31ec86d39238625",
                     "indexes" : {
                         "data" : 13,
                         "gas" : 0,
@@ -253,7 +253,7 @@
                     }
                 },
                 {
-                    "hash" : "baa263aa9da83b28be271fb4b63f53158eff9fefbf9e36454477dfd81c485145",
+                    "hash" : "0xbaa263aa9da83b28be271fb4b63f53158eff9fefbf9e36454477dfd81c485145",
                     "indexes" : {
                         "data" : 14,
                         "gas" : 0,
@@ -261,7 +261,7 @@
                     }
                 },
                 {
-                    "hash" : "f5cfc78a7ced012a553ed98d5e92e43ef626b138d30976632c908f740f3f00be",
+                    "hash" : "0xf5cfc78a7ced012a553ed98d5e92e43ef626b138d30976632c908f740f3f00be",
                     "indexes" : {
                         "data" : 15,
                         "gas" : 0,
@@ -271,7 +271,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "cd53d4cc55284575d5d66d82b8b9415969ab60e6008a9345e5670ab559ac3005",
+                    "hash" : "0xcd53d4cc55284575d5d66d82b8b9415969ab60e6008a9345e5670ab559ac3005",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -279,7 +279,7 @@
                     }
                 },
                 {
-                    "hash" : "b047decda42639289e32b469f2b341070d5ef0ff966bf18e2cc95dae83150f01",
+                    "hash" : "0xb047decda42639289e32b469f2b341070d5ef0ff966bf18e2cc95dae83150f01",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -287,7 +287,7 @@
                     }
                 },
                 {
-                    "hash" : "61ba293aca152679699d42b8fdbed97140b2f6f92f6397130788f9d034d629f7",
+                    "hash" : "0x61ba293aca152679699d42b8fdbed97140b2f6f92f6397130788f9d034d629f7",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -295,7 +295,7 @@
                     }
                 },
                 {
-                    "hash" : "ff32c4cc4a03ef354ae4a414b976a1add8f24410b1c504a7373e4d036d1b5515",
+                    "hash" : "0xff32c4cc4a03ef354ae4a414b976a1add8f24410b1c504a7373e4d036d1b5515",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -303,7 +303,7 @@
                     }
                 },
                 {
-                    "hash" : "1e6ca4ff1fdae68b8de35ebfa2100325d8eb1f67276a6a9ba17ae0a99903d1e8",
+                    "hash" : "0x1e6ca4ff1fdae68b8de35ebfa2100325d8eb1f67276a6a9ba17ae0a99903d1e8",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 0,
@@ -311,7 +311,7 @@
                     }
                 },
                 {
-                    "hash" : "f69dc746028591d10f105436d9a4ce370652b20edf15b1b4f744cf8ce332a7fe",
+                    "hash" : "0xf69dc746028591d10f105436d9a4ce370652b20edf15b1b4f744cf8ce332a7fe",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 0,
@@ -319,7 +319,7 @@
                     }
                 },
                 {
-                    "hash" : "ff09bfd23b77a3d5ee3983c398f942b643e1e8a997dd508d25a0133d3cdd1587",
+                    "hash" : "0xff09bfd23b77a3d5ee3983c398f942b643e1e8a997dd508d25a0133d3cdd1587",
                     "indexes" : {
                         "data" : 6,
                         "gas" : 0,
@@ -327,7 +327,7 @@
                     }
                 },
                 {
-                    "hash" : "1a0a4869b200065798adf3b1cc3438a1a903f56dc7a0e8cb8c864aaf546db1a9",
+                    "hash" : "0x1a0a4869b200065798adf3b1cc3438a1a903f56dc7a0e8cb8c864aaf546db1a9",
                     "indexes" : {
                         "data" : 7,
                         "gas" : 0,
@@ -335,7 +335,7 @@
                     }
                 },
                 {
-                    "hash" : "f615edfaaa581027897d73c68b53e9233d0c0aedbb55f72a66cb957fd1ebc834",
+                    "hash" : "0xf615edfaaa581027897d73c68b53e9233d0c0aedbb55f72a66cb957fd1ebc834",
                     "indexes" : {
                         "data" : 8,
                         "gas" : 0,
@@ -343,7 +343,7 @@
                     }
                 },
                 {
-                    "hash" : "05160390ee5a7f30b4cc22613639f252a786b09830f8186919a4a94e1f9df143",
+                    "hash" : "0x05160390ee5a7f30b4cc22613639f252a786b09830f8186919a4a94e1f9df143",
                     "indexes" : {
                         "data" : 9,
                         "gas" : 0,
@@ -351,7 +351,7 @@
                     }
                 },
                 {
-                    "hash" : "ad22503c2fe77ea3c92468f6d60314d8067d5c419d6480c97b9fd966be4a48d2",
+                    "hash" : "0xad22503c2fe77ea3c92468f6d60314d8067d5c419d6480c97b9fd966be4a48d2",
                     "indexes" : {
                         "data" : 10,
                         "gas" : 0,
@@ -359,7 +359,7 @@
                     }
                 },
                 {
-                    "hash" : "e858dbce385f469b74158110e93847f2612621645b22cc96fa17afea6c5c1e9a",
+                    "hash" : "0xe858dbce385f469b74158110e93847f2612621645b22cc96fa17afea6c5c1e9a",
                     "indexes" : {
                         "data" : 11,
                         "gas" : 0,
@@ -367,7 +367,7 @@
                     }
                 },
                 {
-                    "hash" : "1837950c36299972aa2e8e37be50a3a1dc375af98cdc35de0bbf5698f822f53e",
+                    "hash" : "0x1837950c36299972aa2e8e37be50a3a1dc375af98cdc35de0bbf5698f822f53e",
                     "indexes" : {
                         "data" : 12,
                         "gas" : 0,
@@ -375,7 +375,7 @@
                     }
                 },
                 {
-                    "hash" : "360828e9c7f7f0b36b06f0e53a834992d6231d55a5ab2347045d6d6b1696180b",
+                    "hash" : "0x360828e9c7f7f0b36b06f0e53a834992d6231d55a5ab2347045d6d6b1696180b",
                     "indexes" : {
                         "data" : 13,
                         "gas" : 0,
@@ -383,7 +383,7 @@
                     }
                 },
                 {
-                    "hash" : "7ad3fa664857532c94498abbac634c7245796e5b3c1ea74e4c3ec34e77c282cd",
+                    "hash" : "0x7ad3fa664857532c94498abbac634c7245796e5b3c1ea74e4c3ec34e77c282cd",
                     "indexes" : {
                         "data" : 14,
                         "gas" : 0,
@@ -391,7 +391,7 @@
                     }
                 },
                 {
-                    "hash" : "03f807fc2cd205f3979007685125d7581851370f2468148ff89a733549de1b2e",
+                    "hash" : "0x03f807fc2cd205f3979007685125d7581851370f2468148ff89a733549de1b2e",
                     "indexes" : {
                         "data" : 15,
                         "gas" : 0,
@@ -401,7 +401,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f50d544c3837d2479abd6433382e919cabd3850240c570adb3b70594125b1185",
+                    "hash" : "0xf50d544c3837d2479abd6433382e919cabd3850240c570adb3b70594125b1185",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -409,7 +409,7 @@
                     }
                 },
                 {
-                    "hash" : "b32ca7dc6f7544dfd510867b5baadb7710c90efc0b76aadd2339a8189fac9bcc",
+                    "hash" : "0xb32ca7dc6f7544dfd510867b5baadb7710c90efc0b76aadd2339a8189fac9bcc",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -417,7 +417,7 @@
                     }
                 },
                 {
-                    "hash" : "0f7e0fbf781147e1c0e869e1afd5afc7ac4bf7c86de3803cfb135908cc6d2b7e",
+                    "hash" : "0x0f7e0fbf781147e1c0e869e1afd5afc7ac4bf7c86de3803cfb135908cc6d2b7e",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -425,7 +425,7 @@
                     }
                 },
                 {
-                    "hash" : "776cf391fcc82d5cff1bc4f8a5be5cbff843a701165b399b1ebb8fe9f894fd99",
+                    "hash" : "0x776cf391fcc82d5cff1bc4f8a5be5cbff843a701165b399b1ebb8fe9f894fd99",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -433,7 +433,7 @@
                     }
                 },
                 {
-                    "hash" : "4ee11f2d50815659666b6c53246f594f66551c62a0df386caa0c36f4553de042",
+                    "hash" : "0x4ee11f2d50815659666b6c53246f594f66551c62a0df386caa0c36f4553de042",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 0,
@@ -441,7 +441,7 @@
                     }
                 },
                 {
-                    "hash" : "0680e98dbd6441ca41cc16a9cfaf127b6207380047ee05ec346a94f9221ee025",
+                    "hash" : "0x0680e98dbd6441ca41cc16a9cfaf127b6207380047ee05ec346a94f9221ee025",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 0,
@@ -449,7 +449,7 @@
                     }
                 },
                 {
-                    "hash" : "c543dcf23d25e4714e95a457c5c5194fc6d6ea0c2c16a44e1db87e2f8db64e5c",
+                    "hash" : "0xc543dcf23d25e4714e95a457c5c5194fc6d6ea0c2c16a44e1db87e2f8db64e5c",
                     "indexes" : {
                         "data" : 6,
                         "gas" : 0,
@@ -457,7 +457,7 @@
                     }
                 },
                 {
-                    "hash" : "1056a1e74dba79d626695fe5ac611cc85a8e05ca1d74e7d957e2d7bfbe0622ee",
+                    "hash" : "0x1056a1e74dba79d626695fe5ac611cc85a8e05ca1d74e7d957e2d7bfbe0622ee",
                     "indexes" : {
                         "data" : 7,
                         "gas" : 0,
@@ -465,7 +465,7 @@
                     }
                 },
                 {
-                    "hash" : "c4820d082d09429e075a295dec187c3c5709c8a88eb0a870d71ef2a18e998325",
+                    "hash" : "0xc4820d082d09429e075a295dec187c3c5709c8a88eb0a870d71ef2a18e998325",
                     "indexes" : {
                         "data" : 8,
                         "gas" : 0,
@@ -473,7 +473,7 @@
                     }
                 },
                 {
-                    "hash" : "c364e245fb623ea7332fbe979dd6493a891c4302ee56eafe9039c0a3c72ffa26",
+                    "hash" : "0xc364e245fb623ea7332fbe979dd6493a891c4302ee56eafe9039c0a3c72ffa26",
                     "indexes" : {
                         "data" : 9,
                         "gas" : 0,
@@ -481,7 +481,7 @@
                     }
                 },
                 {
-                    "hash" : "a5173c5722dad7490b4ba68f0a163cac7e9fed372de223b554340a2fad1d87bf",
+                    "hash" : "0xa5173c5722dad7490b4ba68f0a163cac7e9fed372de223b554340a2fad1d87bf",
                     "indexes" : {
                         "data" : 10,
                         "gas" : 0,
@@ -489,7 +489,7 @@
                     }
                 },
                 {
-                    "hash" : "341f1d39861ddf01216c3cb3c1ed7acb9a2f16f523c3e4bdae702625f65002f5",
+                    "hash" : "0x341f1d39861ddf01216c3cb3c1ed7acb9a2f16f523c3e4bdae702625f65002f5",
                     "indexes" : {
                         "data" : 11,
                         "gas" : 0,
@@ -497,7 +497,7 @@
                     }
                 },
                 {
-                    "hash" : "e85096fdee212f2d60b8d969c1a4ee2aae9a0e148c6cfe8954a4229a871b56c9",
+                    "hash" : "0xe85096fdee212f2d60b8d969c1a4ee2aae9a0e148c6cfe8954a4229a871b56c9",
                     "indexes" : {
                         "data" : 12,
                         "gas" : 0,
@@ -505,7 +505,7 @@
                     }
                 },
                 {
-                    "hash" : "4434bb32d1f614c4430e1227274baa6968fef57c5f34f2adc45e75299fafb250",
+                    "hash" : "0x4434bb32d1f614c4430e1227274baa6968fef57c5f34f2adc45e75299fafb250",
                     "indexes" : {
                         "data" : 13,
                         "gas" : 0,
@@ -513,7 +513,7 @@
                     }
                 },
                 {
-                    "hash" : "b52be7c8ac88a0d8e02d8c848ef9571fcb5a5494de0654afbac7114cb07a8ea2",
+                    "hash" : "0xb52be7c8ac88a0d8e02d8c848ef9571fcb5a5494de0654afbac7114cb07a8ea2",
                     "indexes" : {
                         "data" : 14,
                         "gas" : 0,
@@ -521,7 +521,7 @@
                     }
                 },
                 {
-                    "hash" : "f298e58ad0b783a2f9b6fde92d626005a767210856adb39d3eef2570b96e7097",
+                    "hash" : "0xf298e58ad0b783a2f9b6fde92d626005a767210856adb39d3eef2570b96e7097",
                     "indexes" : {
                         "data" : 15,
                         "gas" : 0,
@@ -531,7 +531,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6a2b1fce8d6f7cc86fd3cb28dd1d70f4b3218684db651c10df20ad89a6db8187",
+                    "hash" : "0x6a2b1fce8d6f7cc86fd3cb28dd1d70f4b3218684db651c10df20ad89a6db8187",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -539,7 +539,7 @@
                     }
                 },
                 {
-                    "hash" : "50c49177df4a6826e582cf54f85cb42bfa62efab22ae99d3bce7c37c77825270",
+                    "hash" : "0x50c49177df4a6826e582cf54f85cb42bfa62efab22ae99d3bce7c37c77825270",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -547,7 +547,7 @@
                     }
                 },
                 {
-                    "hash" : "2f49836573b4bf385930c3ef17478b6709c7ed712f950f7fdaf2cac6ad02ee7b",
+                    "hash" : "0x2f49836573b4bf385930c3ef17478b6709c7ed712f950f7fdaf2cac6ad02ee7b",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -555,7 +555,7 @@
                     }
                 },
                 {
-                    "hash" : "4dfeddb923a4c1a844cfb37e1be7db105b6c624fae60bb85b8e197d3a215c180",
+                    "hash" : "0x4dfeddb923a4c1a844cfb37e1be7db105b6c624fae60bb85b8e197d3a215c180",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -563,7 +563,7 @@
                     }
                 },
                 {
-                    "hash" : "5376fd136b98ee7b42b47c24db51c177625d5bd1859796b985b3141eb9e8099f",
+                    "hash" : "0x5376fd136b98ee7b42b47c24db51c177625d5bd1859796b985b3141eb9e8099f",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 0,
@@ -571,7 +571,7 @@
                     }
                 },
                 {
-                    "hash" : "0b80ab11ad5da5e789c464565d5ebf7879221265a7aeead6921f63df59dc27f2",
+                    "hash" : "0x0b80ab11ad5da5e789c464565d5ebf7879221265a7aeead6921f63df59dc27f2",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 0,
@@ -579,7 +579,7 @@
                     }
                 },
                 {
-                    "hash" : "92ea0d7fb847dd7a084273eb26120559c77b1da506769bec6e9e323c594cf458",
+                    "hash" : "0x92ea0d7fb847dd7a084273eb26120559c77b1da506769bec6e9e323c594cf458",
                     "indexes" : {
                         "data" : 6,
                         "gas" : 0,
@@ -587,7 +587,7 @@
                     }
                 },
                 {
-                    "hash" : "8a1cd80584c67d1c039dac6e19790e7eb07dc0876e5b47fad1d5386247f6ca4d",
+                    "hash" : "0x8a1cd80584c67d1c039dac6e19790e7eb07dc0876e5b47fad1d5386247f6ca4d",
                     "indexes" : {
                         "data" : 7,
                         "gas" : 0,
@@ -595,7 +595,7 @@
                     }
                 },
                 {
-                    "hash" : "a394265a8e2d722986bd36e7eb337ef9c1b4810e82fa436e519a7420075080f9",
+                    "hash" : "0xa394265a8e2d722986bd36e7eb337ef9c1b4810e82fa436e519a7420075080f9",
                     "indexes" : {
                         "data" : 8,
                         "gas" : 0,
@@ -603,7 +603,7 @@
                     }
                 },
                 {
-                    "hash" : "eac2b4c212b8348dc7236c12611be9c7172168946b17f9dc3e64a448a2c166ad",
+                    "hash" : "0xeac2b4c212b8348dc7236c12611be9c7172168946b17f9dc3e64a448a2c166ad",
                     "indexes" : {
                         "data" : 9,
                         "gas" : 0,
@@ -611,7 +611,7 @@
                     }
                 },
                 {
-                    "hash" : "f679fa8443129f0757cce3d0b710301cdc285fe8dce9b02c3c17bc0080f37b37",
+                    "hash" : "0xf679fa8443129f0757cce3d0b710301cdc285fe8dce9b02c3c17bc0080f37b37",
                     "indexes" : {
                         "data" : 10,
                         "gas" : 0,
@@ -619,7 +619,7 @@
                     }
                 },
                 {
-                    "hash" : "1d108141df73a12a50b06e7e2f09f2715a02e2465117cf340c5b66d4103946b0",
+                    "hash" : "0x1d108141df73a12a50b06e7e2f09f2715a02e2465117cf340c5b66d4103946b0",
                     "indexes" : {
                         "data" : 11,
                         "gas" : 0,
@@ -627,7 +627,7 @@
                     }
                 },
                 {
-                    "hash" : "1e00f29606f2a7457ea0a837ba3e26786610cc0b22210f37e443e1db77503430",
+                    "hash" : "0x1e00f29606f2a7457ea0a837ba3e26786610cc0b22210f37e443e1db77503430",
                     "indexes" : {
                         "data" : 12,
                         "gas" : 0,
@@ -635,7 +635,7 @@
                     }
                 },
                 {
-                    "hash" : "3486d0d404fa8c3b6da05ddb4cdef0d234ab023bc2b5a900a31ec86d39238625",
+                    "hash" : "0x3486d0d404fa8c3b6da05ddb4cdef0d234ab023bc2b5a900a31ec86d39238625",
                     "indexes" : {
                         "data" : 13,
                         "gas" : 0,
@@ -643,7 +643,7 @@
                     }
                 },
                 {
-                    "hash" : "baa263aa9da83b28be271fb4b63f53158eff9fefbf9e36454477dfd81c485145",
+                    "hash" : "0xbaa263aa9da83b28be271fb4b63f53158eff9fefbf9e36454477dfd81c485145",
                     "indexes" : {
                         "data" : 14,
                         "gas" : 0,
@@ -651,7 +651,7 @@
                     }
                 },
                 {
-                    "hash" : "f5cfc78a7ced012a553ed98d5e92e43ef626b138d30976632c908f740f3f00be",
+                    "hash" : "0xf5cfc78a7ced012a553ed98d5e92e43ef626b138d30976632c908f740f3f00be",
                     "indexes" : {
                         "data" : 15,
                         "gas" : 0,
@@ -661,16 +661,16 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a5100000000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a5100000000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -696,14 +696,14 @@
                 "0x60016002600360046005600660076008600960106011601260136014601560168f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f8f"
             ],
             "gasLimit" : [
-                "6000000"
+                "0x5b8d80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stStackTests/stackOverflowM1PUSH.json b/GeneralStateTests/stStackTests/stackOverflowM1PUSH.json
index acbe7eddf..f66613e55 100644
--- a/GeneralStateTests/stStackTests/stackOverflowM1PUSH.json
+++ b/GeneralStateTests/stStackTests/stackOverflowM1PUSH.json
@@ -1,17 +1,17 @@
 {
     "stackOverflowM1PUSH" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "bf1405df919ed7d514847a11ee8b95951b5f7a8b411df27d8b3b611b2e3a6fd9",
+                    "hash" : "0xbf1405df919ed7d514847a11ee8b95951b5f7a8b411df27d8b3b611b2e3a6fd9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "bdcdcf07de8b1036d075be0268ec2f6117b6677603ef0813d082a2fb5ad15c7e",
+                    "hash" : "0xbdcdcf07de8b1036d075be0268ec2f6117b6677603ef0813d082a2fb5ad15c7e",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -27,7 +27,7 @@
                     }
                 },
                 {
-                    "hash" : "d65bfea970605ead491689ef2c5906d60bbf535e0dca68d582d2dc24d640ef9d",
+                    "hash" : "0xd65bfea970605ead491689ef2c5906d60bbf535e0dca68d582d2dc24d640ef9d",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -35,7 +35,7 @@
                     }
                 },
                 {
-                    "hash" : "715a02acbc04f7fe09351b2dc5ae0d4a27e36c10e91bf5303c7da24a8ed4d529",
+                    "hash" : "0x715a02acbc04f7fe09351b2dc5ae0d4a27e36c10e91bf5303c7da24a8ed4d529",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -43,7 +43,7 @@
                     }
                 },
                 {
-                    "hash" : "bb1115cb61504a1b65b7f737641fceb36f3da90adbf6b32badb673f68fc749cc",
+                    "hash" : "0xbb1115cb61504a1b65b7f737641fceb36f3da90adbf6b32badb673f68fc749cc",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 0,
@@ -51,7 +51,7 @@
                     }
                 },
                 {
-                    "hash" : "c09bbbd6baf5f093ace63caa472c15d9492e53fb2b3143516d3ebe2fe20b9e52",
+                    "hash" : "0xc09bbbd6baf5f093ace63caa472c15d9492e53fb2b3143516d3ebe2fe20b9e52",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 0,
@@ -59,7 +59,7 @@
                     }
                 },
                 {
-                    "hash" : "645e11b8d71bf0ebd4cfc05a51bd90d8999bf115ea1bf70009316f17a176db00",
+                    "hash" : "0x645e11b8d71bf0ebd4cfc05a51bd90d8999bf115ea1bf70009316f17a176db00",
                     "indexes" : {
                         "data" : 6,
                         "gas" : 0,
@@ -67,7 +67,7 @@
                     }
                 },
                 {
-                    "hash" : "9be0e2e78c7294c478a48ebdd660fcfb341897cab0913618c1241d2932b61fb9",
+                    "hash" : "0x9be0e2e78c7294c478a48ebdd660fcfb341897cab0913618c1241d2932b61fb9",
                     "indexes" : {
                         "data" : 7,
                         "gas" : 0,
@@ -75,7 +75,7 @@
                     }
                 },
                 {
-                    "hash" : "d2b05a98f54cdc50aad09815c30e5813fe91ce77604d448386674081d2790c1e",
+                    "hash" : "0xd2b05a98f54cdc50aad09815c30e5813fe91ce77604d448386674081d2790c1e",
                     "indexes" : {
                         "data" : 8,
                         "gas" : 0,
@@ -83,7 +83,7 @@
                     }
                 },
                 {
-                    "hash" : "108fbf9cb20159471af96a0941ab0fbec888bf9b9fee2d5fd22af95d1a42a33f",
+                    "hash" : "0x108fbf9cb20159471af96a0941ab0fbec888bf9b9fee2d5fd22af95d1a42a33f",
                     "indexes" : {
                         "data" : 9,
                         "gas" : 0,
@@ -91,7 +91,7 @@
                     }
                 },
                 {
-                    "hash" : "cbb524333ead216bbd5c7f18a790eb2faf652eb90d23d9915c22f0b383cf22ea",
+                    "hash" : "0xcbb524333ead216bbd5c7f18a790eb2faf652eb90d23d9915c22f0b383cf22ea",
                     "indexes" : {
                         "data" : 10,
                         "gas" : 0,
@@ -99,7 +99,7 @@
                     }
                 },
                 {
-                    "hash" : "e41298d79e1052889d38b7dddc1dbee17484d08475f37d413c85c42fb191c913",
+                    "hash" : "0xe41298d79e1052889d38b7dddc1dbee17484d08475f37d413c85c42fb191c913",
                     "indexes" : {
                         "data" : 11,
                         "gas" : 0,
@@ -107,7 +107,7 @@
                     }
                 },
                 {
-                    "hash" : "d1aac4cbe74e83d359c851410eecc37cd0797f4470aa366f5e970382d1ae428f",
+                    "hash" : "0xd1aac4cbe74e83d359c851410eecc37cd0797f4470aa366f5e970382d1ae428f",
                     "indexes" : {
                         "data" : 12,
                         "gas" : 0,
@@ -115,7 +115,7 @@
                     }
                 },
                 {
-                    "hash" : "2c18dcdcbedf1a9828a6bed5bc160ad2b96d67562d7b1cdca2d63cacd912bd5e",
+                    "hash" : "0x2c18dcdcbedf1a9828a6bed5bc160ad2b96d67562d7b1cdca2d63cacd912bd5e",
                     "indexes" : {
                         "data" : 13,
                         "gas" : 0,
@@ -123,7 +123,7 @@
                     }
                 },
                 {
-                    "hash" : "584153ac0e3c3dfa1cbd6167f498b7367133ad70c8639f25675d96ed99ebb004",
+                    "hash" : "0x584153ac0e3c3dfa1cbd6167f498b7367133ad70c8639f25675d96ed99ebb004",
                     "indexes" : {
                         "data" : 14,
                         "gas" : 0,
@@ -131,7 +131,7 @@
                     }
                 },
                 {
-                    "hash" : "88edb1df1412003f5a9324a63851f67db1675f2b17c462f7882f3a86a03ebaf4",
+                    "hash" : "0x88edb1df1412003f5a9324a63851f67db1675f2b17c462f7882f3a86a03ebaf4",
                     "indexes" : {
                         "data" : 15,
                         "gas" : 0,
@@ -139,7 +139,7 @@
                     }
                 },
                 {
-                    "hash" : "60ccecc75984daef8d67a45a3d6e4a231277dafdc6c24e023a6f6fdc98e446a2",
+                    "hash" : "0x60ccecc75984daef8d67a45a3d6e4a231277dafdc6c24e023a6f6fdc98e446a2",
                     "indexes" : {
                         "data" : 16,
                         "gas" : 0,
@@ -147,7 +147,7 @@
                     }
                 },
                 {
-                    "hash" : "58e1af36ab8e38412b37db6b823265c3c3f6c632bdd4b06966bd4ed15f7e9958",
+                    "hash" : "0x58e1af36ab8e38412b37db6b823265c3c3f6c632bdd4b06966bd4ed15f7e9958",
                     "indexes" : {
                         "data" : 17,
                         "gas" : 0,
@@ -155,7 +155,7 @@
                     }
                 },
                 {
-                    "hash" : "525b960811b6545f6ffa59fc0ea7d7a73bede82a32aa3b820e64fe20c7de0dde",
+                    "hash" : "0x525b960811b6545f6ffa59fc0ea7d7a73bede82a32aa3b820e64fe20c7de0dde",
                     "indexes" : {
                         "data" : 18,
                         "gas" : 0,
@@ -163,7 +163,7 @@
                     }
                 },
                 {
-                    "hash" : "e5d9c8369ef3fa22cc2a6f18e1765b15d8160bbdf90765f74586bbd65c3ab279",
+                    "hash" : "0xe5d9c8369ef3fa22cc2a6f18e1765b15d8160bbdf90765f74586bbd65c3ab279",
                     "indexes" : {
                         "data" : 19,
                         "gas" : 0,
@@ -171,7 +171,7 @@
                     }
                 },
                 {
-                    "hash" : "3461352964007b94ed71836d2a5c1f44f64104a26d7e2061f5291745be4f6b0f",
+                    "hash" : "0x3461352964007b94ed71836d2a5c1f44f64104a26d7e2061f5291745be4f6b0f",
                     "indexes" : {
                         "data" : 20,
                         "gas" : 0,
@@ -179,7 +179,7 @@
                     }
                 },
                 {
-                    "hash" : "ee3dea6f5f70c97a9b7fd2ec9cf70ea55a964de8bb04c94c22402be0b2ee72f7",
+                    "hash" : "0xee3dea6f5f70c97a9b7fd2ec9cf70ea55a964de8bb04c94c22402be0b2ee72f7",
                     "indexes" : {
                         "data" : 21,
                         "gas" : 0,
@@ -187,7 +187,7 @@
                     }
                 },
                 {
-                    "hash" : "5a9c68cc285e162d1f6be2c3c11f9f596eb9b8c4553cf5e78891e36ba6105693",
+                    "hash" : "0x5a9c68cc285e162d1f6be2c3c11f9f596eb9b8c4553cf5e78891e36ba6105693",
                     "indexes" : {
                         "data" : 22,
                         "gas" : 0,
@@ -195,7 +195,7 @@
                     }
                 },
                 {
-                    "hash" : "6305f7a45b00c1f6df42d4c661ab02a6fe5dcfcbb4c9fb6b01501a3268b3a3e3",
+                    "hash" : "0x6305f7a45b00c1f6df42d4c661ab02a6fe5dcfcbb4c9fb6b01501a3268b3a3e3",
                     "indexes" : {
                         "data" : 23,
                         "gas" : 0,
@@ -203,7 +203,7 @@
                     }
                 },
                 {
-                    "hash" : "681d22ffbe91204513b89fd163d340884136bcc70ec033215ff2261cfeb58f5d",
+                    "hash" : "0x681d22ffbe91204513b89fd163d340884136bcc70ec033215ff2261cfeb58f5d",
                     "indexes" : {
                         "data" : 24,
                         "gas" : 0,
@@ -211,7 +211,7 @@
                     }
                 },
                 {
-                    "hash" : "648bc9b0766e30e4e32c803cc3561b0f9bfd1d2125dee090c8b1fcae4309bc0e",
+                    "hash" : "0x648bc9b0766e30e4e32c803cc3561b0f9bfd1d2125dee090c8b1fcae4309bc0e",
                     "indexes" : {
                         "data" : 25,
                         "gas" : 0,
@@ -219,7 +219,7 @@
                     }
                 },
                 {
-                    "hash" : "2b12d08939ae556b58f000fff27482bfa03931b11641138454bbb120446d4afe",
+                    "hash" : "0x2b12d08939ae556b58f000fff27482bfa03931b11641138454bbb120446d4afe",
                     "indexes" : {
                         "data" : 26,
                         "gas" : 0,
@@ -227,7 +227,7 @@
                     }
                 },
                 {
-                    "hash" : "3abd3544b2d24b8a8cfae19154b815fed587c7b73cb9d2090cc11b3fa9737973",
+                    "hash" : "0x3abd3544b2d24b8a8cfae19154b815fed587c7b73cb9d2090cc11b3fa9737973",
                     "indexes" : {
                         "data" : 27,
                         "gas" : 0,
@@ -235,7 +235,7 @@
                     }
                 },
                 {
-                    "hash" : "3587f90e99f9cc771ae37629d52b1f445644f56447ed78f495c91a04fdb53fe9",
+                    "hash" : "0x3587f90e99f9cc771ae37629d52b1f445644f56447ed78f495c91a04fdb53fe9",
                     "indexes" : {
                         "data" : 28,
                         "gas" : 0,
@@ -243,7 +243,7 @@
                     }
                 },
                 {
-                    "hash" : "dba09b8526792fc05d21592acd03d8255aaf1288e89cb368850c8d3f160c4c67",
+                    "hash" : "0xdba09b8526792fc05d21592acd03d8255aaf1288e89cb368850c8d3f160c4c67",
                     "indexes" : {
                         "data" : 29,
                         "gas" : 0,
@@ -251,7 +251,7 @@
                     }
                 },
                 {
-                    "hash" : "13787302f3569c866fa165616e2cc042f269a2d207346647ca43d4d0c26968e5",
+                    "hash" : "0x13787302f3569c866fa165616e2cc042f269a2d207346647ca43d4d0c26968e5",
                     "indexes" : {
                         "data" : 30,
                         "gas" : 0,
@@ -261,7 +261,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "23dde05f6f8db9d966f4444d7ed60a67edaa2f0cf719706b4bbd2f01b396dc97",
+                    "hash" : "0x23dde05f6f8db9d966f4444d7ed60a67edaa2f0cf719706b4bbd2f01b396dc97",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -269,7 +269,7 @@
                     }
                 },
                 {
-                    "hash" : "d9ea2f9d61f3df9f9991a10f8e69197dca7be69d430208b7d4ad8417807171b0",
+                    "hash" : "0xd9ea2f9d61f3df9f9991a10f8e69197dca7be69d430208b7d4ad8417807171b0",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -277,7 +277,7 @@
                     }
                 },
                 {
-                    "hash" : "e304fd4ea5a8fc2271f372b260adc36ce48dd3800222f8837c10e77729b7d2d2",
+                    "hash" : "0xe304fd4ea5a8fc2271f372b260adc36ce48dd3800222f8837c10e77729b7d2d2",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -285,7 +285,7 @@
                     }
                 },
                 {
-                    "hash" : "69cd43963f23118b4ad6d96960c2c504840d7058773a451992df9a5fad1f7264",
+                    "hash" : "0x69cd43963f23118b4ad6d96960c2c504840d7058773a451992df9a5fad1f7264",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -293,7 +293,7 @@
                     }
                 },
                 {
-                    "hash" : "e5cc0e7eb12b59a9836635ec2a4ec39b2a95f58469d4ee66d2e76e356c5f6cdf",
+                    "hash" : "0xe5cc0e7eb12b59a9836635ec2a4ec39b2a95f58469d4ee66d2e76e356c5f6cdf",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 0,
@@ -301,7 +301,7 @@
                     }
                 },
                 {
-                    "hash" : "4330037d6f2082e11643d31f46be8d6b72465ccf8f589e67823158e3432be070",
+                    "hash" : "0x4330037d6f2082e11643d31f46be8d6b72465ccf8f589e67823158e3432be070",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 0,
@@ -309,7 +309,7 @@
                     }
                 },
                 {
-                    "hash" : "401275bc491763d1fbfbd9fcaee47f7ac3aac1f9207fb2d5cb114c9cb25286ed",
+                    "hash" : "0x401275bc491763d1fbfbd9fcaee47f7ac3aac1f9207fb2d5cb114c9cb25286ed",
                     "indexes" : {
                         "data" : 6,
                         "gas" : 0,
@@ -317,7 +317,7 @@
                     }
                 },
                 {
-                    "hash" : "9e3f9e7c9656eee7699ee692a6c301a5d9bcc5148f61bd0297786e6bf600cee8",
+                    "hash" : "0x9e3f9e7c9656eee7699ee692a6c301a5d9bcc5148f61bd0297786e6bf600cee8",
                     "indexes" : {
                         "data" : 7,
                         "gas" : 0,
@@ -325,7 +325,7 @@
                     }
                 },
                 {
-                    "hash" : "901aa1a59147292fd8253422a45c0e554fe87f39af409cf6979ce56e3d63b0dd",
+                    "hash" : "0x901aa1a59147292fd8253422a45c0e554fe87f39af409cf6979ce56e3d63b0dd",
                     "indexes" : {
                         "data" : 8,
                         "gas" : 0,
@@ -333,7 +333,7 @@
                     }
                 },
                 {
-                    "hash" : "6b9aba9ffcf809bbb9fa0c70affd5f6c46457a5c5cd77c30c4804d8bfd10692f",
+                    "hash" : "0x6b9aba9ffcf809bbb9fa0c70affd5f6c46457a5c5cd77c30c4804d8bfd10692f",
                     "indexes" : {
                         "data" : 9,
                         "gas" : 0,
@@ -341,7 +341,7 @@
                     }
                 },
                 {
-                    "hash" : "23966147ea3cca8997f235aaffe3b2b4e0cf6cff28cff7cefdb4bc67db157e2f",
+                    "hash" : "0x23966147ea3cca8997f235aaffe3b2b4e0cf6cff28cff7cefdb4bc67db157e2f",
                     "indexes" : {
                         "data" : 10,
                         "gas" : 0,
@@ -349,7 +349,7 @@
                     }
                 },
                 {
-                    "hash" : "1ce0ff63aac7caaf19dcad10d4fe88533cb384554723cd0864f0b4777ea32d96",
+                    "hash" : "0x1ce0ff63aac7caaf19dcad10d4fe88533cb384554723cd0864f0b4777ea32d96",
                     "indexes" : {
                         "data" : 11,
                         "gas" : 0,
@@ -357,7 +357,7 @@
                     }
                 },
                 {
-                    "hash" : "9dec73faa2fdcd98b3e9b9f4342f2ab4e79c759d803c8bee8b2d4df0f180189e",
+                    "hash" : "0x9dec73faa2fdcd98b3e9b9f4342f2ab4e79c759d803c8bee8b2d4df0f180189e",
                     "indexes" : {
                         "data" : 12,
                         "gas" : 0,
@@ -365,7 +365,7 @@
                     }
                 },
                 {
-                    "hash" : "2b8cdd925b650b6924200da8fc7b9c9e4580ae9974e7bce7f88c833b5245220e",
+                    "hash" : "0x2b8cdd925b650b6924200da8fc7b9c9e4580ae9974e7bce7f88c833b5245220e",
                     "indexes" : {
                         "data" : 13,
                         "gas" : 0,
@@ -373,7 +373,7 @@
                     }
                 },
                 {
-                    "hash" : "dabf1846d46073b9318ff9c7c1e0cbbc44e075dfdf42f944be041c21d8141a34",
+                    "hash" : "0xdabf1846d46073b9318ff9c7c1e0cbbc44e075dfdf42f944be041c21d8141a34",
                     "indexes" : {
                         "data" : 14,
                         "gas" : 0,
@@ -381,7 +381,7 @@
                     }
                 },
                 {
-                    "hash" : "3958aeefb61579f0ae737d5c07e6bcf7881288c8e1232bedd21dd8b2c15bbe64",
+                    "hash" : "0x3958aeefb61579f0ae737d5c07e6bcf7881288c8e1232bedd21dd8b2c15bbe64",
                     "indexes" : {
                         "data" : 15,
                         "gas" : 0,
@@ -389,7 +389,7 @@
                     }
                 },
                 {
-                    "hash" : "449c2d11973c9a1e66e8d942fd5845b600c60dde5fb7a040df3840d838005bdb",
+                    "hash" : "0x449c2d11973c9a1e66e8d942fd5845b600c60dde5fb7a040df3840d838005bdb",
                     "indexes" : {
                         "data" : 16,
                         "gas" : 0,
@@ -397,7 +397,7 @@
                     }
                 },
                 {
-                    "hash" : "3ea28b8364ae6c3af6b2e4ee8f149f945474834b94b35ddf801a22c2e97e574d",
+                    "hash" : "0x3ea28b8364ae6c3af6b2e4ee8f149f945474834b94b35ddf801a22c2e97e574d",
                     "indexes" : {
                         "data" : 17,
                         "gas" : 0,
@@ -405,7 +405,7 @@
                     }
                 },
                 {
-                    "hash" : "9da72a91d1660eb4592c0c26f6023a6e6899d2ec9d97016ed7a1fdbbcf008357",
+                    "hash" : "0x9da72a91d1660eb4592c0c26f6023a6e6899d2ec9d97016ed7a1fdbbcf008357",
                     "indexes" : {
                         "data" : 18,
                         "gas" : 0,
@@ -413,7 +413,7 @@
                     }
                 },
                 {
-                    "hash" : "eb50c19207750e7898adbe172795061cd490c766e4393ffc8ea6c0c6c69300da",
+                    "hash" : "0xeb50c19207750e7898adbe172795061cd490c766e4393ffc8ea6c0c6c69300da",
                     "indexes" : {
                         "data" : 19,
                         "gas" : 0,
@@ -421,7 +421,7 @@
                     }
                 },
                 {
-                    "hash" : "d4d6042ad13766f70208fcc0961e8446e853790fe1eb5504cb3241dae91ee7cd",
+                    "hash" : "0xd4d6042ad13766f70208fcc0961e8446e853790fe1eb5504cb3241dae91ee7cd",
                     "indexes" : {
                         "data" : 20,
                         "gas" : 0,
@@ -429,7 +429,7 @@
                     }
                 },
                 {
-                    "hash" : "025689ba9cd9154b08c72803dd12f7bc5fb06b103ec75139508a574aa0be5a46",
+                    "hash" : "0x025689ba9cd9154b08c72803dd12f7bc5fb06b103ec75139508a574aa0be5a46",
                     "indexes" : {
                         "data" : 21,
                         "gas" : 0,
@@ -437,7 +437,7 @@
                     }
                 },
                 {
-                    "hash" : "b776176993392f8b1437bd92183c696210aee8ae2bfcf1889bc5a3441b55852e",
+                    "hash" : "0xb776176993392f8b1437bd92183c696210aee8ae2bfcf1889bc5a3441b55852e",
                     "indexes" : {
                         "data" : 22,
                         "gas" : 0,
@@ -445,7 +445,7 @@
                     }
                 },
                 {
-                    "hash" : "197870ae1b3693d48ea477f961029ff3e570395a9211b68d873d15fb6ca1d796",
+                    "hash" : "0x197870ae1b3693d48ea477f961029ff3e570395a9211b68d873d15fb6ca1d796",
                     "indexes" : {
                         "data" : 23,
                         "gas" : 0,
@@ -453,7 +453,7 @@
                     }
                 },
                 {
-                    "hash" : "d83ffb7f1ad0cf6d1b0d4b26d83237ff099fd41a4eb4355ad9d610648271776d",
+                    "hash" : "0xd83ffb7f1ad0cf6d1b0d4b26d83237ff099fd41a4eb4355ad9d610648271776d",
                     "indexes" : {
                         "data" : 24,
                         "gas" : 0,
@@ -461,7 +461,7 @@
                     }
                 },
                 {
-                    "hash" : "98172dabd40334b238e30140c8f179a10c85b3c7958cddd79ffdbb9ef7a2187f",
+                    "hash" : "0x98172dabd40334b238e30140c8f179a10c85b3c7958cddd79ffdbb9ef7a2187f",
                     "indexes" : {
                         "data" : 25,
                         "gas" : 0,
@@ -469,7 +469,7 @@
                     }
                 },
                 {
-                    "hash" : "4c6dd1f16747d49c3884be14a4911e98d91dfcfe65529d6c5aa581e40e5e9fb5",
+                    "hash" : "0x4c6dd1f16747d49c3884be14a4911e98d91dfcfe65529d6c5aa581e40e5e9fb5",
                     "indexes" : {
                         "data" : 26,
                         "gas" : 0,
@@ -477,7 +477,7 @@
                     }
                 },
                 {
-                    "hash" : "ef12f66c725ebdd4fd3d9540d56c05965b92cd5626a9e9dc1585f0412060f2cf",
+                    "hash" : "0xef12f66c725ebdd4fd3d9540d56c05965b92cd5626a9e9dc1585f0412060f2cf",
                     "indexes" : {
                         "data" : 27,
                         "gas" : 0,
@@ -485,7 +485,7 @@
                     }
                 },
                 {
-                    "hash" : "ee0bb0accabecf0e71b0448549f25681241befe70a1e57f6f4d0e9fd48d22dd9",
+                    "hash" : "0xee0bb0accabecf0e71b0448549f25681241befe70a1e57f6f4d0e9fd48d22dd9",
                     "indexes" : {
                         "data" : 28,
                         "gas" : 0,
@@ -493,7 +493,7 @@
                     }
                 },
                 {
-                    "hash" : "91f59d7b8547ce9f900c62f24304a84cdc36fd31f9ae3cdd8fc4dd55254767d0",
+                    "hash" : "0x91f59d7b8547ce9f900c62f24304a84cdc36fd31f9ae3cdd8fc4dd55254767d0",
                     "indexes" : {
                         "data" : 29,
                         "gas" : 0,
@@ -501,7 +501,7 @@
                     }
                 },
                 {
-                    "hash" : "505e5c5d7cbdea634138c97f7d3b64a6c12e50b71d9f446ea1c0eb59a6779ad0",
+                    "hash" : "0x505e5c5d7cbdea634138c97f7d3b64a6c12e50b71d9f446ea1c0eb59a6779ad0",
                     "indexes" : {
                         "data" : 30,
                         "gas" : 0,
@@ -511,7 +511,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f45b1036273cd55fe990d8a1c33835a8efe6d3dc8e3f5ddf91b57a2b1fed7005",
+                    "hash" : "0xf45b1036273cd55fe990d8a1c33835a8efe6d3dc8e3f5ddf91b57a2b1fed7005",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -519,7 +519,7 @@
                     }
                 },
                 {
-                    "hash" : "9a70931a9b75e828056f28652d770c78d64991fbc3b8a991163b6d013dc9c0ce",
+                    "hash" : "0x9a70931a9b75e828056f28652d770c78d64991fbc3b8a991163b6d013dc9c0ce",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -527,7 +527,7 @@
                     }
                 },
                 {
-                    "hash" : "b96136ac908dcd97e94acbfbd3029ada7231daf9569e3cb683d21e89fb0193ee",
+                    "hash" : "0xb96136ac908dcd97e94acbfbd3029ada7231daf9569e3cb683d21e89fb0193ee",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -535,7 +535,7 @@
                     }
                 },
                 {
-                    "hash" : "fd275325a535e7d4ff3707e1447ad025cce89b23e7967e7a00b8e4f568041b84",
+                    "hash" : "0xfd275325a535e7d4ff3707e1447ad025cce89b23e7967e7a00b8e4f568041b84",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -543,7 +543,7 @@
                     }
                 },
                 {
-                    "hash" : "401ef50ba9af8d35913f582ea82cf55382d06d570406b5fbd612db0edf74e940",
+                    "hash" : "0x401ef50ba9af8d35913f582ea82cf55382d06d570406b5fbd612db0edf74e940",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 0,
@@ -551,7 +551,7 @@
                     }
                 },
                 {
-                    "hash" : "413dadfa3f0294c39d7828b316b6b2be635dafbdfa6a45370b49b3006dd25f07",
+                    "hash" : "0x413dadfa3f0294c39d7828b316b6b2be635dafbdfa6a45370b49b3006dd25f07",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 0,
@@ -559,7 +559,7 @@
                     }
                 },
                 {
-                    "hash" : "3c5a70d025fd8bf7cebef61c8c68f7e576e6d90681612a5d05e3543c9e8b6b35",
+                    "hash" : "0x3c5a70d025fd8bf7cebef61c8c68f7e576e6d90681612a5d05e3543c9e8b6b35",
                     "indexes" : {
                         "data" : 6,
                         "gas" : 0,
@@ -567,7 +567,7 @@
                     }
                 },
                 {
-                    "hash" : "7cd2307b72542b993819c097f953e216b2aeceb53d6f926c34f82a8b53418f5a",
+                    "hash" : "0x7cd2307b72542b993819c097f953e216b2aeceb53d6f926c34f82a8b53418f5a",
                     "indexes" : {
                         "data" : 7,
                         "gas" : 0,
@@ -575,7 +575,7 @@
                     }
                 },
                 {
-                    "hash" : "493e97513e9c1d763eb49e88f7bb1fc52441c6d7e31f34568c80b093174e4a7f",
+                    "hash" : "0x493e97513e9c1d763eb49e88f7bb1fc52441c6d7e31f34568c80b093174e4a7f",
                     "indexes" : {
                         "data" : 8,
                         "gas" : 0,
@@ -583,7 +583,7 @@
                     }
                 },
                 {
-                    "hash" : "830354788295b2059f254274ee0e19d4a59e8002e3d5be1f56e12830d8db47b9",
+                    "hash" : "0x830354788295b2059f254274ee0e19d4a59e8002e3d5be1f56e12830d8db47b9",
                     "indexes" : {
                         "data" : 9,
                         "gas" : 0,
@@ -591,7 +591,7 @@
                     }
                 },
                 {
-                    "hash" : "1b6f5a0e436b7f5472bd104158d0a3a8aca0d0e07c7f6e9d440c3b03cd8f6eb1",
+                    "hash" : "0x1b6f5a0e436b7f5472bd104158d0a3a8aca0d0e07c7f6e9d440c3b03cd8f6eb1",
                     "indexes" : {
                         "data" : 10,
                         "gas" : 0,
@@ -599,7 +599,7 @@
                     }
                 },
                 {
-                    "hash" : "7830ff2362b44858cef90305f2a8ee26377ffd6ae7066e92b1a6781b445455be",
+                    "hash" : "0x7830ff2362b44858cef90305f2a8ee26377ffd6ae7066e92b1a6781b445455be",
                     "indexes" : {
                         "data" : 11,
                         "gas" : 0,
@@ -607,7 +607,7 @@
                     }
                 },
                 {
-                    "hash" : "fd13f82146bcf4e711ad2361bd3af2315c1811905a2e7c7962caa918195f8e3f",
+                    "hash" : "0xfd13f82146bcf4e711ad2361bd3af2315c1811905a2e7c7962caa918195f8e3f",
                     "indexes" : {
                         "data" : 12,
                         "gas" : 0,
@@ -615,7 +615,7 @@
                     }
                 },
                 {
-                    "hash" : "7447d9d225936bb923490a99f2ed2bca4bc62138516423ef815072b9948d35a2",
+                    "hash" : "0x7447d9d225936bb923490a99f2ed2bca4bc62138516423ef815072b9948d35a2",
                     "indexes" : {
                         "data" : 13,
                         "gas" : 0,
@@ -623,7 +623,7 @@
                     }
                 },
                 {
-                    "hash" : "7c0c34071f5601c14862e4f36f25b1c3d34b0e6ad948a63a565834aacd9396f1",
+                    "hash" : "0x7c0c34071f5601c14862e4f36f25b1c3d34b0e6ad948a63a565834aacd9396f1",
                     "indexes" : {
                         "data" : 14,
                         "gas" : 0,
@@ -631,7 +631,7 @@
                     }
                 },
                 {
-                    "hash" : "5db6257825078c543e64e9c05284ab8b70bb29e3650c955f10d3b62b444c8e3d",
+                    "hash" : "0x5db6257825078c543e64e9c05284ab8b70bb29e3650c955f10d3b62b444c8e3d",
                     "indexes" : {
                         "data" : 15,
                         "gas" : 0,
@@ -639,7 +639,7 @@
                     }
                 },
                 {
-                    "hash" : "669733e200f26c94423c0a338e4374cba306a4af80dce17740cdcf21e794f31e",
+                    "hash" : "0x669733e200f26c94423c0a338e4374cba306a4af80dce17740cdcf21e794f31e",
                     "indexes" : {
                         "data" : 16,
                         "gas" : 0,
@@ -647,7 +647,7 @@
                     }
                 },
                 {
-                    "hash" : "5a1ce25e968ee24bb2ad9acf8b33c89652e5b1a14424759363b84af2e672d6fc",
+                    "hash" : "0x5a1ce25e968ee24bb2ad9acf8b33c89652e5b1a14424759363b84af2e672d6fc",
                     "indexes" : {
                         "data" : 17,
                         "gas" : 0,
@@ -655,7 +655,7 @@
                     }
                 },
                 {
-                    "hash" : "af00ded5ba93a5ecc7c745337f79d792897360836afe4ebbfe773590b37156c9",
+                    "hash" : "0xaf00ded5ba93a5ecc7c745337f79d792897360836afe4ebbfe773590b37156c9",
                     "indexes" : {
                         "data" : 18,
                         "gas" : 0,
@@ -663,7 +663,7 @@
                     }
                 },
                 {
-                    "hash" : "e3776a658c14db84ba762fd918273b0d46c3b8ab4f85b17f9418c234f02ab783",
+                    "hash" : "0xe3776a658c14db84ba762fd918273b0d46c3b8ab4f85b17f9418c234f02ab783",
                     "indexes" : {
                         "data" : 19,
                         "gas" : 0,
@@ -671,7 +671,7 @@
                     }
                 },
                 {
-                    "hash" : "c1c667758d2d37802cc3b7ec075194f408ddd83b0f763661053257624d3954ba",
+                    "hash" : "0xc1c667758d2d37802cc3b7ec075194f408ddd83b0f763661053257624d3954ba",
                     "indexes" : {
                         "data" : 20,
                         "gas" : 0,
@@ -679,7 +679,7 @@
                     }
                 },
                 {
-                    "hash" : "a1f857644e5bd80aa9eef3e7017808d4f0424614324af5729ae7af77327975e8",
+                    "hash" : "0xa1f857644e5bd80aa9eef3e7017808d4f0424614324af5729ae7af77327975e8",
                     "indexes" : {
                         "data" : 21,
                         "gas" : 0,
@@ -687,7 +687,7 @@
                     }
                 },
                 {
-                    "hash" : "8e554f92eb99b9e9be7e2eee0b7a769761ad3a1b36ca01c7d2c4e55942a41cbc",
+                    "hash" : "0x8e554f92eb99b9e9be7e2eee0b7a769761ad3a1b36ca01c7d2c4e55942a41cbc",
                     "indexes" : {
                         "data" : 22,
                         "gas" : 0,
@@ -695,7 +695,7 @@
                     }
                 },
                 {
-                    "hash" : "fb2b624e628c4145d151a9c7f8526775637050fe2cc5a5bf4bfd09560de5829c",
+                    "hash" : "0xfb2b624e628c4145d151a9c7f8526775637050fe2cc5a5bf4bfd09560de5829c",
                     "indexes" : {
                         "data" : 23,
                         "gas" : 0,
@@ -703,7 +703,7 @@
                     }
                 },
                 {
-                    "hash" : "1776ab91ade173a30f234ba2443c1dd35785c8143dbf504131968db6c66c5404",
+                    "hash" : "0x1776ab91ade173a30f234ba2443c1dd35785c8143dbf504131968db6c66c5404",
                     "indexes" : {
                         "data" : 24,
                         "gas" : 0,
@@ -711,7 +711,7 @@
                     }
                 },
                 {
-                    "hash" : "26f71293beb96629e7e7ba6a80d21cf731013c03b65a5f20e9eb9597cd0e399c",
+                    "hash" : "0x26f71293beb96629e7e7ba6a80d21cf731013c03b65a5f20e9eb9597cd0e399c",
                     "indexes" : {
                         "data" : 25,
                         "gas" : 0,
@@ -719,7 +719,7 @@
                     }
                 },
                 {
-                    "hash" : "5f8437a86fcd4d29a31cfb074463e65969550e25a02c7150115847cb41814d3a",
+                    "hash" : "0x5f8437a86fcd4d29a31cfb074463e65969550e25a02c7150115847cb41814d3a",
                     "indexes" : {
                         "data" : 26,
                         "gas" : 0,
@@ -727,7 +727,7 @@
                     }
                 },
                 {
-                    "hash" : "4db1d29b75812b5e6c002401aae1ead213ca8188fbe652e240b25b1164d9bf54",
+                    "hash" : "0x4db1d29b75812b5e6c002401aae1ead213ca8188fbe652e240b25b1164d9bf54",
                     "indexes" : {
                         "data" : 27,
                         "gas" : 0,
@@ -735,7 +735,7 @@
                     }
                 },
                 {
-                    "hash" : "6a5b5261a8a2d58e55cbc430ce9a417dab75fa529b4b80658ecba95590b0b1dc",
+                    "hash" : "0x6a5b5261a8a2d58e55cbc430ce9a417dab75fa529b4b80658ecba95590b0b1dc",
                     "indexes" : {
                         "data" : 28,
                         "gas" : 0,
@@ -743,7 +743,7 @@
                     }
                 },
                 {
-                    "hash" : "40a5b539f76c67ffd7c75dbcc0fc7b6d454e41734df2febef494e95912f9f1cc",
+                    "hash" : "0x40a5b539f76c67ffd7c75dbcc0fc7b6d454e41734df2febef494e95912f9f1cc",
                     "indexes" : {
                         "data" : 29,
                         "gas" : 0,
@@ -751,7 +751,7 @@
                     }
                 },
                 {
-                    "hash" : "1c8c5287e571f85b5aa820127b7fc8d6bc3b7cf09a35fd9cdcd1bd829656d538",
+                    "hash" : "0x1c8c5287e571f85b5aa820127b7fc8d6bc3b7cf09a35fd9cdcd1bd829656d538",
                     "indexes" : {
                         "data" : 30,
                         "gas" : 0,
@@ -761,7 +761,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "bf1405df919ed7d514847a11ee8b95951b5f7a8b411df27d8b3b611b2e3a6fd9",
+                    "hash" : "0xbf1405df919ed7d514847a11ee8b95951b5f7a8b411df27d8b3b611b2e3a6fd9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -769,7 +769,7 @@
                     }
                 },
                 {
-                    "hash" : "bdcdcf07de8b1036d075be0268ec2f6117b6677603ef0813d082a2fb5ad15c7e",
+                    "hash" : "0xbdcdcf07de8b1036d075be0268ec2f6117b6677603ef0813d082a2fb5ad15c7e",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -777,7 +777,7 @@
                     }
                 },
                 {
-                    "hash" : "d65bfea970605ead491689ef2c5906d60bbf535e0dca68d582d2dc24d640ef9d",
+                    "hash" : "0xd65bfea970605ead491689ef2c5906d60bbf535e0dca68d582d2dc24d640ef9d",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -785,7 +785,7 @@
                     }
                 },
                 {
-                    "hash" : "715a02acbc04f7fe09351b2dc5ae0d4a27e36c10e91bf5303c7da24a8ed4d529",
+                    "hash" : "0x715a02acbc04f7fe09351b2dc5ae0d4a27e36c10e91bf5303c7da24a8ed4d529",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -793,7 +793,7 @@
                     }
                 },
                 {
-                    "hash" : "bb1115cb61504a1b65b7f737641fceb36f3da90adbf6b32badb673f68fc749cc",
+                    "hash" : "0xbb1115cb61504a1b65b7f737641fceb36f3da90adbf6b32badb673f68fc749cc",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 0,
@@ -801,7 +801,7 @@
                     }
                 },
                 {
-                    "hash" : "c09bbbd6baf5f093ace63caa472c15d9492e53fb2b3143516d3ebe2fe20b9e52",
+                    "hash" : "0xc09bbbd6baf5f093ace63caa472c15d9492e53fb2b3143516d3ebe2fe20b9e52",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 0,
@@ -809,7 +809,7 @@
                     }
                 },
                 {
-                    "hash" : "645e11b8d71bf0ebd4cfc05a51bd90d8999bf115ea1bf70009316f17a176db00",
+                    "hash" : "0x645e11b8d71bf0ebd4cfc05a51bd90d8999bf115ea1bf70009316f17a176db00",
                     "indexes" : {
                         "data" : 6,
                         "gas" : 0,
@@ -817,7 +817,7 @@
                     }
                 },
                 {
-                    "hash" : "9be0e2e78c7294c478a48ebdd660fcfb341897cab0913618c1241d2932b61fb9",
+                    "hash" : "0x9be0e2e78c7294c478a48ebdd660fcfb341897cab0913618c1241d2932b61fb9",
                     "indexes" : {
                         "data" : 7,
                         "gas" : 0,
@@ -825,7 +825,7 @@
                     }
                 },
                 {
-                    "hash" : "d2b05a98f54cdc50aad09815c30e5813fe91ce77604d448386674081d2790c1e",
+                    "hash" : "0xd2b05a98f54cdc50aad09815c30e5813fe91ce77604d448386674081d2790c1e",
                     "indexes" : {
                         "data" : 8,
                         "gas" : 0,
@@ -833,7 +833,7 @@
                     }
                 },
                 {
-                    "hash" : "108fbf9cb20159471af96a0941ab0fbec888bf9b9fee2d5fd22af95d1a42a33f",
+                    "hash" : "0x108fbf9cb20159471af96a0941ab0fbec888bf9b9fee2d5fd22af95d1a42a33f",
                     "indexes" : {
                         "data" : 9,
                         "gas" : 0,
@@ -841,7 +841,7 @@
                     }
                 },
                 {
-                    "hash" : "cbb524333ead216bbd5c7f18a790eb2faf652eb90d23d9915c22f0b383cf22ea",
+                    "hash" : "0xcbb524333ead216bbd5c7f18a790eb2faf652eb90d23d9915c22f0b383cf22ea",
                     "indexes" : {
                         "data" : 10,
                         "gas" : 0,
@@ -849,7 +849,7 @@
                     }
                 },
                 {
-                    "hash" : "e41298d79e1052889d38b7dddc1dbee17484d08475f37d413c85c42fb191c913",
+                    "hash" : "0xe41298d79e1052889d38b7dddc1dbee17484d08475f37d413c85c42fb191c913",
                     "indexes" : {
                         "data" : 11,
                         "gas" : 0,
@@ -857,7 +857,7 @@
                     }
                 },
                 {
-                    "hash" : "d1aac4cbe74e83d359c851410eecc37cd0797f4470aa366f5e970382d1ae428f",
+                    "hash" : "0xd1aac4cbe74e83d359c851410eecc37cd0797f4470aa366f5e970382d1ae428f",
                     "indexes" : {
                         "data" : 12,
                         "gas" : 0,
@@ -865,7 +865,7 @@
                     }
                 },
                 {
-                    "hash" : "2c18dcdcbedf1a9828a6bed5bc160ad2b96d67562d7b1cdca2d63cacd912bd5e",
+                    "hash" : "0x2c18dcdcbedf1a9828a6bed5bc160ad2b96d67562d7b1cdca2d63cacd912bd5e",
                     "indexes" : {
                         "data" : 13,
                         "gas" : 0,
@@ -873,7 +873,7 @@
                     }
                 },
                 {
-                    "hash" : "584153ac0e3c3dfa1cbd6167f498b7367133ad70c8639f25675d96ed99ebb004",
+                    "hash" : "0x584153ac0e3c3dfa1cbd6167f498b7367133ad70c8639f25675d96ed99ebb004",
                     "indexes" : {
                         "data" : 14,
                         "gas" : 0,
@@ -881,7 +881,7 @@
                     }
                 },
                 {
-                    "hash" : "88edb1df1412003f5a9324a63851f67db1675f2b17c462f7882f3a86a03ebaf4",
+                    "hash" : "0x88edb1df1412003f5a9324a63851f67db1675f2b17c462f7882f3a86a03ebaf4",
                     "indexes" : {
                         "data" : 15,
                         "gas" : 0,
@@ -889,7 +889,7 @@
                     }
                 },
                 {
-                    "hash" : "60ccecc75984daef8d67a45a3d6e4a231277dafdc6c24e023a6f6fdc98e446a2",
+                    "hash" : "0x60ccecc75984daef8d67a45a3d6e4a231277dafdc6c24e023a6f6fdc98e446a2",
                     "indexes" : {
                         "data" : 16,
                         "gas" : 0,
@@ -897,7 +897,7 @@
                     }
                 },
                 {
-                    "hash" : "58e1af36ab8e38412b37db6b823265c3c3f6c632bdd4b06966bd4ed15f7e9958",
+                    "hash" : "0x58e1af36ab8e38412b37db6b823265c3c3f6c632bdd4b06966bd4ed15f7e9958",
                     "indexes" : {
                         "data" : 17,
                         "gas" : 0,
@@ -905,7 +905,7 @@
                     }
                 },
                 {
-                    "hash" : "525b960811b6545f6ffa59fc0ea7d7a73bede82a32aa3b820e64fe20c7de0dde",
+                    "hash" : "0x525b960811b6545f6ffa59fc0ea7d7a73bede82a32aa3b820e64fe20c7de0dde",
                     "indexes" : {
                         "data" : 18,
                         "gas" : 0,
@@ -913,7 +913,7 @@
                     }
                 },
                 {
-                    "hash" : "e5d9c8369ef3fa22cc2a6f18e1765b15d8160bbdf90765f74586bbd65c3ab279",
+                    "hash" : "0xe5d9c8369ef3fa22cc2a6f18e1765b15d8160bbdf90765f74586bbd65c3ab279",
                     "indexes" : {
                         "data" : 19,
                         "gas" : 0,
@@ -921,7 +921,7 @@
                     }
                 },
                 {
-                    "hash" : "3461352964007b94ed71836d2a5c1f44f64104a26d7e2061f5291745be4f6b0f",
+                    "hash" : "0x3461352964007b94ed71836d2a5c1f44f64104a26d7e2061f5291745be4f6b0f",
                     "indexes" : {
                         "data" : 20,
                         "gas" : 0,
@@ -929,7 +929,7 @@
                     }
                 },
                 {
-                    "hash" : "ee3dea6f5f70c97a9b7fd2ec9cf70ea55a964de8bb04c94c22402be0b2ee72f7",
+                    "hash" : "0xee3dea6f5f70c97a9b7fd2ec9cf70ea55a964de8bb04c94c22402be0b2ee72f7",
                     "indexes" : {
                         "data" : 21,
                         "gas" : 0,
@@ -937,7 +937,7 @@
                     }
                 },
                 {
-                    "hash" : "5a9c68cc285e162d1f6be2c3c11f9f596eb9b8c4553cf5e78891e36ba6105693",
+                    "hash" : "0x5a9c68cc285e162d1f6be2c3c11f9f596eb9b8c4553cf5e78891e36ba6105693",
                     "indexes" : {
                         "data" : 22,
                         "gas" : 0,
@@ -945,7 +945,7 @@
                     }
                 },
                 {
-                    "hash" : "6305f7a45b00c1f6df42d4c661ab02a6fe5dcfcbb4c9fb6b01501a3268b3a3e3",
+                    "hash" : "0x6305f7a45b00c1f6df42d4c661ab02a6fe5dcfcbb4c9fb6b01501a3268b3a3e3",
                     "indexes" : {
                         "data" : 23,
                         "gas" : 0,
@@ -953,7 +953,7 @@
                     }
                 },
                 {
-                    "hash" : "681d22ffbe91204513b89fd163d340884136bcc70ec033215ff2261cfeb58f5d",
+                    "hash" : "0x681d22ffbe91204513b89fd163d340884136bcc70ec033215ff2261cfeb58f5d",
                     "indexes" : {
                         "data" : 24,
                         "gas" : 0,
@@ -961,7 +961,7 @@
                     }
                 },
                 {
-                    "hash" : "648bc9b0766e30e4e32c803cc3561b0f9bfd1d2125dee090c8b1fcae4309bc0e",
+                    "hash" : "0x648bc9b0766e30e4e32c803cc3561b0f9bfd1d2125dee090c8b1fcae4309bc0e",
                     "indexes" : {
                         "data" : 25,
                         "gas" : 0,
@@ -969,7 +969,7 @@
                     }
                 },
                 {
-                    "hash" : "2b12d08939ae556b58f000fff27482bfa03931b11641138454bbb120446d4afe",
+                    "hash" : "0x2b12d08939ae556b58f000fff27482bfa03931b11641138454bbb120446d4afe",
                     "indexes" : {
                         "data" : 26,
                         "gas" : 0,
@@ -977,7 +977,7 @@
                     }
                 },
                 {
-                    "hash" : "3abd3544b2d24b8a8cfae19154b815fed587c7b73cb9d2090cc11b3fa9737973",
+                    "hash" : "0x3abd3544b2d24b8a8cfae19154b815fed587c7b73cb9d2090cc11b3fa9737973",
                     "indexes" : {
                         "data" : 27,
                         "gas" : 0,
@@ -985,7 +985,7 @@
                     }
                 },
                 {
-                    "hash" : "3587f90e99f9cc771ae37629d52b1f445644f56447ed78f495c91a04fdb53fe9",
+                    "hash" : "0x3587f90e99f9cc771ae37629d52b1f445644f56447ed78f495c91a04fdb53fe9",
                     "indexes" : {
                         "data" : 28,
                         "gas" : 0,
@@ -993,7 +993,7 @@
                     }
                 },
                 {
-                    "hash" : "dba09b8526792fc05d21592acd03d8255aaf1288e89cb368850c8d3f160c4c67",
+                    "hash" : "0xdba09b8526792fc05d21592acd03d8255aaf1288e89cb368850c8d3f160c4c67",
                     "indexes" : {
                         "data" : 29,
                         "gas" : 0,
@@ -1001,7 +1001,7 @@
                     }
                 },
                 {
-                    "hash" : "13787302f3569c866fa165616e2cc042f269a2d207346647ca43d4d0c26968e5",
+                    "hash" : "0x13787302f3569c866fa165616e2cc042f269a2d207346647ca43d4d0c26968e5",
                     "indexes" : {
                         "data" : 30,
                         "gas" : 0,
@@ -1011,7 +1011,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "23dde05f6f8db9d966f4444d7ed60a67edaa2f0cf719706b4bbd2f01b396dc97",
+                    "hash" : "0x23dde05f6f8db9d966f4444d7ed60a67edaa2f0cf719706b4bbd2f01b396dc97",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -1019,7 +1019,7 @@
                     }
                 },
                 {
-                    "hash" : "d9ea2f9d61f3df9f9991a10f8e69197dca7be69d430208b7d4ad8417807171b0",
+                    "hash" : "0xd9ea2f9d61f3df9f9991a10f8e69197dca7be69d430208b7d4ad8417807171b0",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -1027,7 +1027,7 @@
                     }
                 },
                 {
-                    "hash" : "e304fd4ea5a8fc2271f372b260adc36ce48dd3800222f8837c10e77729b7d2d2",
+                    "hash" : "0xe304fd4ea5a8fc2271f372b260adc36ce48dd3800222f8837c10e77729b7d2d2",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -1035,7 +1035,7 @@
                     }
                 },
                 {
-                    "hash" : "69cd43963f23118b4ad6d96960c2c504840d7058773a451992df9a5fad1f7264",
+                    "hash" : "0x69cd43963f23118b4ad6d96960c2c504840d7058773a451992df9a5fad1f7264",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -1043,7 +1043,7 @@
                     }
                 },
                 {
-                    "hash" : "e5cc0e7eb12b59a9836635ec2a4ec39b2a95f58469d4ee66d2e76e356c5f6cdf",
+                    "hash" : "0xe5cc0e7eb12b59a9836635ec2a4ec39b2a95f58469d4ee66d2e76e356c5f6cdf",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 0,
@@ -1051,7 +1051,7 @@
                     }
                 },
                 {
-                    "hash" : "4330037d6f2082e11643d31f46be8d6b72465ccf8f589e67823158e3432be070",
+                    "hash" : "0x4330037d6f2082e11643d31f46be8d6b72465ccf8f589e67823158e3432be070",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 0,
@@ -1059,7 +1059,7 @@
                     }
                 },
                 {
-                    "hash" : "401275bc491763d1fbfbd9fcaee47f7ac3aac1f9207fb2d5cb114c9cb25286ed",
+                    "hash" : "0x401275bc491763d1fbfbd9fcaee47f7ac3aac1f9207fb2d5cb114c9cb25286ed",
                     "indexes" : {
                         "data" : 6,
                         "gas" : 0,
@@ -1067,7 +1067,7 @@
                     }
                 },
                 {
-                    "hash" : "9e3f9e7c9656eee7699ee692a6c301a5d9bcc5148f61bd0297786e6bf600cee8",
+                    "hash" : "0x9e3f9e7c9656eee7699ee692a6c301a5d9bcc5148f61bd0297786e6bf600cee8",
                     "indexes" : {
                         "data" : 7,
                         "gas" : 0,
@@ -1075,7 +1075,7 @@
                     }
                 },
                 {
-                    "hash" : "901aa1a59147292fd8253422a45c0e554fe87f39af409cf6979ce56e3d63b0dd",
+                    "hash" : "0x901aa1a59147292fd8253422a45c0e554fe87f39af409cf6979ce56e3d63b0dd",
                     "indexes" : {
                         "data" : 8,
                         "gas" : 0,
@@ -1083,7 +1083,7 @@
                     }
                 },
                 {
-                    "hash" : "6b9aba9ffcf809bbb9fa0c70affd5f6c46457a5c5cd77c30c4804d8bfd10692f",
+                    "hash" : "0x6b9aba9ffcf809bbb9fa0c70affd5f6c46457a5c5cd77c30c4804d8bfd10692f",
                     "indexes" : {
                         "data" : 9,
                         "gas" : 0,
@@ -1091,7 +1091,7 @@
                     }
                 },
                 {
-                    "hash" : "23966147ea3cca8997f235aaffe3b2b4e0cf6cff28cff7cefdb4bc67db157e2f",
+                    "hash" : "0x23966147ea3cca8997f235aaffe3b2b4e0cf6cff28cff7cefdb4bc67db157e2f",
                     "indexes" : {
                         "data" : 10,
                         "gas" : 0,
@@ -1099,7 +1099,7 @@
                     }
                 },
                 {
-                    "hash" : "1ce0ff63aac7caaf19dcad10d4fe88533cb384554723cd0864f0b4777ea32d96",
+                    "hash" : "0x1ce0ff63aac7caaf19dcad10d4fe88533cb384554723cd0864f0b4777ea32d96",
                     "indexes" : {
                         "data" : 11,
                         "gas" : 0,
@@ -1107,7 +1107,7 @@
                     }
                 },
                 {
-                    "hash" : "9dec73faa2fdcd98b3e9b9f4342f2ab4e79c759d803c8bee8b2d4df0f180189e",
+                    "hash" : "0x9dec73faa2fdcd98b3e9b9f4342f2ab4e79c759d803c8bee8b2d4df0f180189e",
                     "indexes" : {
                         "data" : 12,
                         "gas" : 0,
@@ -1115,7 +1115,7 @@
                     }
                 },
                 {
-                    "hash" : "2b8cdd925b650b6924200da8fc7b9c9e4580ae9974e7bce7f88c833b5245220e",
+                    "hash" : "0x2b8cdd925b650b6924200da8fc7b9c9e4580ae9974e7bce7f88c833b5245220e",
                     "indexes" : {
                         "data" : 13,
                         "gas" : 0,
@@ -1123,7 +1123,7 @@
                     }
                 },
                 {
-                    "hash" : "dabf1846d46073b9318ff9c7c1e0cbbc44e075dfdf42f944be041c21d8141a34",
+                    "hash" : "0xdabf1846d46073b9318ff9c7c1e0cbbc44e075dfdf42f944be041c21d8141a34",
                     "indexes" : {
                         "data" : 14,
                         "gas" : 0,
@@ -1131,7 +1131,7 @@
                     }
                 },
                 {
-                    "hash" : "3958aeefb61579f0ae737d5c07e6bcf7881288c8e1232bedd21dd8b2c15bbe64",
+                    "hash" : "0x3958aeefb61579f0ae737d5c07e6bcf7881288c8e1232bedd21dd8b2c15bbe64",
                     "indexes" : {
                         "data" : 15,
                         "gas" : 0,
@@ -1139,7 +1139,7 @@
                     }
                 },
                 {
-                    "hash" : "449c2d11973c9a1e66e8d942fd5845b600c60dde5fb7a040df3840d838005bdb",
+                    "hash" : "0x449c2d11973c9a1e66e8d942fd5845b600c60dde5fb7a040df3840d838005bdb",
                     "indexes" : {
                         "data" : 16,
                         "gas" : 0,
@@ -1147,7 +1147,7 @@
                     }
                 },
                 {
-                    "hash" : "3ea28b8364ae6c3af6b2e4ee8f149f945474834b94b35ddf801a22c2e97e574d",
+                    "hash" : "0x3ea28b8364ae6c3af6b2e4ee8f149f945474834b94b35ddf801a22c2e97e574d",
                     "indexes" : {
                         "data" : 17,
                         "gas" : 0,
@@ -1155,7 +1155,7 @@
                     }
                 },
                 {
-                    "hash" : "9da72a91d1660eb4592c0c26f6023a6e6899d2ec9d97016ed7a1fdbbcf008357",
+                    "hash" : "0x9da72a91d1660eb4592c0c26f6023a6e6899d2ec9d97016ed7a1fdbbcf008357",
                     "indexes" : {
                         "data" : 18,
                         "gas" : 0,
@@ -1163,7 +1163,7 @@
                     }
                 },
                 {
-                    "hash" : "eb50c19207750e7898adbe172795061cd490c766e4393ffc8ea6c0c6c69300da",
+                    "hash" : "0xeb50c19207750e7898adbe172795061cd490c766e4393ffc8ea6c0c6c69300da",
                     "indexes" : {
                         "data" : 19,
                         "gas" : 0,
@@ -1171,7 +1171,7 @@
                     }
                 },
                 {
-                    "hash" : "d4d6042ad13766f70208fcc0961e8446e853790fe1eb5504cb3241dae91ee7cd",
+                    "hash" : "0xd4d6042ad13766f70208fcc0961e8446e853790fe1eb5504cb3241dae91ee7cd",
                     "indexes" : {
                         "data" : 20,
                         "gas" : 0,
@@ -1179,7 +1179,7 @@
                     }
                 },
                 {
-                    "hash" : "025689ba9cd9154b08c72803dd12f7bc5fb06b103ec75139508a574aa0be5a46",
+                    "hash" : "0x025689ba9cd9154b08c72803dd12f7bc5fb06b103ec75139508a574aa0be5a46",
                     "indexes" : {
                         "data" : 21,
                         "gas" : 0,
@@ -1187,7 +1187,7 @@
                     }
                 },
                 {
-                    "hash" : "b776176993392f8b1437bd92183c696210aee8ae2bfcf1889bc5a3441b55852e",
+                    "hash" : "0xb776176993392f8b1437bd92183c696210aee8ae2bfcf1889bc5a3441b55852e",
                     "indexes" : {
                         "data" : 22,
                         "gas" : 0,
@@ -1195,7 +1195,7 @@
                     }
                 },
                 {
-                    "hash" : "197870ae1b3693d48ea477f961029ff3e570395a9211b68d873d15fb6ca1d796",
+                    "hash" : "0x197870ae1b3693d48ea477f961029ff3e570395a9211b68d873d15fb6ca1d796",
                     "indexes" : {
                         "data" : 23,
                         "gas" : 0,
@@ -1203,7 +1203,7 @@
                     }
                 },
                 {
-                    "hash" : "d83ffb7f1ad0cf6d1b0d4b26d83237ff099fd41a4eb4355ad9d610648271776d",
+                    "hash" : "0xd83ffb7f1ad0cf6d1b0d4b26d83237ff099fd41a4eb4355ad9d610648271776d",
                     "indexes" : {
                         "data" : 24,
                         "gas" : 0,
@@ -1211,7 +1211,7 @@
                     }
                 },
                 {
-                    "hash" : "98172dabd40334b238e30140c8f179a10c85b3c7958cddd79ffdbb9ef7a2187f",
+                    "hash" : "0x98172dabd40334b238e30140c8f179a10c85b3c7958cddd79ffdbb9ef7a2187f",
                     "indexes" : {
                         "data" : 25,
                         "gas" : 0,
@@ -1219,7 +1219,7 @@
                     }
                 },
                 {
-                    "hash" : "4c6dd1f16747d49c3884be14a4911e98d91dfcfe65529d6c5aa581e40e5e9fb5",
+                    "hash" : "0x4c6dd1f16747d49c3884be14a4911e98d91dfcfe65529d6c5aa581e40e5e9fb5",
                     "indexes" : {
                         "data" : 26,
                         "gas" : 0,
@@ -1227,7 +1227,7 @@
                     }
                 },
                 {
-                    "hash" : "ef12f66c725ebdd4fd3d9540d56c05965b92cd5626a9e9dc1585f0412060f2cf",
+                    "hash" : "0xef12f66c725ebdd4fd3d9540d56c05965b92cd5626a9e9dc1585f0412060f2cf",
                     "indexes" : {
                         "data" : 27,
                         "gas" : 0,
@@ -1235,7 +1235,7 @@
                     }
                 },
                 {
-                    "hash" : "ee0bb0accabecf0e71b0448549f25681241befe70a1e57f6f4d0e9fd48d22dd9",
+                    "hash" : "0xee0bb0accabecf0e71b0448549f25681241befe70a1e57f6f4d0e9fd48d22dd9",
                     "indexes" : {
                         "data" : 28,
                         "gas" : 0,
@@ -1243,7 +1243,7 @@
                     }
                 },
                 {
-                    "hash" : "91f59d7b8547ce9f900c62f24304a84cdc36fd31f9ae3cdd8fc4dd55254767d0",
+                    "hash" : "0x91f59d7b8547ce9f900c62f24304a84cdc36fd31f9ae3cdd8fc4dd55254767d0",
                     "indexes" : {
                         "data" : 29,
                         "gas" : 0,
@@ -1251,7 +1251,7 @@
                     }
                 },
                 {
-                    "hash" : "505e5c5d7cbdea634138c97f7d3b64a6c12e50b71d9f446ea1c0eb59a6779ad0",
+                    "hash" : "0x505e5c5d7cbdea634138c97f7d3b64a6c12e50b71d9f446ea1c0eb59a6779ad0",
                     "indexes" : {
                         "data" : 30,
                         "gas" : 0,
@@ -1261,16 +1261,16 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a5100000000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a5100000000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -1311,14 +1311,14 @@
                 "0x7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit" : [
-                "6000000"
+                "0x5b8d80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stStackTests/stackOverflowPUSH.json b/GeneralStateTests/stStackTests/stackOverflowPUSH.json
index 28ddbfe8b..da095b8ad 100644
--- a/GeneralStateTests/stStackTests/stackOverflowPUSH.json
+++ b/GeneralStateTests/stStackTests/stackOverflowPUSH.json
@@ -1,17 +1,17 @@
 {
     "stackOverflowPUSH" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -27,7 +27,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -35,7 +35,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -43,7 +43,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 0,
@@ -51,7 +51,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 0,
@@ -59,7 +59,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 6,
                         "gas" : 0,
@@ -67,7 +67,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 7,
                         "gas" : 0,
@@ -75,7 +75,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 8,
                         "gas" : 0,
@@ -83,7 +83,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 9,
                         "gas" : 0,
@@ -91,7 +91,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 10,
                         "gas" : 0,
@@ -99,7 +99,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 11,
                         "gas" : 0,
@@ -107,7 +107,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 12,
                         "gas" : 0,
@@ -115,7 +115,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 13,
                         "gas" : 0,
@@ -123,7 +123,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 14,
                         "gas" : 0,
@@ -131,7 +131,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 15,
                         "gas" : 0,
@@ -139,7 +139,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 16,
                         "gas" : 0,
@@ -147,7 +147,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 17,
                         "gas" : 0,
@@ -155,7 +155,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 18,
                         "gas" : 0,
@@ -163,7 +163,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 19,
                         "gas" : 0,
@@ -171,7 +171,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 20,
                         "gas" : 0,
@@ -179,7 +179,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 21,
                         "gas" : 0,
@@ -187,7 +187,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 22,
                         "gas" : 0,
@@ -195,7 +195,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 23,
                         "gas" : 0,
@@ -203,7 +203,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 24,
                         "gas" : 0,
@@ -211,7 +211,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 25,
                         "gas" : 0,
@@ -219,7 +219,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 26,
                         "gas" : 0,
@@ -227,7 +227,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 27,
                         "gas" : 0,
@@ -235,7 +235,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 28,
                         "gas" : 0,
@@ -243,7 +243,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 29,
                         "gas" : 0,
@@ -251,7 +251,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 30,
                         "gas" : 0,
@@ -261,7 +261,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -269,7 +269,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -277,7 +277,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -285,7 +285,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -293,7 +293,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 0,
@@ -301,7 +301,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 0,
@@ -309,7 +309,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 6,
                         "gas" : 0,
@@ -317,7 +317,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 7,
                         "gas" : 0,
@@ -325,7 +325,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 8,
                         "gas" : 0,
@@ -333,7 +333,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 9,
                         "gas" : 0,
@@ -341,7 +341,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 10,
                         "gas" : 0,
@@ -349,7 +349,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 11,
                         "gas" : 0,
@@ -357,7 +357,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 12,
                         "gas" : 0,
@@ -365,7 +365,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 13,
                         "gas" : 0,
@@ -373,7 +373,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 14,
                         "gas" : 0,
@@ -381,7 +381,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 15,
                         "gas" : 0,
@@ -389,7 +389,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 16,
                         "gas" : 0,
@@ -397,7 +397,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 17,
                         "gas" : 0,
@@ -405,7 +405,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 18,
                         "gas" : 0,
@@ -413,7 +413,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 19,
                         "gas" : 0,
@@ -421,7 +421,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 20,
                         "gas" : 0,
@@ -429,7 +429,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 21,
                         "gas" : 0,
@@ -437,7 +437,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 22,
                         "gas" : 0,
@@ -445,7 +445,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 23,
                         "gas" : 0,
@@ -453,7 +453,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 24,
                         "gas" : 0,
@@ -461,7 +461,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 25,
                         "gas" : 0,
@@ -469,7 +469,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 26,
                         "gas" : 0,
@@ -477,7 +477,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 27,
                         "gas" : 0,
@@ -485,7 +485,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 28,
                         "gas" : 0,
@@ -493,7 +493,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 29,
                         "gas" : 0,
@@ -501,7 +501,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 30,
                         "gas" : 0,
@@ -511,7 +511,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -519,7 +519,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -527,7 +527,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -535,7 +535,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -543,7 +543,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 0,
@@ -551,7 +551,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 0,
@@ -559,7 +559,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 6,
                         "gas" : 0,
@@ -567,7 +567,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 7,
                         "gas" : 0,
@@ -575,7 +575,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 8,
                         "gas" : 0,
@@ -583,7 +583,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 9,
                         "gas" : 0,
@@ -591,7 +591,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 10,
                         "gas" : 0,
@@ -599,7 +599,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 11,
                         "gas" : 0,
@@ -607,7 +607,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 12,
                         "gas" : 0,
@@ -615,7 +615,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 13,
                         "gas" : 0,
@@ -623,7 +623,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 14,
                         "gas" : 0,
@@ -631,7 +631,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 15,
                         "gas" : 0,
@@ -639,7 +639,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 16,
                         "gas" : 0,
@@ -647,7 +647,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 17,
                         "gas" : 0,
@@ -655,7 +655,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 18,
                         "gas" : 0,
@@ -663,7 +663,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 19,
                         "gas" : 0,
@@ -671,7 +671,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 20,
                         "gas" : 0,
@@ -679,7 +679,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 21,
                         "gas" : 0,
@@ -687,7 +687,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 22,
                         "gas" : 0,
@@ -695,7 +695,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 23,
                         "gas" : 0,
@@ -703,7 +703,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 24,
                         "gas" : 0,
@@ -711,7 +711,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 25,
                         "gas" : 0,
@@ -719,7 +719,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 26,
                         "gas" : 0,
@@ -727,7 +727,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 27,
                         "gas" : 0,
@@ -735,7 +735,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 28,
                         "gas" : 0,
@@ -743,7 +743,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 29,
                         "gas" : 0,
@@ -751,7 +751,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 30,
                         "gas" : 0,
@@ -761,7 +761,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -769,7 +769,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -777,7 +777,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -785,7 +785,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -793,7 +793,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 0,
@@ -801,7 +801,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 0,
@@ -809,7 +809,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 6,
                         "gas" : 0,
@@ -817,7 +817,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 7,
                         "gas" : 0,
@@ -825,7 +825,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 8,
                         "gas" : 0,
@@ -833,7 +833,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 9,
                         "gas" : 0,
@@ -841,7 +841,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 10,
                         "gas" : 0,
@@ -849,7 +849,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 11,
                         "gas" : 0,
@@ -857,7 +857,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 12,
                         "gas" : 0,
@@ -865,7 +865,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 13,
                         "gas" : 0,
@@ -873,7 +873,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 14,
                         "gas" : 0,
@@ -881,7 +881,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 15,
                         "gas" : 0,
@@ -889,7 +889,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 16,
                         "gas" : 0,
@@ -897,7 +897,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 17,
                         "gas" : 0,
@@ -905,7 +905,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 18,
                         "gas" : 0,
@@ -913,7 +913,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 19,
                         "gas" : 0,
@@ -921,7 +921,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 20,
                         "gas" : 0,
@@ -929,7 +929,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 21,
                         "gas" : 0,
@@ -937,7 +937,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 22,
                         "gas" : 0,
@@ -945,7 +945,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 23,
                         "gas" : 0,
@@ -953,7 +953,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 24,
                         "gas" : 0,
@@ -961,7 +961,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 25,
                         "gas" : 0,
@@ -969,7 +969,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 26,
                         "gas" : 0,
@@ -977,7 +977,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 27,
                         "gas" : 0,
@@ -985,7 +985,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 28,
                         "gas" : 0,
@@ -993,7 +993,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 29,
                         "gas" : 0,
@@ -1001,7 +1001,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 30,
                         "gas" : 0,
@@ -1011,7 +1011,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -1019,7 +1019,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -1027,7 +1027,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 2,
                         "gas" : 0,
@@ -1035,7 +1035,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 3,
                         "gas" : 0,
@@ -1043,7 +1043,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 4,
                         "gas" : 0,
@@ -1051,7 +1051,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 5,
                         "gas" : 0,
@@ -1059,7 +1059,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 6,
                         "gas" : 0,
@@ -1067,7 +1067,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 7,
                         "gas" : 0,
@@ -1075,7 +1075,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 8,
                         "gas" : 0,
@@ -1083,7 +1083,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 9,
                         "gas" : 0,
@@ -1091,7 +1091,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 10,
                         "gas" : 0,
@@ -1099,7 +1099,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 11,
                         "gas" : 0,
@@ -1107,7 +1107,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 12,
                         "gas" : 0,
@@ -1115,7 +1115,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 13,
                         "gas" : 0,
@@ -1123,7 +1123,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 14,
                         "gas" : 0,
@@ -1131,7 +1131,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 15,
                         "gas" : 0,
@@ -1139,7 +1139,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 16,
                         "gas" : 0,
@@ -1147,7 +1147,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 17,
                         "gas" : 0,
@@ -1155,7 +1155,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 18,
                         "gas" : 0,
@@ -1163,7 +1163,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 19,
                         "gas" : 0,
@@ -1171,7 +1171,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 20,
                         "gas" : 0,
@@ -1179,7 +1179,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 21,
                         "gas" : 0,
@@ -1187,7 +1187,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 22,
                         "gas" : 0,
@@ -1195,7 +1195,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 23,
                         "gas" : 0,
@@ -1203,7 +1203,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 24,
                         "gas" : 0,
@@ -1211,7 +1211,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 25,
                         "gas" : 0,
@@ -1219,7 +1219,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 26,
                         "gas" : 0,
@@ -1227,7 +1227,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 27,
                         "gas" : 0,
@@ -1235,7 +1235,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 28,
                         "gas" : 0,
@@ -1243,7 +1243,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 29,
                         "gas" : 0,
@@ -1251,7 +1251,7 @@
                     }
                 },
                 {
-                    "hash" : "aa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
+                    "hash" : "0xaa1e25b38e822cb4463ebb2b080509f57d3e7ce89d58d57cf6d3419725899d28",
                     "indexes" : {
                         "data" : 30,
                         "gas" : 0,
@@ -1261,16 +1261,16 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a5100000000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a5100000000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -1311,14 +1311,14 @@
                 "0x7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit" : [
-                "6000000"
+                "0x5b8d80"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/ABAcalls0.json b/GeneralStateTests/stSystemOperationsTest/ABAcalls0.json
index 2151e710c..3074e2380 100644
--- a/GeneralStateTests/stSystemOperationsTest/ABAcalls0.json
+++ b/GeneralStateTests/stSystemOperationsTest/ABAcalls0.json
@@ -1,17 +1,17 @@
 {
     "ABAcalls0" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "5796cb04ad6f6035a06b2d18a0e8dc887d88ef5e789184520abfdd054699edd1",
+                    "hash" : "0x5796cb04ad6f6035a06b2d18a0e8dc887d88ef5e789184520abfdd054699edd1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "5796cb04ad6f6035a06b2d18a0e8dc887d88ef5e789184520abfdd054699edd1",
+                    "hash" : "0x5796cb04ad6f6035a06b2d18a0e8dc887d88ef5e789184520abfdd054699edd1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "87367b5145ca4bda38bc61975ee9eade836743157861dcce20b65a73b4eecfb9",
+                    "hash" : "0x87367b5145ca4bda38bc61975ee9eade836743157861dcce20b65a73b4eecfb9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "87367b5145ca4bda38bc61975ee9eade836743157861dcce20b65a73b4eecfb9",
+                    "hash" : "0x87367b5145ca4bda38bc61975ee9eade836743157861dcce20b65a73b4eecfb9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "5796cb04ad6f6035a06b2d18a0e8dc887d88ef5e789184520abfdd054699edd1",
+                    "hash" : "0x5796cb04ad6f6035a06b2d18a0e8dc887d88ef5e789184520abfdd054699edd1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6000600060006000601873945304eb96065b2a98b57a48a06ae28d285a71b5620186a0f15855",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6000600060006000601773095e7baea6a6c7c4c2dfeb977efac326af552d8761c350f16001015855",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1000000"
+                "0x0f4240"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/ABAcalls1.json b/GeneralStateTests/stSystemOperationsTest/ABAcalls1.json
index 2f59c988f..f9eb127cb 100644
--- a/GeneralStateTests/stSystemOperationsTest/ABAcalls1.json
+++ b/GeneralStateTests/stSystemOperationsTest/ABAcalls1.json
@@ -1,17 +1,17 @@
 {
     "ABAcalls1" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x3b9aca00",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "51baf4bca305018889c0d025b7a4234a7cb8cd7735e9f08e218ef5fcc285b6e9",
+                    "hash" : "0x51baf4bca305018889c0d025b7a4234a7cb8cd7735e9f08e218ef5fcc285b6e9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "51baf4bca305018889c0d025b7a4234a7cb8cd7735e9f08e218ef5fcc285b6e9",
+                    "hash" : "0x51baf4bca305018889c0d025b7a4234a7cb8cd7735e9f08e218ef5fcc285b6e9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e8067df280ac7ed8735e56e774be8670df78ab00d2b8acba9c5dd6ae0d0dfe81",
+                    "hash" : "0xe8067df280ac7ed8735e56e774be8670df78ab00d2b8acba9c5dd6ae0d0dfe81",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e8067df280ac7ed8735e56e774be8670df78ab00d2b8acba9c5dd6ae0d0dfe81",
+                    "hash" : "0xe8067df280ac7ed8735e56e774be8670df78ab00d2b8acba9c5dd6ae0d0dfe81",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "51baf4bca305018889c0d025b7a4234a7cb8cd7735e9f08e218ef5fcc285b6e9",
+                    "hash" : "0x51baf4bca305018889c0d025b7a4234a7cb8cd7735e9f08e218ef5fcc285b6e9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6000600060006000601873945304eb96065b2a98b57a48a06ae28d285a71b5620186a05a03f15855",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6000600060006000601773095e7baea6a6c7c4c2dfeb977efac326af552d87620186a05a03f16001015855",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1000000000"
+                "0x3b9aca00"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/ABAcalls2.json b/GeneralStateTests/stSystemOperationsTest/ABAcalls2.json
index b69716ca0..12436c4cc 100644
--- a/GeneralStateTests/stSystemOperationsTest/ABAcalls2.json
+++ b/GeneralStateTests/stSystemOperationsTest/ABAcalls2.json
@@ -1,17 +1,17 @@
 {
     "ABAcalls2" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x3b9aca00",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a963ff4f5827ec055e38eef98962c7bad2360f6ffa3b3946e55ce73933774509",
+                    "hash" : "0xa963ff4f5827ec055e38eef98962c7bad2360f6ffa3b3946e55ce73933774509",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a963ff4f5827ec055e38eef98962c7bad2360f6ffa3b3946e55ce73933774509",
+                    "hash" : "0xa963ff4f5827ec055e38eef98962c7bad2360f6ffa3b3946e55ce73933774509",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "753cb4109def037eecfcb5c1812a6c92888f604e00f5bb117baee07633b958d5",
+                    "hash" : "0x753cb4109def037eecfcb5c1812a6c92888f604e00f5bb117baee07633b958d5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "753cb4109def037eecfcb5c1812a6c92888f604e00f5bb117baee07633b958d5",
+                    "hash" : "0x753cb4109def037eecfcb5c1812a6c92888f604e00f5bb117baee07633b958d5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a963ff4f5827ec055e38eef98962c7bad2360f6ffa3b3946e55ce73933774509",
+                    "hash" : "0xa963ff4f5827ec055e38eef98962c7bad2360f6ffa3b3946e55ce73933774509",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600054016000556000600060006000600173945304eb96065b2a98b57a48a06ae28d285a71b5620186a05a03f1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x00",
                 "code" : "0x6001600054016000556000600060006000600073095e7baea6a6c7c4c2dfeb977efac326af552d87620186a05a03f1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1000000000"
+                "0x3b9aca00"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/ABAcalls3.json b/GeneralStateTests/stSystemOperationsTest/ABAcalls3.json
index 5afe9b419..ae7dd82d3 100644
--- a/GeneralStateTests/stSystemOperationsTest/ABAcalls3.json
+++ b/GeneralStateTests/stSystemOperationsTest/ABAcalls3.json
@@ -1,17 +1,17 @@
 {
     "ABAcalls3" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "09e82844213a8def06f6229a225e914aec1c92627fbe8fcad05e919f704ce9d6",
+                    "hash" : "0x09e82844213a8def06f6229a225e914aec1c92627fbe8fcad05e919f704ce9d6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "09e82844213a8def06f6229a225e914aec1c92627fbe8fcad05e919f704ce9d6",
+                    "hash" : "0x09e82844213a8def06f6229a225e914aec1c92627fbe8fcad05e919f704ce9d6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "540614948e21200990b88bb4f3ad01403719fb790977421ac846c6f8de8e53f3",
+                    "hash" : "0x540614948e21200990b88bb4f3ad01403719fb790977421ac846c6f8de8e53f3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "540614948e21200990b88bb4f3ad01403719fb790977421ac846c6f8de8e53f3",
+                    "hash" : "0x540614948e21200990b88bb4f3ad01403719fb790977421ac846c6f8de8e53f3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "09e82844213a8def06f6229a225e914aec1c92627fbe8fcad05e919f704ce9d6",
+                    "hash" : "0x09e82844213a8def06f6229a225e914aec1c92627fbe8fcad05e919f704ce9d6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0fa3e8",
                 "code" : "0x6001600054016000556000600060006000600173945304eb96065b2a98b57a48a06ae28d285a71b5620186a05a03f1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x00",
                 "code" : "0x6001600054016000556000600060006000600073095e7baea6a6c7c4c2dfeb977efac326af552d87620186a05a03f1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "10000000"
+                "0x989680"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/ABAcallsSuicide0.json b/GeneralStateTests/stSystemOperationsTest/ABAcallsSuicide0.json
index 9768e105a..55ed535a4 100644
--- a/GeneralStateTests/stSystemOperationsTest/ABAcallsSuicide0.json
+++ b/GeneralStateTests/stSystemOperationsTest/ABAcallsSuicide0.json
@@ -1,17 +1,17 @@
 {
     "ABAcallsSuicide0" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "2e14eec7d1536948fe9178d51bd42473842e07642b282de14e84d8e557ec89a1",
+                    "hash" : "0x2e14eec7d1536948fe9178d51bd42473842e07642b282de14e84d8e557ec89a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "2e14eec7d1536948fe9178d51bd42473842e07642b282de14e84d8e557ec89a1",
+                    "hash" : "0x2e14eec7d1536948fe9178d51bd42473842e07642b282de14e84d8e557ec89a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6b0588ab878e51a66fe7b82d84b908718863d566750ceeb33970c29ed40cacab",
+                    "hash" : "0x6b0588ab878e51a66fe7b82d84b908718863d566750ceeb33970c29ed40cacab",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6b0588ab878e51a66fe7b82d84b908718863d566750ceeb33970c29ed40cacab",
+                    "hash" : "0x6b0588ab878e51a66fe7b82d84b908718863d566750ceeb33970c29ed40cacab",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "2e14eec7d1536948fe9178d51bd42473842e07642b282de14e84d8e557ec89a1",
+                    "hash" : "0x2e14eec7d1536948fe9178d51bd42473842e07642b282de14e84d8e557ec89a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6000600060006000601873945304eb96065b2a98b57a48a06ae28d285a71b5620186a0f1585573945304eb96065b2a98b57a48a06ae28d285a71b5ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6000600060006000601773095e7baea6a6c7c4c2dfeb977efac326af552d8761c350f16001015855",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "10000000"
+                "0x989680"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/ABAcallsSuicide1.json b/GeneralStateTests/stSystemOperationsTest/ABAcallsSuicide1.json
index 528156769..c014c713d 100644
--- a/GeneralStateTests/stSystemOperationsTest/ABAcallsSuicide1.json
+++ b/GeneralStateTests/stSystemOperationsTest/ABAcallsSuicide1.json
@@ -1,17 +1,17 @@
 {
     "ABAcallsSuicide1" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "be50a6f4e845efa14809756058b00ed7b483958a0eb621b52a828d5076677d02",
+                    "hash" : "0xbe50a6f4e845efa14809756058b00ed7b483958a0eb621b52a828d5076677d02",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "b28dd9adc2e2eca9b6f0d68bf2e50c0e06b58fbae1124fd98308a17c43b82481",
+                    "hash" : "0xb28dd9adc2e2eca9b6f0d68bf2e50c0e06b58fbae1124fd98308a17c43b82481",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -29,7 +29,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "be50a6f4e845efa14809756058b00ed7b483958a0eb621b52a828d5076677d02",
+                    "hash" : "0xbe50a6f4e845efa14809756058b00ed7b483958a0eb621b52a828d5076677d02",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -37,7 +37,7 @@
                     }
                 },
                 {
-                    "hash" : "b28dd9adc2e2eca9b6f0d68bf2e50c0e06b58fbae1124fd98308a17c43b82481",
+                    "hash" : "0xb28dd9adc2e2eca9b6f0d68bf2e50c0e06b58fbae1124fd98308a17c43b82481",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -47,7 +47,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "c6b0ac700c04e246da5a195f673a67d1a45e22559e7bba5f07e3cedf0aced222",
+                    "hash" : "0xc6b0ac700c04e246da5a195f673a67d1a45e22559e7bba5f07e3cedf0aced222",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -55,7 +55,7 @@
                     }
                 },
                 {
-                    "hash" : "f45819cae66ae9d55e4dec220d4e0a3bddf9205fbfe83026636f76b6f0ded04e",
+                    "hash" : "0xf45819cae66ae9d55e4dec220d4e0a3bddf9205fbfe83026636f76b6f0ded04e",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -65,7 +65,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c6b0ac700c04e246da5a195f673a67d1a45e22559e7bba5f07e3cedf0aced222",
+                    "hash" : "0xc6b0ac700c04e246da5a195f673a67d1a45e22559e7bba5f07e3cedf0aced222",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -73,7 +73,7 @@
                     }
                 },
                 {
-                    "hash" : "f45819cae66ae9d55e4dec220d4e0a3bddf9205fbfe83026636f76b6f0ded04e",
+                    "hash" : "0xf45819cae66ae9d55e4dec220d4e0a3bddf9205fbfe83026636f76b6f0ded04e",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -83,7 +83,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "be50a6f4e845efa14809756058b00ed7b483958a0eb621b52a828d5076677d02",
+                    "hash" : "0xbe50a6f4e845efa14809756058b00ed7b483958a0eb621b52a828d5076677d02",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -91,7 +91,7 @@
                     }
                 },
                 {
-                    "hash" : "b28dd9adc2e2eca9b6f0d68bf2e50c0e06b58fbae1124fd98308a17c43b82481",
+                    "hash" : "0xb28dd9adc2e2eca9b6f0d68bf2e50c0e06b58fbae1124fd98308a17c43b82481",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -101,23 +101,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6000356000526000600060206000601873945304eb96065b2a98b57a48a06ae28d285a71b5600035f15855",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6000356000526000600060206000601773095e7baea6a6c7c4c2dfeb977efac326af552d8761c35060003503f16001015855730f572e5295c57f15886f9b263e2f6d2d6c7b5ec6ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -129,14 +129,14 @@
                 "0x00000000000000000000000000000000000000000000000000000000000486a0"
             ],
             "gasLimit" : [
-                "10000000"
+                "0x989680"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/Call10.json b/GeneralStateTests/stSystemOperationsTest/Call10.json
index 3c1de6ba1..48a73dd3a 100644
--- a/GeneralStateTests/stSystemOperationsTest/Call10.json
+++ b/GeneralStateTests/stSystemOperationsTest/Call10.json
@@ -1,17 +1,17 @@
 {
     "Call10" : {
         "env" : {
-            "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "currentCoinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "026e5ea19dfeeff7685ce1be9a0cb9d7b5853e96dd7ea9b1d56f6ac4c627ae25",
+                    "hash" : "0x026e5ea19dfeeff7685ce1be9a0cb9d7b5853e96dd7ea9b1d56f6ac4c627ae25",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "026e5ea19dfeeff7685ce1be9a0cb9d7b5853e96dd7ea9b1d56f6ac4c627ae25",
+                    "hash" : "0x026e5ea19dfeeff7685ce1be9a0cb9d7b5853e96dd7ea9b1d56f6ac4c627ae25",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "19466b703b0b113fbbf2bb7a64bb86c8b79184d23c92030326c67b7c11cb14f3",
+                    "hash" : "0x19466b703b0b113fbbf2bb7a64bb86c8b79184d23c92030326c67b7c11cb14f3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "19466b703b0b113fbbf2bb7a64bb86c8b79184d23c92030326c67b7c11cb14f3",
+                    "hash" : "0x19466b703b0b113fbbf2bb7a64bb86c8b79184d23c92030326c67b7c11cb14f3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "026e5ea19dfeeff7685ce1be9a0cb9d7b5853e96dd7ea9b1d56f6ac4c627ae25",
+                    "hash" : "0x026e5ea19dfeeff7685ce1be9a0cb9d7b5853e96dd7ea9b1d56f6ac4c627ae25",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x03e8",
                 "code" : "0x5b600a60805110156042576000600061c3506000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff16000556001608051016080526000565b608051600155",
                 "nonce" : "0x00",
@@ -92,10 +92,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb0.json b/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb0.json
index bf5edba00..35c814e81 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb0.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb0.json
@@ -1,17 +1,17 @@
 {
     "CallRecursiveBomb0" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x02540be400",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "219bd65c25b94774d65430b0164c5df1be2981f9f763ca98c2b60da4054d5116",
+                    "hash" : "0x219bd65c25b94774d65430b0164c5df1be2981f9f763ca98c2b60da4054d5116",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "219bd65c25b94774d65430b0164c5df1be2981f9f763ca98c2b60da4054d5116",
+                    "hash" : "0x219bd65c25b94774d65430b0164c5df1be2981f9f763ca98c2b60da4054d5116",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3e652c292bfd5dd0681e75760d44c4252cf7afee71b0db1510fb7ffa170960f8",
+                    "hash" : "0x3e652c292bfd5dd0681e75760d44c4252cf7afee71b0db1510fb7ffa170960f8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3e652c292bfd5dd0681e75760d44c4252cf7afee71b0db1510fb7ffa170960f8",
+                    "hash" : "0x3e652c292bfd5dd0681e75760d44c4252cf7afee71b0db1510fb7ffa170960f8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "219bd65c25b94774d65430b0164c5df1be2981f9f763ca98c2b60da4054d5116",
+                    "hash" : "0x219bd65c25b94774d65430b0164c5df1be2981f9f763ca98c2b60da4054d5116",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x77359400",
                 "code" : "0x6000600060006000601773945304eb96065b2a98b57a48a06ae28d285a71b56305f5e100f1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600054016000556000600060006000600030612af85a03f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "10000000000"
+                "0x02540be400"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb0_OOG_atMaxCallDepth.json b/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb0_OOG_atMaxCallDepth.json
index a83627104..e45442257 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb0_OOG_atMaxCallDepth.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb0_OOG_atMaxCallDepth.json
@@ -1,17 +1,17 @@
 {
     "CallRecursiveBomb0_OOG_atMaxCallDepth" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x174876e800",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "fdd02999985c68e61b47f621f101fea9f2fea1c3408a4fb0a7bfa57d08e1f2e9",
+                    "hash" : "0xfdd02999985c68e61b47f621f101fea9f2fea1c3408a4fb0a7bfa57d08e1f2e9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "fdd02999985c68e61b47f621f101fea9f2fea1c3408a4fb0a7bfa57d08e1f2e9",
+                    "hash" : "0xfdd02999985c68e61b47f621f101fea9f2fea1c3408a4fb0a7bfa57d08e1f2e9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "8849583b8a73d4b6d08341d49aff6ed729855038bc446b3010a9b87837d5dbb2",
+                    "hash" : "0x8849583b8a73d4b6d08341d49aff6ed729855038bc446b3010a9b87837d5dbb2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "8849583b8a73d4b6d08341d49aff6ed729855038bc446b3010a9b87837d5dbb2",
+                    "hash" : "0x8849583b8a73d4b6d08341d49aff6ed729855038bc446b3010a9b87837d5dbb2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "fdd02999985c68e61b47f621f101fea9f2fea1c3408a4fb0a7bfa57d08e1f2e9",
+                    "hash" : "0xfdd02999985c68e61b47f621f101fea9f2fea1c3408a4fb0a7bfa57d08e1f2e9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x600160005401600055690fffffffffffffffffff610402600054040260025560006000690fffffffffffffffffff610402600054040260006000306104005a03f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "100000000000"
+                "0x174876e800"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb1.json b/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb1.json
index f101a2084..76c780a57 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb1.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb1.json
@@ -1,17 +1,17 @@
 {
     "CallRecursiveBomb1" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x05f5e100",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "37cef75527fc899040e0e54f6ae45468e7d7d5216f1fe687b125d08bfba10ec2",
+                    "hash" : "0x37cef75527fc899040e0e54f6ae45468e7d7d5216f1fe687b125d08bfba10ec2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "37cef75527fc899040e0e54f6ae45468e7d7d5216f1fe687b125d08bfba10ec2",
+                    "hash" : "0x37cef75527fc899040e0e54f6ae45468e7d7d5216f1fe687b125d08bfba10ec2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6bc13ccf0b46b1a59f08e3b1fe6f3d6699615e665c3cc91b54a59774c8fef6fb",
+                    "hash" : "0x6bc13ccf0b46b1a59f08e3b1fe6f3d6699615e665c3cc91b54a59774c8fef6fb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6bc13ccf0b46b1a59f08e3b1fe6f3d6699615e665c3cc91b54a59774c8fef6fb",
+                    "hash" : "0x6bc13ccf0b46b1a59f08e3b1fe6f3d6699615e665c3cc91b54a59774c8fef6fb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "37cef75527fc899040e0e54f6ae45468e7d7d5216f1fe687b125d08bfba10ec2",
+                    "hash" : "0x37cef75527fc899040e0e54f6ae45468e7d7d5216f1fe687b125d08bfba10ec2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x6001600054016000556000600060006000600030613a985a03f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "20622100"
+                "0x013aab14"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb2.json b/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb2.json
index ed805514f..1ce4c70fa 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb2.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb2.json
@@ -1,17 +1,17 @@
 {
     "CallRecursiveBomb2" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x05f5e100",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "37cef75527fc899040e0e54f6ae45468e7d7d5216f1fe687b125d08bfba10ec2",
+                    "hash" : "0x37cef75527fc899040e0e54f6ae45468e7d7d5216f1fe687b125d08bfba10ec2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "37cef75527fc899040e0e54f6ae45468e7d7d5216f1fe687b125d08bfba10ec2",
+                    "hash" : "0x37cef75527fc899040e0e54f6ae45468e7d7d5216f1fe687b125d08bfba10ec2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "39c4e8eb67a73086760ba36ff7d36b834b8c6d782cac9ddacf7db280b35b70df",
+                    "hash" : "0x39c4e8eb67a73086760ba36ff7d36b834b8c6d782cac9ddacf7db280b35b70df",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "39c4e8eb67a73086760ba36ff7d36b834b8c6d782cac9ddacf7db280b35b70df",
+                    "hash" : "0x39c4e8eb67a73086760ba36ff7d36b834b8c6d782cac9ddacf7db280b35b70df",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "37cef75527fc899040e0e54f6ae45468e7d7d5216f1fe687b125d08bfba10ec2",
+                    "hash" : "0x37cef75527fc899040e0e54f6ae45468e7d7d5216f1fe687b125d08bfba10ec2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x6001600054016000556000600060006000600030613a985a03f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "20622099"
+                "0x013aab13"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb3.json b/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb3.json
index 80d6dd554..bf2fa9bea 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb3.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb3.json
@@ -1,17 +1,17 @@
 {
     "CallRecursiveBomb3" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1e61fde6e363035616e868e9c0e6d60031924b2d4a7a6942b9cb71d453253322",
+                    "hash" : "0x1e61fde6e363035616e868e9c0e6d60031924b2d4a7a6942b9cb71d453253322",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "1e61fde6e363035616e868e9c0e6d60031924b2d4a7a6942b9cb71d453253322",
+                    "hash" : "0x1e61fde6e363035616e868e9c0e6d60031924b2d4a7a6942b9cb71d453253322",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "59a13349c9c49fff8c389ed3d19b476d5726a841cfe93f6d5f882cdfc97da07d",
+                    "hash" : "0x59a13349c9c49fff8c389ed3d19b476d5726a841cfe93f6d5f882cdfc97da07d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "59a13349c9c49fff8c389ed3d19b476d5726a841cfe93f6d5f882cdfc97da07d",
+                    "hash" : "0x59a13349c9c49fff8c389ed3d19b476d5726a841cfe93f6d5f882cdfc97da07d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "1e61fde6e363035616e868e9c0e6d60031924b2d4a7a6942b9cb71d453253322",
+                    "hash" : "0x1e61fde6e363035616e868e9c0e6d60031924b2d4a7a6942b9cb71d453253322",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x600160005401600055600060006000600060003060e05a03f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1000000"
+                "0x0f4240"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/CallRecursiveBombLog.json b/GeneralStateTests/stSystemOperationsTest/CallRecursiveBombLog.json
index 2c041921b..b14fbca3a 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallRecursiveBombLog.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallRecursiveBombLog.json
@@ -1,17 +1,17 @@
 {
     "CallRecursiveBombLog" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x02540be400",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "376d0956c6353512c7f5aa80a2016b6989bb797cb1b7e78639d0793ff3ce719e",
+                    "hash" : "0x376d0956c6353512c7f5aa80a2016b6989bb797cb1b7e78639d0793ff3ce719e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "376d0956c6353512c7f5aa80a2016b6989bb797cb1b7e78639d0793ff3ce719e",
+                    "hash" : "0x376d0956c6353512c7f5aa80a2016b6989bb797cb1b7e78639d0793ff3ce719e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "fa16ac1bac3f2e0d6bfdc7f8042a1aaa7389aa5ab6f374af1b6db2d0f376e51f",
+                    "hash" : "0xfa16ac1bac3f2e0d6bfdc7f8042a1aaa7389aa5ab6f374af1b6db2d0f376e51f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "fa16ac1bac3f2e0d6bfdc7f8042a1aaa7389aa5ab6f374af1b6db2d0f376e51f",
+                    "hash" : "0xfa16ac1bac3f2e0d6bfdc7f8042a1aaa7389aa5ab6f374af1b6db2d0f376e51f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "376d0956c6353512c7f5aa80a2016b6989bb797cb1b7e78639d0793ff3ce719e",
+                    "hash" : "0x376d0956c6353512c7f5aa80a2016b6989bb797cb1b7e78639d0793ff3ce719e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x6000600060006000601773945304eb96065b2a98b57a48a06ae28d285a71b56305f5e100f1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260206000a060016000540160005560006000600060006000306161a85a03f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "10000000000"
+                "0x02540be400"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/CallRecursiveBombLog2.json b/GeneralStateTests/stSystemOperationsTest/CallRecursiveBombLog2.json
index df94c1b22..c07e639b3 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallRecursiveBombLog2.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallRecursiveBombLog2.json
@@ -1,17 +1,17 @@
 {
     "CallRecursiveBombLog2" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x02540be400",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9a1219b89ffffc7167820ff79b5d947da2ad09313623197ea5149d1413c4660d",
+                    "hash" : "0x9a1219b89ffffc7167820ff79b5d947da2ad09313623197ea5149d1413c4660d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9a1219b89ffffc7167820ff79b5d947da2ad09313623197ea5149d1413c4660d",
+                    "hash" : "0x9a1219b89ffffc7167820ff79b5d947da2ad09313623197ea5149d1413c4660d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e43d7768f201c46d78540a2c3115175605c9dd120209930331d2b41244e69c30",
+                    "hash" : "0xe43d7768f201c46d78540a2c3115175605c9dd120209930331d2b41244e69c30",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e43d7768f201c46d78540a2c3115175605c9dd120209930331d2b41244e69c30",
+                    "hash" : "0xe43d7768f201c46d78540a2c3115175605c9dd120209930331d2b41244e69c30",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9a1219b89ffffc7167820ff79b5d947da2ad09313623197ea5149d1413c4660d",
+                    "hash" : "0x9a1219b89ffffc7167820ff79b5d947da2ad09313623197ea5149d1413c4660d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x6000600060006000601773945304eb96065b2a98b57a48a06ae28d285a71b56305f5e100f1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x5a60005260206000a060016000540160005560006000600060006000306161a85a03f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "10000000000"
+                "0x02540be400"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistrator0.json b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistrator0.json
index ffc3646e6..8421f64cc 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistrator0.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistrator0.json
@@ -1,17 +1,17 @@
 {
     "CallToNameRegistrator0" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b2a7123db510a0b001ef635da54f29a08ac85299238171be5b9f54abc1d970c1",
+                    "hash" : "0xb2a7123db510a0b001ef635da54f29a08ac85299238171be5b9f54abc1d970c1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b2a7123db510a0b001ef635da54f29a08ac85299238171be5b9f54abc1d970c1",
+                    "hash" : "0xb2a7123db510a0b001ef635da54f29a08ac85299238171be5b9f54abc1d970c1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "ce9a0abf5dcc1a842397982c00be7ac19df241d90fc4d353aa8a9f5f7db25ef4",
+                    "hash" : "0xce9a0abf5dcc1a842397982c00be7ac19df241d90fc4d353aa8a9f5f7db25ef4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ce9a0abf5dcc1a842397982c00be7ac19df241d90fc4d353aa8a9f5f7db25ef4",
+                    "hash" : "0xce9a0abf5dcc1a842397982c00be7ac19df241d90fc4d353aa8a9f5f7db25ef4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b2a7123db510a0b001ef635da54f29a08ac85299238171be5b9f54abc1d970c1",
+                    "hash" : "0xb2a7123db510a0b001ef635da54f29a08ac85299238171be5b9f54abc1d970c1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526000604060406000601773945304eb96065b2a98b57a48a06ae28d285a71b5620186a0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "300000"
+                "0x0493e0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorAddressTooBigLeft.json b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorAddressTooBigLeft.json
index e2f60dd43..172428821 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorAddressTooBigLeft.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorAddressTooBigLeft.json
@@ -1,17 +1,17 @@
 {
     "CallToNameRegistratorAddressTooBigLeft" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f20b4586ddad843f851a34d69a2b34dab11ca15ff8614822f87b6c24656fe85e",
+                    "hash" : "0xf20b4586ddad843f851a34d69a2b34dab11ca15ff8614822f87b6c24656fe85e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f20b4586ddad843f851a34d69a2b34dab11ca15ff8614822f87b6c24656fe85e",
+                    "hash" : "0xf20b4586ddad843f851a34d69a2b34dab11ca15ff8614822f87b6c24656fe85e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4caf17de3d39b4c9cf02ce6d9d4345775b2a7ba7c1d80e346bf1cec5f3673f52",
+                    "hash" : "0x4caf17de3d39b4c9cf02ce6d9d4345775b2a7ba7c1d80e346bf1cec5f3673f52",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4caf17de3d39b4c9cf02ce6d9d4345775b2a7ba7c1d80e346bf1cec5f3673f52",
+                    "hash" : "0x4caf17de3d39b4c9cf02ce6d9d4345775b2a7ba7c1d80e346bf1cec5f3673f52",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f20b4586ddad843f851a34d69a2b34dab11ca15ff8614822f87b6c24656fe85e",
+                    "hash" : "0xf20b4586ddad843f851a34d69a2b34dab11ca15ff8614822f87b6c24656fe85e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526000604060406000601774aa945304eb96065b2a98b57a48a06ae28d285a71b56103e8f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "300000"
+                "0x0493e0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorAddressTooBigRight.json b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorAddressTooBigRight.json
index 8875ece09..e8d2d70a7 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorAddressTooBigRight.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorAddressTooBigRight.json
@@ -1,17 +1,17 @@
 {
     "CallToNameRegistratorAddressTooBigRight" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e1600f478012c6e0fa7ce6c3d0e9eccee0863844281254ddd18288bbb7e4cc3e",
+                    "hash" : "0xe1600f478012c6e0fa7ce6c3d0e9eccee0863844281254ddd18288bbb7e4cc3e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e1600f478012c6e0fa7ce6c3d0e9eccee0863844281254ddd18288bbb7e4cc3e",
+                    "hash" : "0xe1600f478012c6e0fa7ce6c3d0e9eccee0863844281254ddd18288bbb7e4cc3e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3755afff282738f4c79362abf2900f9c9e06ac6607a3f87f80fcf9c0ea598559",
+                    "hash" : "0x3755afff282738f4c79362abf2900f9c9e06ac6607a3f87f80fcf9c0ea598559",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3755afff282738f4c79362abf2900f9c9e06ac6607a3f87f80fcf9c0ea598559",
+                    "hash" : "0x3755afff282738f4c79362abf2900f9c9e06ac6607a3f87f80fcf9c0ea598559",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e1600f478012c6e0fa7ce6c3d0e9eccee0863844281254ddd18288bbb7e4cc3e",
+                    "hash" : "0xe1600f478012c6e0fa7ce6c3d0e9eccee0863844281254ddd18288bbb7e4cc3e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526000604060406000601774945304eb96065b2a98b57a48a06ae28d285a71b5aa6103e8f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "300000"
+                "0x0493e0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorMemOOGAndInsufficientBalance.json b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorMemOOGAndInsufficientBalance.json
index 6d52dc8f1..75c73a1e0 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorMemOOGAndInsufficientBalance.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorMemOOGAndInsufficientBalance.json
@@ -1,17 +1,17 @@
 {
     "CallToNameRegistratorMemOOGAndInsufficientBalance" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "114f58e07a1c64cb56b5a025c92e7f90330439ad43c939bd53b0fc366c2261d9",
+                    "hash" : "0x114f58e07a1c64cb56b5a025c92e7f90330439ad43c939bd53b0fc366c2261d9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "114f58e07a1c64cb56b5a025c92e7f90330439ad43c939bd53b0fc366c2261d9",
+                    "hash" : "0x114f58e07a1c64cb56b5a025c92e7f90330439ad43c939bd53b0fc366c2261d9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "114f58e07a1c64cb56b5a025c92e7f90330439ad43c939bd53b0fc366c2261d9",
+                    "hash" : "0x114f58e07a1c64cb56b5a025c92e7f90330439ad43c939bd53b0fc366c2261d9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "114f58e07a1c64cb56b5a025c92e7f90330439ad43c939bd53b0fc366c2261d9",
+                    "hash" : "0x114f58e07a1c64cb56b5a025c92e7f90330439ad43c939bd53b0fc366c2261d9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "114f58e07a1c64cb56b5a025c92e7f90330439ad43c939bd53b0fc366c2261d9",
+                    "hash" : "0x114f58e07a1c64cb56b5a025c92e7f90330439ad43c939bd53b0fc366c2261d9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526000604065ffffffffffff6000601773945304eb96065b2a98b57a48a06ae28d285a71b564fffffffffff1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "300000"
+                "0x0493e0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorNotMuchMemory0.json b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorNotMuchMemory0.json
index 7fb37151b..66bbe58a2 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorNotMuchMemory0.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorNotMuchMemory0.json
@@ -1,17 +1,17 @@
 {
     "CallToNameRegistratorNotMuchMemory0" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d694c2d97091570d8bbc35f90e5ad8156dfdfee8c07d1801802233eeb85962b8",
+                    "hash" : "0xd694c2d97091570d8bbc35f90e5ad8156dfdfee8c07d1801802233eeb85962b8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d694c2d97091570d8bbc35f90e5ad8156dfdfee8c07d1801802233eeb85962b8",
+                    "hash" : "0xd694c2d97091570d8bbc35f90e5ad8156dfdfee8c07d1801802233eeb85962b8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f4fc7d23582ad6e92195cf959b2e8d8802ccf5738269ffd3016c4ebbb7f0f95f",
+                    "hash" : "0xf4fc7d23582ad6e92195cf959b2e8d8802ccf5738269ffd3016c4ebbb7f0f95f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f4fc7d23582ad6e92195cf959b2e8d8802ccf5738269ffd3016c4ebbb7f0f95f",
+                    "hash" : "0xf4fc7d23582ad6e92195cf959b2e8d8802ccf5738269ffd3016c4ebbb7f0f95f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d694c2d97091570d8bbc35f90e5ad8156dfdfee8c07d1801802233eeb85962b8",
+                    "hash" : "0xd694c2d97091570d8bbc35f90e5ad8156dfdfee8c07d1801802233eeb85962b8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7feeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff006000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526000620f120660406000601773945304eb96065b2a98b57a48a06ae28d285a71b56101f4f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "300000"
+                "0x0493e0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorNotMuchMemory1.json b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorNotMuchMemory1.json
index f13007abd..e782dc87a 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorNotMuchMemory1.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorNotMuchMemory1.json
@@ -1,17 +1,17 @@
 {
     "CallToNameRegistratorNotMuchMemory1" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "09f6d23e7a13df4afe992c46a87006acc67ff4d173a4331e4ec179f5d8b9cd53",
+                    "hash" : "0x09f6d23e7a13df4afe992c46a87006acc67ff4d173a4331e4ec179f5d8b9cd53",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "09f6d23e7a13df4afe992c46a87006acc67ff4d173a4331e4ec179f5d8b9cd53",
+                    "hash" : "0x09f6d23e7a13df4afe992c46a87006acc67ff4d173a4331e4ec179f5d8b9cd53",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "57a6ed152d0450751d70b6bced7c126b1e01e0131609c80a1b65531af88082d1",
+                    "hash" : "0x57a6ed152d0450751d70b6bced7c126b1e01e0131609c80a1b65531af88082d1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "57a6ed152d0450751d70b6bced7c126b1e01e0131609c80a1b65531af88082d1",
+                    "hash" : "0x57a6ed152d0450751d70b6bced7c126b1e01e0131609c80a1b65531af88082d1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "09f6d23e7a13df4afe992c46a87006acc67ff4d173a4331e4ec179f5d8b9cd53",
+                    "hash" : "0x09f6d23e7a13df4afe992c46a87006acc67ff4d173a4331e4ec179f5d8b9cd53",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7feeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff006000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600060406000620f1206601773945304eb96065b2a98b57a48a06ae28d285a71b56101f4f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "300000"
+                "0x0493e0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorOutOfGas.json b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorOutOfGas.json
index b4acab8a8..fde2cb95f 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorOutOfGas.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorOutOfGas.json
@@ -1,17 +1,17 @@
 {
     "CallToNameRegistratorOutOfGas" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "517efad1eb1e2970819211696d148a34dbdc0dc1c3700f17409601bac40d1f8e",
+                    "hash" : "0x517efad1eb1e2970819211696d148a34dbdc0dc1c3700f17409601bac40d1f8e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "517efad1eb1e2970819211696d148a34dbdc0dc1c3700f17409601bac40d1f8e",
+                    "hash" : "0x517efad1eb1e2970819211696d148a34dbdc0dc1c3700f17409601bac40d1f8e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2b988b2663cbc833b242180bda87a075471856f4c49c67cd60d0425fb3cb03d4",
+                    "hash" : "0x2b988b2663cbc833b242180bda87a075471856f4c49c67cd60d0425fb3cb03d4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "2b988b2663cbc833b242180bda87a075471856f4c49c67cd60d0425fb3cb03d4",
+                    "hash" : "0x2b988b2663cbc833b242180bda87a075471856f4c49c67cd60d0425fb3cb03d4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "517efad1eb1e2970819211696d148a34dbdc0dc1c3700f17409601bac40d1f8e",
+                    "hash" : "0x517efad1eb1e2970819211696d148a34dbdc0dc1c3700f17409601bac40d1f8e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7feeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff006000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526000604060406000601773945304eb96065b2a98b57a48a06ae28d285a71b56064f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "300000"
+                "0x0493e0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory0.json b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory0.json
index a857f75a3..2eb121853 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory0.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory0.json
@@ -1,17 +1,17 @@
 {
     "CallToNameRegistratorTooMuchMemory0" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "5d4b6ab2f2501fa3ec033514e65f89fa2294ff2a5eea7161071d77f4fe71f8ba",
+                    "hash" : "0x5d4b6ab2f2501fa3ec033514e65f89fa2294ff2a5eea7161071d77f4fe71f8ba",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "5d4b6ab2f2501fa3ec033514e65f89fa2294ff2a5eea7161071d77f4fe71f8ba",
+                    "hash" : "0x5d4b6ab2f2501fa3ec033514e65f89fa2294ff2a5eea7161071d77f4fe71f8ba",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5d4b6ab2f2501fa3ec033514e65f89fa2294ff2a5eea7161071d77f4fe71f8ba",
+                    "hash" : "0x5d4b6ab2f2501fa3ec033514e65f89fa2294ff2a5eea7161071d77f4fe71f8ba",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5d4b6ab2f2501fa3ec033514e65f89fa2294ff2a5eea7161071d77f4fe71f8ba",
+                    "hash" : "0x5d4b6ab2f2501fa3ec033514e65f89fa2294ff2a5eea7161071d77f4fe71f8ba",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "5d4b6ab2f2501fa3ec033514e65f89fa2294ff2a5eea7161071d77f4fe71f8ba",
+                    "hash" : "0x5d4b6ab2f2501fa3ec033514e65f89fa2294ff2a5eea7161071d77f4fe71f8ba",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7feeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff006000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600060406040633ade68b1601773945304eb96065b2a98b57a48a06ae28d285a71b56101f4f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "300000"
+                "0x0493e0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory1.json b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory1.json
index 10530c7fc..2f4e968e4 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory1.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory1.json
@@ -1,17 +1,17 @@
 {
     "CallToNameRegistratorTooMuchMemory1" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "195fb9b7e5616bb930b792075f4b1596b8df9bf468f8f33af87e573a4d227beb",
+                    "hash" : "0x195fb9b7e5616bb930b792075f4b1596b8df9bf468f8f33af87e573a4d227beb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "195fb9b7e5616bb930b792075f4b1596b8df9bf468f8f33af87e573a4d227beb",
+                    "hash" : "0x195fb9b7e5616bb930b792075f4b1596b8df9bf468f8f33af87e573a4d227beb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "195fb9b7e5616bb930b792075f4b1596b8df9bf468f8f33af87e573a4d227beb",
+                    "hash" : "0x195fb9b7e5616bb930b792075f4b1596b8df9bf468f8f33af87e573a4d227beb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "195fb9b7e5616bb930b792075f4b1596b8df9bf468f8f33af87e573a4d227beb",
+                    "hash" : "0x195fb9b7e5616bb930b792075f4b1596b8df9bf468f8f33af87e573a4d227beb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "195fb9b7e5616bb930b792075f4b1596b8df9bf468f8f33af87e573a4d227beb",
+                    "hash" : "0x195fb9b7e5616bb930b792075f4b1596b8df9bf468f8f33af87e573a4d227beb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7feeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff006000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa60205260006040629688d86000601773945304eb96065b2a98b57a48a06ae28d285a71b56101f4f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "300000"
+                "0x0493e0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory2.json b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory2.json
index ba8a2cc35..1ca1cc2ed 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory2.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory2.json
@@ -1,17 +1,17 @@
 {
     "CallToNameRegistratorTooMuchMemory2" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "4993da42139940634e711366fdaa07b684fa3b3d8a7a8cd9b2274b27e753913e",
+                    "hash" : "0x4993da42139940634e711366fdaa07b684fa3b3d8a7a8cd9b2274b27e753913e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "4993da42139940634e711366fdaa07b684fa3b3d8a7a8cd9b2274b27e753913e",
+                    "hash" : "0x4993da42139940634e711366fdaa07b684fa3b3d8a7a8cd9b2274b27e753913e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4993da42139940634e711366fdaa07b684fa3b3d8a7a8cd9b2274b27e753913e",
+                    "hash" : "0x4993da42139940634e711366fdaa07b684fa3b3d8a7a8cd9b2274b27e753913e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4993da42139940634e711366fdaa07b684fa3b3d8a7a8cd9b2274b27e753913e",
+                    "hash" : "0x4993da42139940634e711366fdaa07b684fa3b3d8a7a8cd9b2274b27e753913e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "4993da42139940634e711366fdaa07b684fa3b3d8a7a8cd9b2274b27e753913e",
+                    "hash" : "0x4993da42139940634e711366fdaa07b684fa3b3d8a7a8cd9b2274b27e753913e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7feeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff006000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526001620f120660406000601773945304eb96065b2a98b57a48a06ae28d285a71b56101f4f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "300000"
+                "0x0493e0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorZeorSizeMemExpansion.json b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorZeorSizeMemExpansion.json
index c699b6557..c410de56a 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorZeorSizeMemExpansion.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorZeorSizeMemExpansion.json
@@ -1,17 +1,17 @@
 {
     "CallToNameRegistratorZeorSizeMemExpansion" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "520ddd540224004110028b9d223f966e4a7cf4db78ffc3114abfe70d1f6b38db",
+                    "hash" : "0x520ddd540224004110028b9d223f966e4a7cf4db78ffc3114abfe70d1f6b38db",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "520ddd540224004110028b9d223f966e4a7cf4db78ffc3114abfe70d1f6b38db",
+                    "hash" : "0x520ddd540224004110028b9d223f966e4a7cf4db78ffc3114abfe70d1f6b38db",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "bd23d5466a70c39a332b0201f8f56837b02c172e5e60295e7221e5d8668f39e0",
+                    "hash" : "0xbd23d5466a70c39a332b0201f8f56837b02c172e5e60295e7221e5d8668f39e0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "bd23d5466a70c39a332b0201f8f56837b02c172e5e60295e7221e5d8668f39e0",
+                    "hash" : "0xbd23d5466a70c39a332b0201f8f56837b02c172e5e60295e7221e5d8668f39e0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "520ddd540224004110028b9d223f966e4a7cf4db78ffc3114abfe70d1f6b38db",
+                    "hash" : "0x520ddd540224004110028b9d223f966e4a7cf4db78ffc3114abfe70d1f6b38db",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526000600060006000601773945304eb96065b2a98b57a48a06ae28d285a71b56103e8f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "300000"
+                "0x0493e0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/CallToReturn1.json b/GeneralStateTests/stSystemOperationsTest/CallToReturn1.json
index eb782fdd2..ba1617095 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallToReturn1.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallToReturn1.json
@@ -1,17 +1,17 @@
 {
     "CallToReturn1" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d524736625e1632152bad1b87b2e226e176c6181cde3a844dcb1dd0eeaf300a9",
+                    "hash" : "0xd524736625e1632152bad1b87b2e226e176c6181cde3a844dcb1dd0eeaf300a9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d524736625e1632152bad1b87b2e226e176c6181cde3a844dcb1dd0eeaf300a9",
+                    "hash" : "0xd524736625e1632152bad1b87b2e226e176c6181cde3a844dcb1dd0eeaf300a9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "17272b576fb7b4b74a5305080e983036905199834abeb29756991089bd61c912",
+                    "hash" : "0x17272b576fb7b4b74a5305080e983036905199834abeb29756991089bd61c912",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "17272b576fb7b4b74a5305080e983036905199834abeb29756991089bd61c912",
+                    "hash" : "0x17272b576fb7b4b74a5305080e983036905199834abeb29756991089bd61c912",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d524736625e1632152bad1b87b2e226e176c6181cde3a844dcb1dd0eeaf300a9",
+                    "hash" : "0xd524736625e1632152bad1b87b2e226e176c6181cde3a844dcb1dd0eeaf300a9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001601f60006000601773945304eb96065b2a98b57a48a06ae28d285a71b56103e8f1600055600051600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155602a601f536001601ff3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "300000"
+                "0x0493e0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/CallToReturn1ForDynamicJump0.json b/GeneralStateTests/stSystemOperationsTest/CallToReturn1ForDynamicJump0.json
index 62984d901..affd07e37 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallToReturn1ForDynamicJump0.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallToReturn1ForDynamicJump0.json
@@ -1,17 +1,17 @@
 {
     "CallToReturn1ForDynamicJump0" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "11bf0d0d8648c8a47dea0a2e55bdb51240010da4f0b41f577a1f23543eeb0c96",
+                    "hash" : "0x11bf0d0d8648c8a47dea0a2e55bdb51240010da4f0b41f577a1f23543eeb0c96",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "11bf0d0d8648c8a47dea0a2e55bdb51240010da4f0b41f577a1f23543eeb0c96",
+                    "hash" : "0x11bf0d0d8648c8a47dea0a2e55bdb51240010da4f0b41f577a1f23543eeb0c96",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "11bf0d0d8648c8a47dea0a2e55bdb51240010da4f0b41f577a1f23543eeb0c96",
+                    "hash" : "0x11bf0d0d8648c8a47dea0a2e55bdb51240010da4f0b41f577a1f23543eeb0c96",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "11bf0d0d8648c8a47dea0a2e55bdb51240010da4f0b41f577a1f23543eeb0c96",
+                    "hash" : "0x11bf0d0d8648c8a47dea0a2e55bdb51240010da4f0b41f577a1f23543eeb0c96",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "11bf0d0d8648c8a47dea0a2e55bdb51240010da4f0b41f577a1f23543eeb0c96",
+                    "hash" : "0x11bf0d0d8648c8a47dea0a2e55bdb51240010da4f0b41f577a1f23543eeb0c96",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001601f60006000601773945304eb96065b2a98b57a48a06ae28d285a71b56103e8f1600055600051565b6023602355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155602a601f536001601ff3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "300000"
+                "0x0493e0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/CallToReturn1ForDynamicJump1.json b/GeneralStateTests/stSystemOperationsTest/CallToReturn1ForDynamicJump1.json
index 15224f1ef..b93bc0899 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallToReturn1ForDynamicJump1.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallToReturn1ForDynamicJump1.json
@@ -1,17 +1,17 @@
 {
     "CallToReturn1ForDynamicJump1" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "19678aec516eda46d75c60db0ae2c97c0600eb95b7aac31fb6e3d4ede3cf43f9",
+                    "hash" : "0x19678aec516eda46d75c60db0ae2c97c0600eb95b7aac31fb6e3d4ede3cf43f9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "19678aec516eda46d75c60db0ae2c97c0600eb95b7aac31fb6e3d4ede3cf43f9",
+                    "hash" : "0x19678aec516eda46d75c60db0ae2c97c0600eb95b7aac31fb6e3d4ede3cf43f9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "19678aec516eda46d75c60db0ae2c97c0600eb95b7aac31fb6e3d4ede3cf43f9",
+                    "hash" : "0x19678aec516eda46d75c60db0ae2c97c0600eb95b7aac31fb6e3d4ede3cf43f9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "19678aec516eda46d75c60db0ae2c97c0600eb95b7aac31fb6e3d4ede3cf43f9",
+                    "hash" : "0x19678aec516eda46d75c60db0ae2c97c0600eb95b7aac31fb6e3d4ede3cf43f9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "19678aec516eda46d75c60db0ae2c97c0600eb95b7aac31fb6e3d4ede3cf43f9",
+                    "hash" : "0x19678aec516eda46d75c60db0ae2c97c0600eb95b7aac31fb6e3d4ede3cf43f9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001601f60006000601773945304eb96065b2a98b57a48a06ae28d285a71b56103e8f160005560005156605b6023602355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155602b601f536001601ff3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "300000"
+                "0x0493e0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/CalltoReturn2.json b/GeneralStateTests/stSystemOperationsTest/CalltoReturn2.json
index 9a66f94b6..95209cdac 100644
--- a/GeneralStateTests/stSystemOperationsTest/CalltoReturn2.json
+++ b/GeneralStateTests/stSystemOperationsTest/CalltoReturn2.json
@@ -1,17 +1,17 @@
 {
     "CalltoReturn2" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f65269d7b5b7facf1b99aec76e8adfe34906a3493068790b9d52193211815b21",
+                    "hash" : "0xf65269d7b5b7facf1b99aec76e8adfe34906a3493068790b9d52193211815b21",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f65269d7b5b7facf1b99aec76e8adfe34906a3493068790b9d52193211815b21",
+                    "hash" : "0xf65269d7b5b7facf1b99aec76e8adfe34906a3493068790b9d52193211815b21",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6971f4dd72e63426d4ae977723404b9822e13339e65386187b746a9a368e459f",
+                    "hash" : "0x6971f4dd72e63426d4ae977723404b9822e13339e65386187b746a9a368e459f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6971f4dd72e63426d4ae977723404b9822e13339e65386187b746a9a368e459f",
+                    "hash" : "0x6971f4dd72e63426d4ae977723404b9822e13339e65386187b746a9a368e459f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f65269d7b5b7facf1b99aec76e8adfe34906a3493068790b9d52193211815b21",
+                    "hash" : "0xf65269d7b5b7facf1b99aec76e8adfe34906a3493068790b9d52193211815b21",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526002600060406000601773945304eb96065b2a98b57a48a06ae28d285a71b5611388f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155603760005360026000f2",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "300000"
+                "0x0493e0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/CreateHashCollision.json b/GeneralStateTests/stSystemOperationsTest/CreateHashCollision.json
index 190ca349d..9b953c7a5 100644
--- a/GeneralStateTests/stSystemOperationsTest/CreateHashCollision.json
+++ b/GeneralStateTests/stSystemOperationsTest/CreateHashCollision.json
@@ -1,17 +1,17 @@
 {
     "CreateHashCollision" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9ad1ffb51fe6f7a2dca6fd17ab366990af3f875137c82d2dc64ff6e8b1b9161e",
+                    "hash" : "0x9ad1ffb51fe6f7a2dca6fd17ab366990af3f875137c82d2dc64ff6e8b1b9161e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d73594e1cf8108b5cb811ece843511874fea2a4536d12d08e92258b46be8f7f4",
+                    "hash" : "0xd73594e1cf8108b5cb811ece843511874fea2a4536d12d08e92258b46be8f7f4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9ad1ffb51fe6f7a2dca6fd17ab366990af3f875137c82d2dc64ff6e8b1b9161e",
+                    "hash" : "0x9ad1ffb51fe6f7a2dca6fd17ab366990af3f875137c82d2dc64ff6e8b1b9161e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9ad1ffb51fe6f7a2dca6fd17ab366990af3f875137c82d2dc64ff6e8b1b9161e",
+                    "hash" : "0x9ad1ffb51fe6f7a2dca6fd17ab366990af3f875137c82d2dc64ff6e8b1b9161e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d73594e1cf8108b5cb811ece843511874fea2a4536d12d08e92258b46be8f7f4",
+                    "hash" : "0xd73594e1cf8108b5cb811ece843511874fea2a4536d12d08e92258b46be8f7f4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7c601080600c6000396000f3006000355415600957005b60203560003555600052601d60036017f0600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "d2571607e241ecf590ed94b12d87c94babe36db6" : {
+            "0xd2571607e241ecf590ed94b12d87c94babe36db6" : {
                 "balance" : "0x2a",
                 "code" : "0x60016001016055",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "10000000"
+                "0x989680"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/PostToReturn1.json b/GeneralStateTests/stSystemOperationsTest/PostToReturn1.json
index 496e0d08b..f61c30e9a 100644
--- a/GeneralStateTests/stSystemOperationsTest/PostToReturn1.json
+++ b/GeneralStateTests/stSystemOperationsTest/PostToReturn1.json
@@ -1,17 +1,17 @@
 {
     "PostToReturn1" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d7e921c9f8fa1dcc2daa5c823c5e4e63b5f2cf80c85bd18f896167ffa49e43c5",
+                    "hash" : "0xd7e921c9f8fa1dcc2daa5c823c5e4e63b5f2cf80c85bd18f896167ffa49e43c5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d7e921c9f8fa1dcc2daa5c823c5e4e63b5f2cf80c85bd18f896167ffa49e43c5",
+                    "hash" : "0xd7e921c9f8fa1dcc2daa5c823c5e4e63b5f2cf80c85bd18f896167ffa49e43c5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9f7a93654e2c5b63c54ab0c0946d7df6c9f0966b4bb8763085cc3e7a33ded7b4",
+                    "hash" : "0x9f7a93654e2c5b63c54ab0c0946d7df6c9f0966b4bb8763085cc3e7a33ded7b4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9f7a93654e2c5b63c54ab0c0946d7df6c9f0966b4bb8763085cc3e7a33ded7b4",
+                    "hash" : "0x9f7a93654e2c5b63c54ab0c0946d7df6c9f0966b4bb8763085cc3e7a33ded7b4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d7e921c9f8fa1dcc2daa5c823c5e4e63b5f2cf80c85bd18f896167ffa49e43c5",
+                    "hash" : "0xd7e921c9f8fa1dcc2daa5c823c5e4e63b5f2cf80c85bd18f896167ffa49e43c5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526000600060406000601773945304eb96065b2a98b57a48a06ae28d285a71b5617530f16001556001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x603760005360026000f2",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "300000"
+                "0x0493e0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/TestNameRegistrator.json b/GeneralStateTests/stSystemOperationsTest/TestNameRegistrator.json
index 0b5a8ccb0..dd41b0795 100644
--- a/GeneralStateTests/stSystemOperationsTest/TestNameRegistrator.json
+++ b/GeneralStateTests/stSystemOperationsTest/TestNameRegistrator.json
@@ -1,17 +1,17 @@
 {
     "TestNameRegistrator" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "cedee0855a8063f17b379084d252572d4f4949b14787f120f7dec66ae516fd2b",
+                    "hash" : "0xcedee0855a8063f17b379084d252572d4f4949b14787f120f7dec66ae516fd2b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "cedee0855a8063f17b379084d252572d4f4949b14787f120f7dec66ae516fd2b",
+                    "hash" : "0xcedee0855a8063f17b379084d252572d4f4949b14787f120f7dec66ae516fd2b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "00f4b821448a5251d87c19e12ec783941c018048afc48c2afe4e9ce9c7d843d2",
+                    "hash" : "0x00f4b821448a5251d87c19e12ec783941c018048afc48c2afe4e9ce9c7d843d2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "00f4b821448a5251d87c19e12ec783941c018048afc48c2afe4e9ce9c7d843d2",
+                    "hash" : "0x00f4b821448a5251d87c19e12ec783941c018048afc48c2afe4e9ce9c7d843d2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "cedee0855a8063f17b379084d252572d4f4949b14787f120f7dec66ae516fd2b",
+                    "hash" : "0xcedee0855a8063f17b379084d252572d4f4949b14787f120f7dec66ae516fd2b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffafffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa"
             ],
             "gasLimit" : [
-                "1000000"
+                "0x0f4240"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/balanceInputAddressTooBig.json b/GeneralStateTests/stSystemOperationsTest/balanceInputAddressTooBig.json
index b7c991bdf..3fb25defd 100644
--- a/GeneralStateTests/stSystemOperationsTest/balanceInputAddressTooBig.json
+++ b/GeneralStateTests/stSystemOperationsTest/balanceInputAddressTooBig.json
@@ -1,17 +1,17 @@
 {
     "balanceInputAddressTooBig" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "498e32033ce67f3f9a89601d7c9d615ba9a8128ddb17f04e1d6427d165d4a8be",
+                    "hash" : "0x498e32033ce67f3f9a89601d7c9d615ba9a8128ddb17f04e1d6427d165d4a8be",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "498e32033ce67f3f9a89601d7c9d615ba9a8128ddb17f04e1d6427d165d4a8be",
+                    "hash" : "0x498e32033ce67f3f9a89601d7c9d615ba9a8128ddb17f04e1d6427d165d4a8be",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "0cd184d79d2fe8bc7d5d565abd8223ddbbf6a74884b03dba907114a50c1e4194",
+                    "hash" : "0x0cd184d79d2fe8bc7d5d565abd8223ddbbf6a74884b03dba907114a50c1e4194",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "0cd184d79d2fe8bc7d5d565abd8223ddbbf6a74884b03dba907114a50c1e4194",
+                    "hash" : "0x0cd184d79d2fe8bc7d5d565abd8223ddbbf6a74884b03dba907114a50c1e4194",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "498e32033ce67f3f9a89601d7c9d615ba9a8128ddb17f04e1d6427d165d4a8be",
+                    "hash" : "0x498e32033ce67f3f9a89601d7c9d615ba9a8128ddb17f04e1d6427d165d4a8be",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x74a94f5374fce5edbc8e2a8697c15331677e6ebf0baa31600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "300000"
+                "0x0493e0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/callValue.json b/GeneralStateTests/stSystemOperationsTest/callValue.json
index b8ac5d248..be1aa85dd 100644
--- a/GeneralStateTests/stSystemOperationsTest/callValue.json
+++ b/GeneralStateTests/stSystemOperationsTest/callValue.json
@@ -1,17 +1,17 @@
 {
     "callValue" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "ea5a2e542032a38dc4c5b8a35af97c8aec0478e44ce2578257d5e2ba877c2ff3",
+                    "hash" : "0xea5a2e542032a38dc4c5b8a35af97c8aec0478e44ce2578257d5e2ba877c2ff3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "ea5a2e542032a38dc4c5b8a35af97c8aec0478e44ce2578257d5e2ba877c2ff3",
+                    "hash" : "0xea5a2e542032a38dc4c5b8a35af97c8aec0478e44ce2578257d5e2ba877c2ff3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "ea5a2e542032a38dc4c5b8a35af97c8aec0478e44ce2578257d5e2ba877c2ff3",
+                    "hash" : "0xea5a2e542032a38dc4c5b8a35af97c8aec0478e44ce2578257d5e2ba877c2ff3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ea5a2e542032a38dc4c5b8a35af97c8aec0478e44ce2578257d5e2ba877c2ff3",
+                    "hash" : "0xea5a2e542032a38dc4c5b8a35af97c8aec0478e44ce2578257d5e2ba877c2ff3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "ea5a2e542032a38dc4c5b8a35af97c8aec0478e44ce2578257d5e2ba877c2ff3",
+                    "hash" : "0xea5a2e542032a38dc4c5b8a35af97c8aec0478e44ce2578257d5e2ba877c2ff3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x34600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "10000000"
+                "0x989680"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/callcodeTo0.json b/GeneralStateTests/stSystemOperationsTest/callcodeTo0.json
index 08a89722a..3f6eabf3c 100644
--- a/GeneralStateTests/stSystemOperationsTest/callcodeTo0.json
+++ b/GeneralStateTests/stSystemOperationsTest/callcodeTo0.json
@@ -1,17 +1,17 @@
 {
     "callcodeTo0" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "19f9a922972fe0537d83f56f5959862d5ad2124a228380ae9f47ac5618fc8037",
+                    "hash" : "0x19f9a922972fe0537d83f56f5959862d5ad2124a228380ae9f47ac5618fc8037",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "19f9a922972fe0537d83f56f5959862d5ad2124a228380ae9f47ac5618fc8037",
+                    "hash" : "0x19f9a922972fe0537d83f56f5959862d5ad2124a228380ae9f47ac5618fc8037",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f2b28acfc1a870888ce8bec91ba864a29d474f8c112c6d95febdfc398bf51a87",
+                    "hash" : "0xf2b28acfc1a870888ce8bec91ba864a29d474f8c112c6d95febdfc398bf51a87",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f2b28acfc1a870888ce8bec91ba864a29d474f8c112c6d95febdfc398bf51a87",
+                    "hash" : "0xf2b28acfc1a870888ce8bec91ba864a29d474f8c112c6d95febdfc398bf51a87",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "19f9a922972fe0537d83f56f5959862d5ad2124a228380ae9f47ac5618fc8037",
+                    "hash" : "0x19f9a922972fe0537d83f56f5959862d5ad2124a228380ae9f47ac5618fc8037",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60006000600060006001600061c350f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/callcodeToNameRegistrator0.json b/GeneralStateTests/stSystemOperationsTest/callcodeToNameRegistrator0.json
index 362baf8eb..3da40dd4e 100644
--- a/GeneralStateTests/stSystemOperationsTest/callcodeToNameRegistrator0.json
+++ b/GeneralStateTests/stSystemOperationsTest/callcodeToNameRegistrator0.json
@@ -1,17 +1,17 @@
 {
     "callcodeToNameRegistrator0" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "80a99db610de9d5f0becc55ff0d92519481297b4ac066d473c19d47cd41d5daf",
+                    "hash" : "0x80a99db610de9d5f0becc55ff0d92519481297b4ac066d473c19d47cd41d5daf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "80a99db610de9d5f0becc55ff0d92519481297b4ac066d473c19d47cd41d5daf",
+                    "hash" : "0x80a99db610de9d5f0becc55ff0d92519481297b4ac066d473c19d47cd41d5daf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "7134711778196126bf70632019459d9139f5fd61ec1902b8ad932dbf2dc4f271",
+                    "hash" : "0x7134711778196126bf70632019459d9139f5fd61ec1902b8ad932dbf2dc4f271",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "7134711778196126bf70632019459d9139f5fd61ec1902b8ad932dbf2dc4f271",
+                    "hash" : "0x7134711778196126bf70632019459d9139f5fd61ec1902b8ad932dbf2dc4f271",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "80a99db610de9d5f0becc55ff0d92519481297b4ac066d473c19d47cd41d5daf",
+                    "hash" : "0x80a99db610de9d5f0becc55ff0d92519481297b4ac066d473c19d47cd41d5daf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526000604060406000601773945304eb96065b2a98b57a48a06ae28d285a71b56103e8f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1000000"
+                "0x0f4240"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/callcodeToNameRegistratorAddresTooBigLeft.json b/GeneralStateTests/stSystemOperationsTest/callcodeToNameRegistratorAddresTooBigLeft.json
index b736f329c..9106e7c24 100644
--- a/GeneralStateTests/stSystemOperationsTest/callcodeToNameRegistratorAddresTooBigLeft.json
+++ b/GeneralStateTests/stSystemOperationsTest/callcodeToNameRegistratorAddresTooBigLeft.json
@@ -1,17 +1,17 @@
 {
     "callcodeToNameRegistratorAddresTooBigLeft" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "01c79efbe5d2bcf9a3f4e7996901cdc5546fe582aadede40602c24b9cffe5268",
+                    "hash" : "0x01c79efbe5d2bcf9a3f4e7996901cdc5546fe582aadede40602c24b9cffe5268",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "01c79efbe5d2bcf9a3f4e7996901cdc5546fe582aadede40602c24b9cffe5268",
+                    "hash" : "0x01c79efbe5d2bcf9a3f4e7996901cdc5546fe582aadede40602c24b9cffe5268",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "593b3eef5051e2c75739cdd3228252d08672b2e647c592bbe1e9fb8c0acb3f87",
+                    "hash" : "0x593b3eef5051e2c75739cdd3228252d08672b2e647c592bbe1e9fb8c0acb3f87",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "593b3eef5051e2c75739cdd3228252d08672b2e647c592bbe1e9fb8c0acb3f87",
+                    "hash" : "0x593b3eef5051e2c75739cdd3228252d08672b2e647c592bbe1e9fb8c0acb3f87",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "01c79efbe5d2bcf9a3f4e7996901cdc5546fe582aadede40602c24b9cffe5268",
+                    "hash" : "0x01c79efbe5d2bcf9a3f4e7996901cdc5546fe582aadede40602c24b9cffe5268",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526000604060406000601774aa945304eb96065b2a98b57a48a06ae28d285a71b56103e8f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1000000"
+                "0x0f4240"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/callcodeToNameRegistratorAddresTooBigRight.json b/GeneralStateTests/stSystemOperationsTest/callcodeToNameRegistratorAddresTooBigRight.json
index dd7d62b5f..fe0c4ace3 100644
--- a/GeneralStateTests/stSystemOperationsTest/callcodeToNameRegistratorAddresTooBigRight.json
+++ b/GeneralStateTests/stSystemOperationsTest/callcodeToNameRegistratorAddresTooBigRight.json
@@ -1,17 +1,17 @@
 {
     "callcodeToNameRegistratorAddresTooBigRight" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6a14904644464966f58ab919f626b0cfa28e92476bf966c1dbf5205985ebab13",
+                    "hash" : "0x6a14904644464966f58ab919f626b0cfa28e92476bf966c1dbf5205985ebab13",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6a14904644464966f58ab919f626b0cfa28e92476bf966c1dbf5205985ebab13",
+                    "hash" : "0x6a14904644464966f58ab919f626b0cfa28e92476bf966c1dbf5205985ebab13",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4026a08c4d682101cf0f13e53e36a03554d8e61fbe39b81bd7802dfc40301368",
+                    "hash" : "0x4026a08c4d682101cf0f13e53e36a03554d8e61fbe39b81bd7802dfc40301368",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4026a08c4d682101cf0f13e53e36a03554d8e61fbe39b81bd7802dfc40301368",
+                    "hash" : "0x4026a08c4d682101cf0f13e53e36a03554d8e61fbe39b81bd7802dfc40301368",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6a14904644464966f58ab919f626b0cfa28e92476bf966c1dbf5205985ebab13",
+                    "hash" : "0x6a14904644464966f58ab919f626b0cfa28e92476bf966c1dbf5205985ebab13",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526000604060406000601774945304eb96065b2a98b57a48a06ae28d285a71b5aa6103e8f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1000000"
+                "0x0f4240"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/callcodeToNameRegistratorZeroMemExpanion.json b/GeneralStateTests/stSystemOperationsTest/callcodeToNameRegistratorZeroMemExpanion.json
index d3e797b13..83ab86760 100644
--- a/GeneralStateTests/stSystemOperationsTest/callcodeToNameRegistratorZeroMemExpanion.json
+++ b/GeneralStateTests/stSystemOperationsTest/callcodeToNameRegistratorZeroMemExpanion.json
@@ -1,17 +1,17 @@
 {
     "callcodeToNameRegistratorZeroMemExpanion" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "153fcad07dc3b3c9650fae069eb7726c29f6d407b1a7f2c1efc458855c7f8e06",
+                    "hash" : "0x153fcad07dc3b3c9650fae069eb7726c29f6d407b1a7f2c1efc458855c7f8e06",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "153fcad07dc3b3c9650fae069eb7726c29f6d407b1a7f2c1efc458855c7f8e06",
+                    "hash" : "0x153fcad07dc3b3c9650fae069eb7726c29f6d407b1a7f2c1efc458855c7f8e06",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3f1a9d1c69c51b03762bb2e8bdc7529a9ac07b37c9e68afb9ccbfe3158542645",
+                    "hash" : "0x3f1a9d1c69c51b03762bb2e8bdc7529a9ac07b37c9e68afb9ccbfe3158542645",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3f1a9d1c69c51b03762bb2e8bdc7529a9ac07b37c9e68afb9ccbfe3158542645",
+                    "hash" : "0x3f1a9d1c69c51b03762bb2e8bdc7529a9ac07b37c9e68afb9ccbfe3158542645",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "153fcad07dc3b3c9650fae069eb7726c29f6d407b1a7f2c1efc458855c7f8e06",
+                    "hash" : "0x153fcad07dc3b3c9650fae069eb7726c29f6d407b1a7f2c1efc458855c7f8e06",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526000600060006000601773945304eb96065b2a98b57a48a06ae28d285a71b56103e8f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1000000"
+                "0x0f4240"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/callcodeToReturn1.json b/GeneralStateTests/stSystemOperationsTest/callcodeToReturn1.json
index 0336e4e3a..bf5ec339d 100644
--- a/GeneralStateTests/stSystemOperationsTest/callcodeToReturn1.json
+++ b/GeneralStateTests/stSystemOperationsTest/callcodeToReturn1.json
@@ -1,17 +1,17 @@
 {
     "callcodeToReturn1" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "fee86436f44e3e9f5ac0ba17a93cfce472a98a0472d61cc37b90c8e202d3036a",
+                    "hash" : "0xfee86436f44e3e9f5ac0ba17a93cfce472a98a0472d61cc37b90c8e202d3036a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "fee86436f44e3e9f5ac0ba17a93cfce472a98a0472d61cc37b90c8e202d3036a",
+                    "hash" : "0xfee86436f44e3e9f5ac0ba17a93cfce472a98a0472d61cc37b90c8e202d3036a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "24a5ee7c7e8184fcdc16f247f6fcd4e2e9f8b2859fd5bf2d08b982f31ab3193d",
+                    "hash" : "0x24a5ee7c7e8184fcdc16f247f6fcd4e2e9f8b2859fd5bf2d08b982f31ab3193d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "24a5ee7c7e8184fcdc16f247f6fcd4e2e9f8b2859fd5bf2d08b982f31ab3193d",
+                    "hash" : "0x24a5ee7c7e8184fcdc16f247f6fcd4e2e9f8b2859fd5bf2d08b982f31ab3193d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "fee86436f44e3e9f5ac0ba17a93cfce472a98a0472d61cc37b90c8e202d3036a",
+                    "hash" : "0xfee86436f44e3e9f5ac0ba17a93cfce472a98a0472d61cc37b90c8e202d3036a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526002600060406000601773945304eb96065b2a98b57a48a06ae28d285a71b561c350f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/callerAccountBalance.json b/GeneralStateTests/stSystemOperationsTest/callerAccountBalance.json
index 6ceb27dcc..a5b555e75 100644
--- a/GeneralStateTests/stSystemOperationsTest/callerAccountBalance.json
+++ b/GeneralStateTests/stSystemOperationsTest/callerAccountBalance.json
@@ -1,17 +1,17 @@
 {
     "callerAccountBalance" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "710a9fb9288bf74ee9432386b671bf6749744934cb9b2a2925353560957d7d2e",
+                    "hash" : "0x710a9fb9288bf74ee9432386b671bf6749744934cb9b2a2925353560957d7d2e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "710a9fb9288bf74ee9432386b671bf6749744934cb9b2a2925353560957d7d2e",
+                    "hash" : "0x710a9fb9288bf74ee9432386b671bf6749744934cb9b2a2925353560957d7d2e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b280489f0c73c0193849da3c965ce2437f3eef1a2b68152630a844e903c57bde",
+                    "hash" : "0xb280489f0c73c0193849da3c965ce2437f3eef1a2b68152630a844e903c57bde",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b280489f0c73c0193849da3c965ce2437f3eef1a2b68152630a844e903c57bde",
+                    "hash" : "0xb280489f0c73c0193849da3c965ce2437f3eef1a2b68152630a844e903c57bde",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "710a9fb9288bf74ee9432386b671bf6749744934cb9b2a2925353560957d7d2e",
+                    "hash" : "0x710a9fb9288bf74ee9432386b671bf6749744934cb9b2a2925353560957d7d2e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x3331600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "10000000"
+                "0x989680"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/createNameRegistrator.json b/GeneralStateTests/stSystemOperationsTest/createNameRegistrator.json
index 9527a41f7..6dd6f6fd5 100644
--- a/GeneralStateTests/stSystemOperationsTest/createNameRegistrator.json
+++ b/GeneralStateTests/stSystemOperationsTest/createNameRegistrator.json
@@ -1,17 +1,17 @@
 {
     "createNameRegistrator" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x05f5e100",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "5c10031877a1bb9d9a87739caa56232f09aecd78b7b4bc00930ca3f5c1144275",
+                    "hash" : "0x5c10031877a1bb9d9a87739caa56232f09aecd78b7b4bc00930ca3f5c1144275",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f1770913799fff90a6dc218afa00ef98bb9ed6cecbbe5a8e31943c9edce09332",
+                    "hash" : "0xf1770913799fff90a6dc218afa00ef98bb9ed6cecbbe5a8e31943c9edce09332",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5c10031877a1bb9d9a87739caa56232f09aecd78b7b4bc00930ca3f5c1144275",
+                    "hash" : "0x5c10031877a1bb9d9a87739caa56232f09aecd78b7b4bc00930ca3f5c1144275",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5c10031877a1bb9d9a87739caa56232f09aecd78b7b4bc00930ca3f5c1144275",
+                    "hash" : "0x5c10031877a1bb9d9a87739caa56232f09aecd78b7b4bc00930ca3f5c1144275",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f1770913799fff90a6dc218afa00ef98bb9ed6cecbbe5a8e31943c9edce09332",
+                    "hash" : "0xf1770913799fff90a6dc218afa00ef98bb9ed6cecbbe5a8e31943c9edce09332",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7c601080600c6000396000f3006000355415600957005b60203560003555600052601d60036017f0600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "300000"
+                "0x0493e0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/createNameRegistratorOOG_MemExpansionOOV.json b/GeneralStateTests/stSystemOperationsTest/createNameRegistratorOOG_MemExpansionOOV.json
index df2e891a4..87faac55c 100644
--- a/GeneralStateTests/stSystemOperationsTest/createNameRegistratorOOG_MemExpansionOOV.json
+++ b/GeneralStateTests/stSystemOperationsTest/createNameRegistratorOOG_MemExpansionOOV.json
@@ -1,17 +1,17 @@
 {
     "createNameRegistratorOOG_MemExpansionOOV" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1445168607eec4569321c8c3ed83f04298957bb89ca90ff1c2663f194f14d3ad",
+                    "hash" : "0x1445168607eec4569321c8c3ed83f04298957bb89ca90ff1c2663f194f14d3ad",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "1445168607eec4569321c8c3ed83f04298957bb89ca90ff1c2663f194f14d3ad",
+                    "hash" : "0x1445168607eec4569321c8c3ed83f04298957bb89ca90ff1c2663f194f14d3ad",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "1445168607eec4569321c8c3ed83f04298957bb89ca90ff1c2663f194f14d3ad",
+                    "hash" : "0x1445168607eec4569321c8c3ed83f04298957bb89ca90ff1c2663f194f14d3ad",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "1445168607eec4569321c8c3ed83f04298957bb89ca90ff1c2663f194f14d3ad",
+                    "hash" : "0x1445168607eec4569321c8c3ed83f04298957bb89ca90ff1c2663f194f14d3ad",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "1445168607eec4569321c8c3ed83f04298957bb89ca90ff1c2663f194f14d3ad",
+                    "hash" : "0x1445168607eec4569321c8c3ed83f04298957bb89ca90ff1c2663f194f14d3ad",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x2710",
                 "code" : "0x7c601080600c6000396000f3006000355415600957005b602035600035556000526affffffffffffffffffffff6003612af8f0600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "300000"
+                "0x0493e0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/createNameRegistratorOutOfMemoryBonds0.json b/GeneralStateTests/stSystemOperationsTest/createNameRegistratorOutOfMemoryBonds0.json
index 8f2111c2d..83ceb5040 100644
--- a/GeneralStateTests/stSystemOperationsTest/createNameRegistratorOutOfMemoryBonds0.json
+++ b/GeneralStateTests/stSystemOperationsTest/createNameRegistratorOutOfMemoryBonds0.json
@@ -1,17 +1,17 @@
 {
     "createNameRegistratorOutOfMemoryBonds0" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "2516c1bbc89361b6de0cf1a0dd37c29eb1fb5443e6b61d30995c582b1f382ba7",
+                    "hash" : "0x2516c1bbc89361b6de0cf1a0dd37c29eb1fb5443e6b61d30995c582b1f382ba7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "2516c1bbc89361b6de0cf1a0dd37c29eb1fb5443e6b61d30995c582b1f382ba7",
+                    "hash" : "0x2516c1bbc89361b6de0cf1a0dd37c29eb1fb5443e6b61d30995c582b1f382ba7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2516c1bbc89361b6de0cf1a0dd37c29eb1fb5443e6b61d30995c582b1f382ba7",
+                    "hash" : "0x2516c1bbc89361b6de0cf1a0dd37c29eb1fb5443e6b61d30995c582b1f382ba7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "2516c1bbc89361b6de0cf1a0dd37c29eb1fb5443e6b61d30995c582b1f382ba7",
+                    "hash" : "0x2516c1bbc89361b6de0cf1a0dd37c29eb1fb5443e6b61d30995c582b1f382ba7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "2516c1bbc89361b6de0cf1a0dd37c29eb1fb5443e6b61d30995c582b1f382ba7",
+                    "hash" : "0x2516c1bbc89361b6de0cf1a0dd37c29eb1fb5443e6b61d30995c582b1f382ba7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7c601080600c6000396000f3006000355415600957005b60203560003555600052601d650fffffffffff6017f0600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "300000"
+                "0x0493e0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/createNameRegistratorOutOfMemoryBonds1.json b/GeneralStateTests/stSystemOperationsTest/createNameRegistratorOutOfMemoryBonds1.json
index ca04eb7d3..7975209c8 100644
--- a/GeneralStateTests/stSystemOperationsTest/createNameRegistratorOutOfMemoryBonds1.json
+++ b/GeneralStateTests/stSystemOperationsTest/createNameRegistratorOutOfMemoryBonds1.json
@@ -1,17 +1,17 @@
 {
     "createNameRegistratorOutOfMemoryBonds1" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b3e49d40bee33d67c1805b9016d7166c327d4a0e0e886e3b8ff8775adfdd7909",
+                    "hash" : "0xb3e49d40bee33d67c1805b9016d7166c327d4a0e0e886e3b8ff8775adfdd7909",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b3e49d40bee33d67c1805b9016d7166c327d4a0e0e886e3b8ff8775adfdd7909",
+                    "hash" : "0xb3e49d40bee33d67c1805b9016d7166c327d4a0e0e886e3b8ff8775adfdd7909",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b3e49d40bee33d67c1805b9016d7166c327d4a0e0e886e3b8ff8775adfdd7909",
+                    "hash" : "0xb3e49d40bee33d67c1805b9016d7166c327d4a0e0e886e3b8ff8775adfdd7909",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b3e49d40bee33d67c1805b9016d7166c327d4a0e0e886e3b8ff8775adfdd7909",
+                    "hash" : "0xb3e49d40bee33d67c1805b9016d7166c327d4a0e0e886e3b8ff8775adfdd7909",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b3e49d40bee33d67c1805b9016d7166c327d4a0e0e886e3b8ff8775adfdd7909",
+                    "hash" : "0xb3e49d40bee33d67c1805b9016d7166c327d4a0e0e886e3b8ff8775adfdd7909",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7c601080600c6000396000f3006000355415600957005b60203560003555600052650fffffffffff60036017f0600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "300000"
+                "0x0493e0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/createNameRegistratorValueTooHigh.json b/GeneralStateTests/stSystemOperationsTest/createNameRegistratorValueTooHigh.json
index eaff5fb33..88e88861f 100644
--- a/GeneralStateTests/stSystemOperationsTest/createNameRegistratorValueTooHigh.json
+++ b/GeneralStateTests/stSystemOperationsTest/createNameRegistratorValueTooHigh.json
@@ -1,17 +1,17 @@
 {
     "createNameRegistratorValueTooHigh" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "92152a14da785d61543ce9241c8562e55b97dd1f4af60190a30f7d045d8014b1",
+                    "hash" : "0x92152a14da785d61543ce9241c8562e55b97dd1f4af60190a30f7d045d8014b1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "92152a14da785d61543ce9241c8562e55b97dd1f4af60190a30f7d045d8014b1",
+                    "hash" : "0x92152a14da785d61543ce9241c8562e55b97dd1f4af60190a30f7d045d8014b1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "92152a14da785d61543ce9241c8562e55b97dd1f4af60190a30f7d045d8014b1",
+                    "hash" : "0x92152a14da785d61543ce9241c8562e55b97dd1f4af60190a30f7d045d8014b1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "92152a14da785d61543ce9241c8562e55b97dd1f4af60190a30f7d045d8014b1",
+                    "hash" : "0x92152a14da785d61543ce9241c8562e55b97dd1f4af60190a30f7d045d8014b1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "92152a14da785d61543ce9241c8562e55b97dd1f4af60190a30f7d045d8014b1",
+                    "hash" : "0x92152a14da785d61543ce9241c8562e55b97dd1f4af60190a30f7d045d8014b1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7c601080600c6000396000f3006000355415600957005b60203560003555600052601d6003670de0b6b3a7640001f0600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "300000"
+                "0x0493e0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/createNameRegistratorZeroMem.json b/GeneralStateTests/stSystemOperationsTest/createNameRegistratorZeroMem.json
index 6c1e9add0..9a409c3d5 100644
--- a/GeneralStateTests/stSystemOperationsTest/createNameRegistratorZeroMem.json
+++ b/GeneralStateTests/stSystemOperationsTest/createNameRegistratorZeroMem.json
@@ -1,17 +1,17 @@
 {
     "createNameRegistratorZeroMem" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "534c4ab86305a6e229b8e02dc82bcbdadbf0181384643b14ee0ed128a3a30764",
+                    "hash" : "0x534c4ab86305a6e229b8e02dc82bcbdadbf0181384643b14ee0ed128a3a30764",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d9804558d3cf4692b46acf3d314718d66552150ecb7c8cde1057d366fe1fd3dd",
+                    "hash" : "0xd9804558d3cf4692b46acf3d314718d66552150ecb7c8cde1057d366fe1fd3dd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "534c4ab86305a6e229b8e02dc82bcbdadbf0181384643b14ee0ed128a3a30764",
+                    "hash" : "0x534c4ab86305a6e229b8e02dc82bcbdadbf0181384643b14ee0ed128a3a30764",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "534c4ab86305a6e229b8e02dc82bcbdadbf0181384643b14ee0ed128a3a30764",
+                    "hash" : "0x534c4ab86305a6e229b8e02dc82bcbdadbf0181384643b14ee0ed128a3a30764",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d9804558d3cf4692b46acf3d314718d66552150ecb7c8cde1057d366fe1fd3dd",
+                    "hash" : "0xd9804558d3cf4692b46acf3d314718d66552150ecb7c8cde1057d366fe1fd3dd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7c601080600c6000396000f3006000355415600957005b60203560003555600052600060036017f0600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "300000"
+                "0x0493e0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/createNameRegistratorZeroMem2.json b/GeneralStateTests/stSystemOperationsTest/createNameRegistratorZeroMem2.json
index ef7228d76..076dc02f6 100644
--- a/GeneralStateTests/stSystemOperationsTest/createNameRegistratorZeroMem2.json
+++ b/GeneralStateTests/stSystemOperationsTest/createNameRegistratorZeroMem2.json
@@ -1,17 +1,17 @@
 {
     "createNameRegistratorZeroMem2" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9315ff98ac078dee73c02ba0caf0432a65f4907d717c97f7939f6f1337aba928",
+                    "hash" : "0x9315ff98ac078dee73c02ba0caf0432a65f4907d717c97f7939f6f1337aba928",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7b9b9903aff8d72bc0f37ce4a4d93abaf13224c67f4929bb7db407c0ad20fc6f",
+                    "hash" : "0x7b9b9903aff8d72bc0f37ce4a4d93abaf13224c67f4929bb7db407c0ad20fc6f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9315ff98ac078dee73c02ba0caf0432a65f4907d717c97f7939f6f1337aba928",
+                    "hash" : "0x9315ff98ac078dee73c02ba0caf0432a65f4907d717c97f7939f6f1337aba928",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9315ff98ac078dee73c02ba0caf0432a65f4907d717c97f7939f6f1337aba928",
+                    "hash" : "0x9315ff98ac078dee73c02ba0caf0432a65f4907d717c97f7939f6f1337aba928",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7b9b9903aff8d72bc0f37ce4a4d93abaf13224c67f4929bb7db407c0ad20fc6f",
+                    "hash" : "0x7b9b9903aff8d72bc0f37ce4a4d93abaf13224c67f4929bb7db407c0ad20fc6f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7c601080600c6000396000f3006000355415600957005b6020356000355560005260007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6017f0600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "300000"
+                "0x0493e0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/createNameRegistratorZeroMemExpansion.json b/GeneralStateTests/stSystemOperationsTest/createNameRegistratorZeroMemExpansion.json
index 78b781ae9..09907f7e5 100644
--- a/GeneralStateTests/stSystemOperationsTest/createNameRegistratorZeroMemExpansion.json
+++ b/GeneralStateTests/stSystemOperationsTest/createNameRegistratorZeroMemExpansion.json
@@ -1,17 +1,17 @@
 {
     "createNameRegistratorZeroMemExpansion" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "77d89db4fefd45c31e64ecd2fb991651c5ce1a1b3e3cf3171395f571bc9b9417",
+                    "hash" : "0x77d89db4fefd45c31e64ecd2fb991651c5ce1a1b3e3cf3171395f571bc9b9417",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "91f70b0f7060391efb1037b8f590f310eefe601db4ec9915e1af5b451efdf8c4",
+                    "hash" : "0x91f70b0f7060391efb1037b8f590f310eefe601db4ec9915e1af5b451efdf8c4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "77d89db4fefd45c31e64ecd2fb991651c5ce1a1b3e3cf3171395f571bc9b9417",
+                    "hash" : "0x77d89db4fefd45c31e64ecd2fb991651c5ce1a1b3e3cf3171395f571bc9b9417",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "77d89db4fefd45c31e64ecd2fb991651c5ce1a1b3e3cf3171395f571bc9b9417",
+                    "hash" : "0x77d89db4fefd45c31e64ecd2fb991651c5ce1a1b3e3cf3171395f571bc9b9417",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "91f70b0f7060391efb1037b8f590f310eefe601db4ec9915e1af5b451efdf8c4",
+                    "hash" : "0x91f70b0f7060391efb1037b8f590f310eefe601db4ec9915e1af5b451efdf8c4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7c601080600c6000396000f3006000355415600957005b60203560003555600052600060006017f0600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "300000"
+                "0x0493e0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/createWithInvalidOpcode.json b/GeneralStateTests/stSystemOperationsTest/createWithInvalidOpcode.json
index c471080ae..b7f29837a 100644
--- a/GeneralStateTests/stSystemOperationsTest/createWithInvalidOpcode.json
+++ b/GeneralStateTests/stSystemOperationsTest/createWithInvalidOpcode.json
@@ -1,17 +1,17 @@
 {
     "createWithInvalidOpcode" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "36a506299d0982a91b9bf1d7f1f1415300eef03b33597d4d05b85c7db2854ccf",
+                    "hash" : "0x36a506299d0982a91b9bf1d7f1f1415300eef03b33597d4d05b85c7db2854ccf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "36a506299d0982a91b9bf1d7f1f1415300eef03b33597d4d05b85c7db2854ccf",
+                    "hash" : "0x36a506299d0982a91b9bf1d7f1f1415300eef03b33597d4d05b85c7db2854ccf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "15fba448e5949b4f68452110f29013eb1fbe319463ea33a64e1485a6c526ee82",
+                    "hash" : "0x15fba448e5949b4f68452110f29013eb1fbe319463ea33a64e1485a6c526ee82",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "15fba448e5949b4f68452110f29013eb1fbe319463ea33a64e1485a6c526ee82",
+                    "hash" : "0x15fba448e5949b4f68452110f29013eb1fbe319463ea33a64e1485a6c526ee82",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "36a506299d0982a91b9bf1d7f1f1415300eef03b33597d4d05b85c7db2854ccf",
+                    "hash" : "0x36a506299d0982a91b9bf1d7f1f1415300eef03b33597d4d05b85c7db2854ccf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x444242424245434253f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "300000"
+                "0x0493e0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/currentAccountBalance.json b/GeneralStateTests/stSystemOperationsTest/currentAccountBalance.json
index 77d6ca602..1d1b71646 100644
--- a/GeneralStateTests/stSystemOperationsTest/currentAccountBalance.json
+++ b/GeneralStateTests/stSystemOperationsTest/currentAccountBalance.json
@@ -1,17 +1,17 @@
 {
     "currentAccountBalance" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e406da1a46079816711c71e26a7b47a2865a87ed03ab12df7dc2317f651a3fd8",
+                    "hash" : "0xe406da1a46079816711c71e26a7b47a2865a87ed03ab12df7dc2317f651a3fd8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e406da1a46079816711c71e26a7b47a2865a87ed03ab12df7dc2317f651a3fd8",
+                    "hash" : "0xe406da1a46079816711c71e26a7b47a2865a87ed03ab12df7dc2317f651a3fd8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "da6372df6637d722d7cbe4b808111af5ae8aefa80dbc8396f55030cf1a56d624",
+                    "hash" : "0xda6372df6637d722d7cbe4b808111af5ae8aefa80dbc8396f55030cf1a56d624",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "da6372df6637d722d7cbe4b808111af5ae8aefa80dbc8396f55030cf1a56d624",
+                    "hash" : "0xda6372df6637d722d7cbe4b808111af5ae8aefa80dbc8396f55030cf1a56d624",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e406da1a46079816711c71e26a7b47a2865a87ed03ab12df7dc2317f651a3fd8",
+                    "hash" : "0xe406da1a46079816711c71e26a7b47a2865a87ed03ab12df7dc2317f651a3fd8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x3031600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "10000000"
+                "0x989680"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/extcodecopy.json b/GeneralStateTests/stSystemOperationsTest/extcodecopy.json
index c9fc77b97..2e4fc3f2a 100644
--- a/GeneralStateTests/stSystemOperationsTest/extcodecopy.json
+++ b/GeneralStateTests/stSystemOperationsTest/extcodecopy.json
@@ -1,17 +1,17 @@
 {
     "extcodecopy" : {
         "env" : {
-            "currentCoinbase" : "4401fcaf7d64d53fb1cfc5c9045c32aa919a8c82",
+            "currentCoinbase" : "0x4401fcaf7d64d53fb1cfc5c9045c32aa919a8c82",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x58272e28",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "d30f77155de00f207ad60109897e790f73e9f3431be25717bf3651d91949f041"
+            "previousHash" : "0xd30f77155de00f207ad60109897e790f73e9f3431be25717bf3651d91949f041"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "32c08fc32999efafc4aed330782b49171c3caf851285f65c06182baa0d8f4aa4",
+                    "hash" : "0x32c08fc32999efafc4aed330782b49171c3caf851285f65c06182baa0d8f4aa4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "32c08fc32999efafc4aed330782b49171c3caf851285f65c06182baa0d8f4aa4",
+                    "hash" : "0x32c08fc32999efafc4aed330782b49171c3caf851285f65c06182baa0d8f4aa4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "19cf4c2d1e51b64210c6fe4b0094f8e592a5ac333234495a948f6a3c694453e3",
+                    "hash" : "0x19cf4c2d1e51b64210c6fe4b0094f8e592a5ac333234495a948f6a3c694453e3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "19cf4c2d1e51b64210c6fe4b0094f8e592a5ac333234495a948f6a3c694453e3",
+                    "hash" : "0x19cf4c2d1e51b64210c6fe4b0094f8e592a5ac333234495a948f6a3c694453e3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "32c08fc32999efafc4aed330782b49171c3caf851285f65c06182baa0d8f4aa4",
+                    "hash" : "0x32c08fc32999efafc4aed330782b49171c3caf851285f65c06182baa0d8f4aa4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x05c81eb0",
                 "code" : "0x7f15688566a82f5f946c68028bf626b349e495daa43e33529a76437ac416cd1b7d6e7dae7454bb193b1c28e64a6a935bc373cea0c5cc171fa61277e5604a3bc8aef4de3d38820658600b80797ada6e82e95f6520383f95f5c7dae56b4dc13b6f22ecabfce07c3cff51",
                 "nonce" : "0xfe",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x4d6769f8",
                 "code" : "0x5a60106017601160116018601c600f601b601d5f60026013600f601a8d5a5b7679177b5dd41a23db52998c4dcd14e88390dcc9f3ed5783601660145f6013600d601f60016011600e600c600d601f60138c7a58f20fd882eb51408a52e569ce80e93270ab53ae9de3fec5498a5c72ce1fcd11bb1553736959df779a616b738c1f407c12459490afe302da311a673488d09e71041d0761dee4829e3c38e0b1b1787810f2e11e2289983c1ab47cf5ebd38c12f1719232b5f3a7b27a9ea8858a071c4169392ec725646311235cbd9534e5d7cd8cb5e2287738a43f803384f4e62fe6629ea2e609a71759edab5c3a58b87e94c95f710aa6059b0663c9f374ce6ea0a000c5d594c41252d4a74d64896a987cc57c24df2ce8ffb85adcc27dce2d19f7006fbc1c5a7b79a319418fd6c27ddebcf170192262d82c1053333f6115c8b258b81e2e84d723c98dbd4535de7f922723a15827bbcfd07f9e2c5027c7736ed68c61b332059d7ec1bae1c1fd41a361d35b996d9740a588b6abf3293236afb927717328c014846148ce67eaf2b33d90672366dafeaae0714eb39e7fd5076a831d8eb4a3546288a3e1a0087aebe80b6bbfa4041330b05d094a697236fe7654d8a7ce630f83a832620125d781666e898f7fdcfd0031",
                 "nonce" : "0xdd",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x4f6ca7b90ceb5fd4",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -92,8 +92,8 @@
             ],
             "gasPrice" : "0x1cd49878",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x24a39757"
             ]
diff --git a/GeneralStateTests/stSystemOperationsTest/return0.json b/GeneralStateTests/stSystemOperationsTest/return0.json
index d92a4202b..440239cb9 100644
--- a/GeneralStateTests/stSystemOperationsTest/return0.json
+++ b/GeneralStateTests/stSystemOperationsTest/return0.json
@@ -1,17 +1,17 @@
 {
     "return0" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a7c787bf470808896308c215e22c7a580a0087bb6db6e8695fb4759537283a83",
+                    "hash" : "0xa7c787bf470808896308c215e22c7a580a0087bb6db6e8695fb4759537283a83",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a7c787bf470808896308c215e22c7a580a0087bb6db6e8695fb4759537283a83",
+                    "hash" : "0xa7c787bf470808896308c215e22c7a580a0087bb6db6e8695fb4759537283a83",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a7c787bf470808896308c215e22c7a580a0087bb6db6e8695fb4759537283a83",
+                    "hash" : "0xa7c787bf470808896308c215e22c7a580a0087bb6db6e8695fb4759537283a83",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a7c787bf470808896308c215e22c7a580a0087bb6db6e8695fb4759537283a83",
+                    "hash" : "0xa7c787bf470808896308c215e22c7a580a0087bb6db6e8695fb4759537283a83",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a7c787bf470808896308c215e22c7a580a0087bb6db6e8695fb4759537283a83",
+                    "hash" : "0xa7c787bf470808896308c215e22c7a580a0087bb6db6e8695fb4759537283a83",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x17",
                 "code" : "0x603760005360016000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1000000"
+                "0x0f4240"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/return1.json b/GeneralStateTests/stSystemOperationsTest/return1.json
index ebaf0f7c8..3904f5e8a 100644
--- a/GeneralStateTests/stSystemOperationsTest/return1.json
+++ b/GeneralStateTests/stSystemOperationsTest/return1.json
@@ -1,17 +1,17 @@
 {
     "return1" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "5da89a7173f6b194b2ef83c7cd2f29e943718cba518db29ec7b9b2b92ccbb50a",
+                    "hash" : "0x5da89a7173f6b194b2ef83c7cd2f29e943718cba518db29ec7b9b2b92ccbb50a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "5da89a7173f6b194b2ef83c7cd2f29e943718cba518db29ec7b9b2b92ccbb50a",
+                    "hash" : "0x5da89a7173f6b194b2ef83c7cd2f29e943718cba518db29ec7b9b2b92ccbb50a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5da89a7173f6b194b2ef83c7cd2f29e943718cba518db29ec7b9b2b92ccbb50a",
+                    "hash" : "0x5da89a7173f6b194b2ef83c7cd2f29e943718cba518db29ec7b9b2b92ccbb50a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5da89a7173f6b194b2ef83c7cd2f29e943718cba518db29ec7b9b2b92ccbb50a",
+                    "hash" : "0x5da89a7173f6b194b2ef83c7cd2f29e943718cba518db29ec7b9b2b92ccbb50a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "5da89a7173f6b194b2ef83c7cd2f29e943718cba518db29ec7b9b2b92ccbb50a",
+                    "hash" : "0x5da89a7173f6b194b2ef83c7cd2f29e943718cba518db29ec7b9b2b92ccbb50a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x17",
                 "code" : "0x603760005360026000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1000000"
+                "0x0f4240"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/return2.json b/GeneralStateTests/stSystemOperationsTest/return2.json
index 41801030a..27ce96af8 100644
--- a/GeneralStateTests/stSystemOperationsTest/return2.json
+++ b/GeneralStateTests/stSystemOperationsTest/return2.json
@@ -1,17 +1,17 @@
 {
     "return2" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9e8b9b791e28d533bc6acbafdb895c6b1708daf9580c0d5671507b667906efee",
+                    "hash" : "0x9e8b9b791e28d533bc6acbafdb895c6b1708daf9580c0d5671507b667906efee",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9e8b9b791e28d533bc6acbafdb895c6b1708daf9580c0d5671507b667906efee",
+                    "hash" : "0x9e8b9b791e28d533bc6acbafdb895c6b1708daf9580c0d5671507b667906efee",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9e8b9b791e28d533bc6acbafdb895c6b1708daf9580c0d5671507b667906efee",
+                    "hash" : "0x9e8b9b791e28d533bc6acbafdb895c6b1708daf9580c0d5671507b667906efee",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9e8b9b791e28d533bc6acbafdb895c6b1708daf9580c0d5671507b667906efee",
+                    "hash" : "0x9e8b9b791e28d533bc6acbafdb895c6b1708daf9580c0d5671507b667906efee",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9e8b9b791e28d533bc6acbafdb895c6b1708daf9580c0d5671507b667906efee",
+                    "hash" : "0x9e8b9b791e28d533bc6acbafdb895c6b1708daf9580c0d5671507b667906efee",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x17",
                 "code" : "0x603760005360216000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1000000"
+                "0x0f4240"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/suicideAddress.json b/GeneralStateTests/stSystemOperationsTest/suicideAddress.json
index 139f9e85b..88b22d789 100644
--- a/GeneralStateTests/stSystemOperationsTest/suicideAddress.json
+++ b/GeneralStateTests/stSystemOperationsTest/suicideAddress.json
@@ -1,17 +1,17 @@
 {
     "suicideAddress" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "518390cc204dd02fd071a3d9f81dfac8916abb6d0302c84a106e60af7f38fc2c",
+                    "hash" : "0x518390cc204dd02fd071a3d9f81dfac8916abb6d0302c84a106e60af7f38fc2c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "518390cc204dd02fd071a3d9f81dfac8916abb6d0302c84a106e60af7f38fc2c",
+                    "hash" : "0x518390cc204dd02fd071a3d9f81dfac8916abb6d0302c84a106e60af7f38fc2c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "0db310830a928b7de2a28ec1946219efb4ff64af40820004f8abacf1228b4234",
+                    "hash" : "0x0db310830a928b7de2a28ec1946219efb4ff64af40820004f8abacf1228b4234",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "0db310830a928b7de2a28ec1946219efb4ff64af40820004f8abacf1228b4234",
+                    "hash" : "0x0db310830a928b7de2a28ec1946219efb4ff64af40820004f8abacf1228b4234",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "518390cc204dd02fd071a3d9f81dfac8916abb6d0302c84a106e60af7f38fc2c",
+                    "hash" : "0x518390cc204dd02fd071a3d9f81dfac8916abb6d0302c84a106e60af7f38fc2c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x3060005530ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1000000"
+                "0x0f4240"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/suicideCaller.json b/GeneralStateTests/stSystemOperationsTest/suicideCaller.json
index 325ea5615..524777b93 100644
--- a/GeneralStateTests/stSystemOperationsTest/suicideCaller.json
+++ b/GeneralStateTests/stSystemOperationsTest/suicideCaller.json
@@ -1,17 +1,17 @@
 {
     "suicideCaller" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "576dcd5dcb6162373e6ba62f6c42c2fb2c1f47f34987e1acab5a90cea6f717ee",
+                    "hash" : "0x576dcd5dcb6162373e6ba62f6c42c2fb2c1f47f34987e1acab5a90cea6f717ee",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "576dcd5dcb6162373e6ba62f6c42c2fb2c1f47f34987e1acab5a90cea6f717ee",
+                    "hash" : "0x576dcd5dcb6162373e6ba62f6c42c2fb2c1f47f34987e1acab5a90cea6f717ee",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "df4f742ceccd065ac87e1f9628aefe26e48df34162c43ca000153edf036eb72c",
+                    "hash" : "0xdf4f742ceccd065ac87e1f9628aefe26e48df34162c43ca000153edf036eb72c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "df4f742ceccd065ac87e1f9628aefe26e48df34162c43ca000153edf036eb72c",
+                    "hash" : "0xdf4f742ceccd065ac87e1f9628aefe26e48df34162c43ca000153edf036eb72c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "576dcd5dcb6162373e6ba62f6c42c2fb2c1f47f34987e1acab5a90cea6f717ee",
+                    "hash" : "0x576dcd5dcb6162373e6ba62f6c42c2fb2c1f47f34987e1acab5a90cea6f717ee",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x3360005533ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1000000"
+                "0x0f4240"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/suicideCallerAddresTooBigLeft.json b/GeneralStateTests/stSystemOperationsTest/suicideCallerAddresTooBigLeft.json
index 25ba9efd8..42e7a2fd4 100644
--- a/GeneralStateTests/stSystemOperationsTest/suicideCallerAddresTooBigLeft.json
+++ b/GeneralStateTests/stSystemOperationsTest/suicideCallerAddresTooBigLeft.json
@@ -1,17 +1,17 @@
 {
     "suicideCallerAddresTooBigLeft" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "576dcd5dcb6162373e6ba62f6c42c2fb2c1f47f34987e1acab5a90cea6f717ee",
+                    "hash" : "0x576dcd5dcb6162373e6ba62f6c42c2fb2c1f47f34987e1acab5a90cea6f717ee",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "576dcd5dcb6162373e6ba62f6c42c2fb2c1f47f34987e1acab5a90cea6f717ee",
+                    "hash" : "0x576dcd5dcb6162373e6ba62f6c42c2fb2c1f47f34987e1acab5a90cea6f717ee",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "df4f742ceccd065ac87e1f9628aefe26e48df34162c43ca000153edf036eb72c",
+                    "hash" : "0xdf4f742ceccd065ac87e1f9628aefe26e48df34162c43ca000153edf036eb72c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "df4f742ceccd065ac87e1f9628aefe26e48df34162c43ca000153edf036eb72c",
+                    "hash" : "0xdf4f742ceccd065ac87e1f9628aefe26e48df34162c43ca000153edf036eb72c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "576dcd5dcb6162373e6ba62f6c42c2fb2c1f47f34987e1acab5a90cea6f717ee",
+                    "hash" : "0x576dcd5dcb6162373e6ba62f6c42c2fb2c1f47f34987e1acab5a90cea6f717ee",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x3360005574aaa94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1000000"
+                "0x0f4240"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/suicideCallerAddresTooBigRight.json b/GeneralStateTests/stSystemOperationsTest/suicideCallerAddresTooBigRight.json
index 59e25fdca..0a623bf85 100644
--- a/GeneralStateTests/stSystemOperationsTest/suicideCallerAddresTooBigRight.json
+++ b/GeneralStateTests/stSystemOperationsTest/suicideCallerAddresTooBigRight.json
@@ -1,17 +1,17 @@
 {
     "suicideCallerAddresTooBigRight" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "86e5b16db62bb628d4758fc198b131a72cad91c42e5b7ba6e34f7dd0040a4c4f",
+                    "hash" : "0x86e5b16db62bb628d4758fc198b131a72cad91c42e5b7ba6e34f7dd0040a4c4f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "86e5b16db62bb628d4758fc198b131a72cad91c42e5b7ba6e34f7dd0040a4c4f",
+                    "hash" : "0x86e5b16db62bb628d4758fc198b131a72cad91c42e5b7ba6e34f7dd0040a4c4f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "95b1e818532526bdad03840e613d548f511f71b773bcc151be7c1df5aec55bb0",
+                    "hash" : "0x95b1e818532526bdad03840e613d548f511f71b773bcc151be7c1df5aec55bb0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "95b1e818532526bdad03840e613d548f511f71b773bcc151be7c1df5aec55bb0",
+                    "hash" : "0x95b1e818532526bdad03840e613d548f511f71b773bcc151be7c1df5aec55bb0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "86e5b16db62bb628d4758fc198b131a72cad91c42e5b7ba6e34f7dd0040a4c4f",
+                    "hash" : "0x86e5b16db62bb628d4758fc198b131a72cad91c42e5b7ba6e34f7dd0040a4c4f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x3360005574a94f5374fce5edbc8e2a8697c15331677e6ebf0baaff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1000000"
+                "0x0f4240"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/suicideCoinbase.json b/GeneralStateTests/stSystemOperationsTest/suicideCoinbase.json
index 2f635acae..446240182 100644
--- a/GeneralStateTests/stSystemOperationsTest/suicideCoinbase.json
+++ b/GeneralStateTests/stSystemOperationsTest/suicideCoinbase.json
@@ -1,17 +1,17 @@
 {
     "suicideCoinbase" : {
         "env" : {
-            "currentCoinbase" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "currentCoinbase" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6f0998481c651b0b5fe26d002bfd4b3759de8aafa7273b0f458ec594ffb39c51",
+                    "hash" : "0x6f0998481c651b0b5fe26d002bfd4b3759de8aafa7273b0f458ec594ffb39c51",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6f0998481c651b0b5fe26d002bfd4b3759de8aafa7273b0f458ec594ffb39c51",
+                    "hash" : "0x6f0998481c651b0b5fe26d002bfd4b3759de8aafa7273b0f458ec594ffb39c51",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "d250e0dc5c48a99a23e6a7fbca13303df995c2f8a049aef6fc3afa0e34df4ed4",
+                    "hash" : "0xd250e0dc5c48a99a23e6a7fbca13303df995c2f8a049aef6fc3afa0e34df4ed4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "d250e0dc5c48a99a23e6a7fbca13303df995c2f8a049aef6fc3afa0e34df4ed4",
+                    "hash" : "0xd250e0dc5c48a99a23e6a7fbca13303df995c2f8a049aef6fc3afa0e34df4ed4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6f0998481c651b0b5fe26d002bfd4b3759de8aafa7273b0f458ec594ffb39c51",
+                    "hash" : "0x6f0998481c651b0b5fe26d002bfd4b3759de8aafa7273b0f458ec594ffb39c51",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x73a94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1000000"
+                "0x0f4240"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/suicideNotExistingAccount.json b/GeneralStateTests/stSystemOperationsTest/suicideNotExistingAccount.json
index 0505ef24e..45781a89c 100644
--- a/GeneralStateTests/stSystemOperationsTest/suicideNotExistingAccount.json
+++ b/GeneralStateTests/stSystemOperationsTest/suicideNotExistingAccount.json
@@ -1,17 +1,17 @@
 {
     "suicideNotExistingAccount" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "0a255239a39dd83c975355c293c59afee89ec53443261f213be77c9fcd3517f7",
+                    "hash" : "0x0a255239a39dd83c975355c293c59afee89ec53443261f213be77c9fcd3517f7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "0a255239a39dd83c975355c293c59afee89ec53443261f213be77c9fcd3517f7",
+                    "hash" : "0x0a255239a39dd83c975355c293c59afee89ec53443261f213be77c9fcd3517f7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "c98d1cc9c8cac043798aba14849c7a9bdff792fd178a331004cf8ac6b4eeaee6",
+                    "hash" : "0xc98d1cc9c8cac043798aba14849c7a9bdff792fd178a331004cf8ac6b4eeaee6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c98d1cc9c8cac043798aba14849c7a9bdff792fd178a331004cf8ac6b4eeaee6",
+                    "hash" : "0xc98d1cc9c8cac043798aba14849c7a9bdff792fd178a331004cf8ac6b4eeaee6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0a255239a39dd83c975355c293c59afee89ec53443261f213be77c9fcd3517f7",
+                    "hash" : "0x0a255239a39dd83c975355c293c59afee89ec53443261f213be77c9fcd3517f7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x73aa1722f3947def4cf144679da39c4c32bdc35681ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1000000"
+                "0x0f4240"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/suicideOrigin.json b/GeneralStateTests/stSystemOperationsTest/suicideOrigin.json
index deb283bf8..4ef1a1ef3 100644
--- a/GeneralStateTests/stSystemOperationsTest/suicideOrigin.json
+++ b/GeneralStateTests/stSystemOperationsTest/suicideOrigin.json
@@ -1,17 +1,17 @@
 {
     "suicideOrigin" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "576dcd5dcb6162373e6ba62f6c42c2fb2c1f47f34987e1acab5a90cea6f717ee",
+                    "hash" : "0x576dcd5dcb6162373e6ba62f6c42c2fb2c1f47f34987e1acab5a90cea6f717ee",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "576dcd5dcb6162373e6ba62f6c42c2fb2c1f47f34987e1acab5a90cea6f717ee",
+                    "hash" : "0x576dcd5dcb6162373e6ba62f6c42c2fb2c1f47f34987e1acab5a90cea6f717ee",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "df4f742ceccd065ac87e1f9628aefe26e48df34162c43ca000153edf036eb72c",
+                    "hash" : "0xdf4f742ceccd065ac87e1f9628aefe26e48df34162c43ca000153edf036eb72c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "df4f742ceccd065ac87e1f9628aefe26e48df34162c43ca000153edf036eb72c",
+                    "hash" : "0xdf4f742ceccd065ac87e1f9628aefe26e48df34162c43ca000153edf036eb72c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "576dcd5dcb6162373e6ba62f6c42c2fb2c1f47f34987e1acab5a90cea6f717ee",
+                    "hash" : "0x576dcd5dcb6162373e6ba62f6c42c2fb2c1f47f34987e1acab5a90cea6f717ee",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x3260005532ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1000000"
+                "0x0f4240"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/suicideSendEtherPostDeath.json b/GeneralStateTests/stSystemOperationsTest/suicideSendEtherPostDeath.json
index 544bfcb03..4af971ba8 100644
--- a/GeneralStateTests/stSystemOperationsTest/suicideSendEtherPostDeath.json
+++ b/GeneralStateTests/stSystemOperationsTest/suicideSendEtherPostDeath.json
@@ -1,17 +1,17 @@
 {
     "suicideSendEtherPostDeath" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c53f10f790e3881fb81df07ff8b29693aa11f87177378494b81ee7d437a77468",
+                    "hash" : "0xc53f10f790e3881fb81df07ff8b29693aa11f87177378494b81ee7d437a77468",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c53f10f790e3881fb81df07ff8b29693aa11f87177378494b81ee7d437a77468",
+                    "hash" : "0xc53f10f790e3881fb81df07ff8b29693aa11f87177378494b81ee7d437a77468",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9f3c63ff818c14e4b56e5fa1fc03a76725f598bcac256668185ec51dfc1d7f5f",
+                    "hash" : "0x9f3c63ff818c14e4b56e5fa1fc03a76725f598bcac256668185ec51dfc1d7f5f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9f3c63ff818c14e4b56e5fa1fc03a76725f598bcac256668185ec51dfc1d7f5f",
+                    "hash" : "0x9f3c63ff818c14e4b56e5fa1fc03a76725f598bcac256668185ec51dfc1d7f5f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c53f10f790e3881fb81df07ff8b29693aa11f87177378494b81ee7d437a77468",
+                    "hash" : "0xc53f10f790e3881fb81df07ff8b29693aa11f87177378494b81ee7d437a77468",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60606040526000357c01000000000000000000000000000000000000000000000000000000009004806335f46994146100445780634d536fe31461005157610042565b005b61004f600450610072565b005b61005c60045061008d565b6040518082815260200191505060405180910390f35b3073ffffffffffffffffffffffffffffffffffffffff16ff5b565b600060003073ffffffffffffffffffffffffffffffffffffffff166335f46994604051817c01000000000000000000000000000000000000000000000000000000000281526004018090506000604051808303816000876161da5a03f115610002575050503073ffffffffffffffffffffffffffffffffffffffff163190503373ffffffffffffffffffffffffffffffffffffffff16600082604051809050600060405180830381858888f1935050505050809150610147565b509056",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -85,8 +85,8 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
                 "0x0186a0"
             ]
diff --git a/GeneralStateTests/stSystemOperationsTest/suicideSendEtherToMe.json b/GeneralStateTests/stSystemOperationsTest/suicideSendEtherToMe.json
index aeec97fa4..e413c9431 100644
--- a/GeneralStateTests/stSystemOperationsTest/suicideSendEtherToMe.json
+++ b/GeneralStateTests/stSystemOperationsTest/suicideSendEtherToMe.json
@@ -1,17 +1,17 @@
 {
     "suicideSendEtherToMe" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b7fc4d877fa862ab30973e1cbfe88f8a09d502983844e4d5d4f5ff0bcb388b45",
+                    "hash" : "0xb7fc4d877fa862ab30973e1cbfe88f8a09d502983844e4d5d4f5ff0bcb388b45",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b7fc4d877fa862ab30973e1cbfe88f8a09d502983844e4d5d4f5ff0bcb388b45",
+                    "hash" : "0xb7fc4d877fa862ab30973e1cbfe88f8a09d502983844e4d5d4f5ff0bcb388b45",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9eb527b54a972a8566c46d406fa86b6d8d4efeeb7ba102713b58fec7f0e34f45",
+                    "hash" : "0x9eb527b54a972a8566c46d406fa86b6d8d4efeeb7ba102713b58fec7f0e34f45",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9eb527b54a972a8566c46d406fa86b6d8d4efeeb7ba102713b58fec7f0e34f45",
+                    "hash" : "0x9eb527b54a972a8566c46d406fa86b6d8d4efeeb7ba102713b58fec7f0e34f45",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b7fc4d877fa862ab30973e1cbfe88f8a09d502983844e4d5d4f5ff0bcb388b45",
+                    "hash" : "0xb7fc4d877fa862ab30973e1cbfe88f8a09d502983844e4d5d4f5ff0bcb388b45",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x30ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1000000"
+                "0x0f4240"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stSystemOperationsTest/testRandomTest.json b/GeneralStateTests/stSystemOperationsTest/testRandomTest.json
index 37dbd13dd..a2cc1d5bf 100644
--- a/GeneralStateTests/stSystemOperationsTest/testRandomTest.json
+++ b/GeneralStateTests/stSystemOperationsTest/testRandomTest.json
@@ -1,17 +1,17 @@
 {
     "testRandomTest" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "3a214e481c7334bd0d5e649795d955ec52badbf5df4988c47c9de6266257a932",
+                    "hash" : "0x3a214e481c7334bd0d5e649795d955ec52badbf5df4988c47c9de6266257a932",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "574a120dbb90647527d2be3cb7de28a73a7eaced54d64994d5d53636ac27f403",
+                    "hash" : "0x574a120dbb90647527d2be3cb7de28a73a7eaced54d64994d5d53636ac27f403",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3a214e481c7334bd0d5e649795d955ec52badbf5df4988c47c9de6266257a932",
+                    "hash" : "0x3a214e481c7334bd0d5e649795d955ec52badbf5df4988c47c9de6266257a932",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3a214e481c7334bd0d5e649795d955ec52badbf5df4988c47c9de6266257a932",
+                    "hash" : "0x3a214e481c7334bd0d5e649795d955ec52badbf5df4988c47c9de6266257a932",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "574a120dbb90647527d2be3cb7de28a73a7eaced54d64994d5d53636ac27f403",
+                    "hash" : "0x574a120dbb90647527d2be3cb7de28a73a7eaced54d64994d5d53636ac27f403",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x424443444243434383f0155af055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "300000"
+                "0x0493e0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransactionTest/ContractStoreClearsOOG.json b/GeneralStateTests/stTransactionTest/ContractStoreClearsOOG.json
index bc8140377..d9fb47f8c 100644
--- a/GeneralStateTests/stTransactionTest/ContractStoreClearsOOG.json
+++ b/GeneralStateTests/stTransactionTest/ContractStoreClearsOOG.json
@@ -1,17 +1,17 @@
 {
     "ContractStoreClearsOOG" : {
         "env" : {
-            "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "currentCoinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0186a0",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d58cdfde7bf06a7f91ab36dc0fb0710ba8a9275390553616ff29f7366882bb26",
+                    "hash" : "0xd58cdfde7bf06a7f91ab36dc0fb0710ba8a9275390553616ff29f7366882bb26",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d58cdfde7bf06a7f91ab36dc0fb0710ba8a9275390553616ff29f7366882bb26",
+                    "hash" : "0xd58cdfde7bf06a7f91ab36dc0fb0710ba8a9275390553616ff29f7366882bb26",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "d58cdfde7bf06a7f91ab36dc0fb0710ba8a9275390553616ff29f7366882bb26",
+                    "hash" : "0xd58cdfde7bf06a7f91ab36dc0fb0710ba8a9275390553616ff29f7366882bb26",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "d58cdfde7bf06a7f91ab36dc0fb0710ba8a9275390553616ff29f7366882bb26",
+                    "hash" : "0xd58cdfde7bf06a7f91ab36dc0fb0710ba8a9275390553616ff29f7366882bb26",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d58cdfde7bf06a7f91ab36dc0fb0710ba8a9275390553616ff29f7366882bb26",
+                    "hash" : "0xd58cdfde7bf06a7f91ab36dc0fb0710ba8a9275390553616ff29f7366882bb26",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,14 +61,14 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x7530",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "d2571607e241ecf590ed94b12d87c94babe36db6" : {
+            "0xd2571607e241ecf590ed94b12d87c94babe36db6" : {
                 "balance" : "0x00",
                 "code" : "0x600060005560006001556000600255600060035560006004556000600555600060065560006007556000600855600c600955",
                 "nonce" : "0x00",
@@ -91,14 +91,14 @@
                 ""
             ],
             "gasLimit" : [
-                "23000"
+                "0x59d8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "d2571607e241ecf590ed94b12d87c94babe36db6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xd2571607e241ecf590ed94b12d87c94babe36db6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransactionTest/ContractStoreClearsSuccess.json b/GeneralStateTests/stTransactionTest/ContractStoreClearsSuccess.json
index 978b3a4a3..d66f66d2e 100644
--- a/GeneralStateTests/stTransactionTest/ContractStoreClearsSuccess.json
+++ b/GeneralStateTests/stTransactionTest/ContractStoreClearsSuccess.json
@@ -1,17 +1,17 @@
 {
     "ContractStoreClearsSuccess" : {
         "env" : {
-            "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "currentCoinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "11cb0174dafbaca661204a3a104acf1d96d4f100b2d3db8bfec25cc7e595b545",
+                    "hash" : "0x11cb0174dafbaca661204a3a104acf1d96d4f100b2d3db8bfec25cc7e595b545",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "11cb0174dafbaca661204a3a104acf1d96d4f100b2d3db8bfec25cc7e595b545",
+                    "hash" : "0x11cb0174dafbaca661204a3a104acf1d96d4f100b2d3db8bfec25cc7e595b545",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "11cb0174dafbaca661204a3a104acf1d96d4f100b2d3db8bfec25cc7e595b545",
+                    "hash" : "0x11cb0174dafbaca661204a3a104acf1d96d4f100b2d3db8bfec25cc7e595b545",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "11cb0174dafbaca661204a3a104acf1d96d4f100b2d3db8bfec25cc7e595b545",
+                    "hash" : "0x11cb0174dafbaca661204a3a104acf1d96d4f100b2d3db8bfec25cc7e595b545",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "11cb0174dafbaca661204a3a104acf1d96d4f100b2d3db8bfec25cc7e595b545",
+                    "hash" : "0x11cb0174dafbaca661204a3a104acf1d96d4f100b2d3db8bfec25cc7e595b545",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,14 +61,14 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0222e0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "d2571607e241ecf590ed94b12d87c94babe36db6" : {
+            "0xd2571607e241ecf590ed94b12d87c94babe36db6" : {
                 "balance" : "0x00",
                 "code" : "0x6000600055600060015560006002556000600355600060045560006005556000600655600060075560006008556000600955",
                 "nonce" : "0x00",
@@ -91,14 +91,14 @@
                 ""
             ],
             "gasLimit" : [
-                "130000"
+                "0x01fbd0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "d2571607e241ecf590ed94b12d87c94babe36db6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xd2571607e241ecf590ed94b12d87c94babe36db6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransactionTest/CreateMessageReverted.json b/GeneralStateTests/stTransactionTest/CreateMessageReverted.json
index 678de2f9d..71830d7f4 100644
--- a/GeneralStateTests/stTransactionTest/CreateMessageReverted.json
+++ b/GeneralStateTests/stTransactionTest/CreateMessageReverted.json
@@ -1,17 +1,17 @@
 {
     "CreateMessageReverted" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0xe8d4a51000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6f792258c5a1e152c931e3af3e0ef180ad7ed52c1f84380f2beb660177e22c24",
+                    "hash" : "0x6f792258c5a1e152c931e3af3e0ef180ad7ed52c1f84380f2beb660177e22c24",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6f792258c5a1e152c931e3af3e0ef180ad7ed52c1f84380f2beb660177e22c24",
+                    "hash" : "0x6f792258c5a1e152c931e3af3e0ef180ad7ed52c1f84380f2beb660177e22c24",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6f792258c5a1e152c931e3af3e0ef180ad7ed52c1f84380f2beb660177e22c24",
+                    "hash" : "0x6f792258c5a1e152c931e3af3e0ef180ad7ed52c1f84380f2beb660177e22c24",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6f792258c5a1e152c931e3af3e0ef180ad7ed52c1f84380f2beb660177e22c24",
+                    "hash" : "0x6f792258c5a1e152c931e3af3e0ef180ad7ed52c1f84380f2beb660177e22c24",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6f792258c5a1e152c931e3af3e0ef180ad7ed52c1f84380f2beb660177e22c24",
+                    "hash" : "0x6f792258c5a1e152c931e3af3e0ef180ad7ed52c1f84380f2beb660177e22c24",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,14 +61,14 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x7530",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x64600c6000556000526005601b6000f0",
                 "nonce" : "0x00",
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "21882"
+                "0x557a"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "100"
+                "0x64"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransactionTest/CreateMessageSuccess.json b/GeneralStateTests/stTransactionTest/CreateMessageSuccess.json
index 43897ea96..da2cf0de9 100644
--- a/GeneralStateTests/stTransactionTest/CreateMessageSuccess.json
+++ b/GeneralStateTests/stTransactionTest/CreateMessageSuccess.json
@@ -1,17 +1,17 @@
 {
     "CreateMessageSuccess" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0xe8d4a51000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "558f7514aaadbe5e4b69005a110606c5bf1f764279c780141c1f1ecf8f53c382",
+                    "hash" : "0x558f7514aaadbe5e4b69005a110606c5bf1f764279c780141c1f1ecf8f53c382",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "08c7dbdb0a5e0632c0c52b1bb4f89b154c719aa2acf88a54588cd67416005b3b",
+                    "hash" : "0x08c7dbdb0a5e0632c0c52b1bb4f89b154c719aa2acf88a54588cd67416005b3b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "558f7514aaadbe5e4b69005a110606c5bf1f764279c780141c1f1ecf8f53c382",
+                    "hash" : "0x558f7514aaadbe5e4b69005a110606c5bf1f764279c780141c1f1ecf8f53c382",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "558f7514aaadbe5e4b69005a110606c5bf1f764279c780141c1f1ecf8f53c382",
+                    "hash" : "0x558f7514aaadbe5e4b69005a110606c5bf1f764279c780141c1f1ecf8f53c382",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "08c7dbdb0a5e0632c0c52b1bb4f89b154c719aa2acf88a54588cd67416005b3b",
+                    "hash" : "0x08c7dbdb0a5e0632c0c52b1bb4f89b154c719aa2acf88a54588cd67416005b3b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,14 +61,14 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x061a80",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x64600c6000556000526005601b6000f0",
                 "nonce" : "0x00",
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "131882"
+                "0x02032a"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "100"
+                "0x64"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransactionTest/CreateTransactionReverted.json b/GeneralStateTests/stTransactionTest/CreateTransactionReverted.json
index a0a42bb82..45bb340a9 100644
--- a/GeneralStateTests/stTransactionTest/CreateTransactionReverted.json
+++ b/GeneralStateTests/stTransactionTest/CreateTransactionReverted.json
@@ -1,17 +1,17 @@
 {
     "CreateTransactionReverted" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0xe8d4a51000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9b14f6a3389ec380ae31529f0b6c4ba09010cd9553c900c7c0bb47207ff47177",
+                    "hash" : "0x9b14f6a3389ec380ae31529f0b6c4ba09010cd9553c900c7c0bb47207ff47177",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9b14f6a3389ec380ae31529f0b6c4ba09010cd9553c900c7c0bb47207ff47177",
+                    "hash" : "0x9b14f6a3389ec380ae31529f0b6c4ba09010cd9553c900c7c0bb47207ff47177",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9b14f6a3389ec380ae31529f0b6c4ba09010cd9553c900c7c0bb47207ff47177",
+                    "hash" : "0x9b14f6a3389ec380ae31529f0b6c4ba09010cd9553c900c7c0bb47207ff47177",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9b14f6a3389ec380ae31529f0b6c4ba09010cd9553c900c7c0bb47207ff47177",
+                    "hash" : "0x9b14f6a3389ec380ae31529f0b6c4ba09010cd9553c900c7c0bb47207ff47177",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9b14f6a3389ec380ae31529f0b6c4ba09010cd9553c900c7c0bb47207ff47177",
+                    "hash" : "0x9b14f6a3389ec380ae31529f0b6c4ba09010cd9553c900c7c0bb47207ff47177",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0203a0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -74,14 +74,14 @@
                 "0x602280600c6000396000f30060e060020a600035048063f8a8fd6d14601457005b601a6020565b60006000f35b56"
             ],
             "gasLimit" : [
-                "23679"
+                "0x5c7f"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                ""
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransactionTest/CreateTransactionSuccess.json b/GeneralStateTests/stTransactionTest/CreateTransactionSuccess.json
index 18abaafc2..8a32b1ddf 100644
--- a/GeneralStateTests/stTransactionTest/CreateTransactionSuccess.json
+++ b/GeneralStateTests/stTransactionTest/CreateTransactionSuccess.json
@@ -1,17 +1,17 @@
 {
     "CreateTransactionSuccess" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0xe8d4a51000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a0b82485d35279240c14e3d39dc992f4fe8af2e630902afe6c45c58f58ee2011",
+                    "hash" : "0xa0b82485d35279240c14e3d39dc992f4fe8af2e630902afe6c45c58f58ee2011",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "1059918f27d169135bee2387b01c9b62a0ebbd145c07d0a2651a7cd20af3b2e0",
+                    "hash" : "0x1059918f27d169135bee2387b01c9b62a0ebbd145c07d0a2651a7cd20af3b2e0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "7d12ba0d5a88efcfc293ed4a5f877db891be20380c0483f1800f19786c35dce2",
+                    "hash" : "0x7d12ba0d5a88efcfc293ed4a5f877db891be20380c0483f1800f19786c35dce2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a0b82485d35279240c14e3d39dc992f4fe8af2e630902afe6c45c58f58ee2011",
+                    "hash" : "0xa0b82485d35279240c14e3d39dc992f4fe8af2e630902afe6c45c58f58ee2011",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "1059918f27d169135bee2387b01c9b62a0ebbd145c07d0a2651a7cd20af3b2e0",
+                    "hash" : "0x1059918f27d169135bee2387b01c9b62a0ebbd145c07d0a2651a7cd20af3b2e0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -74,14 +74,14 @@
                 "0x602280600c6000396000f30060e060020a600035048063f8a8fd6d14601457005b601a6020565b60006000f35b56"
             ],
             "gasLimit" : [
-                "70000"
+                "0x011170"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "100"
+                "0x64"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransactionTest/EmptyTransaction.json b/GeneralStateTests/stTransactionTest/EmptyTransaction.json
index bd48805ac..e16ce0de6 100644
--- a/GeneralStateTests/stTransactionTest/EmptyTransaction.json
+++ b/GeneralStateTests/stTransactionTest/EmptyTransaction.json
@@ -1,17 +1,17 @@
 {
     "EmptyTransaction" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
+                    "hash" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
+                    "hash" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
+                    "hash" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
+                    "hash" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
+                    "hash" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -74,14 +74,14 @@
                 ""
             ],
             "gasLimit" : [
-                ""
+                "0x00"
             ],
             "gasPrice" : "0x00",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                ""
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransactionTest/EmptyTransaction2.json b/GeneralStateTests/stTransactionTest/EmptyTransaction2.json
index b263c2f78..b6d5cba65 100644
--- a/GeneralStateTests/stTransactionTest/EmptyTransaction2.json
+++ b/GeneralStateTests/stTransactionTest/EmptyTransaction2.json
@@ -1,17 +1,17 @@
 {
     "EmptyTransaction2" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7c9b70b846a70a1731baf76adc6ffc016628cdabb8b5e9b4ab84f5134dc6ac89",
+                    "hash" : "0x7c9b70b846a70a1731baf76adc6ffc016628cdabb8b5e9b4ab84f5134dc6ac89",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "2d2b88bc228443c611081f7db686b82a1beebe9d0fc79ce5e9604666e0b39fd0",
+                    "hash" : "0x2d2b88bc228443c611081f7db686b82a1beebe9d0fc79ce5e9604666e0b39fd0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "7c9b70b846a70a1731baf76adc6ffc016628cdabb8b5e9b4ab84f5134dc6ac89",
+                    "hash" : "0x7c9b70b846a70a1731baf76adc6ffc016628cdabb8b5e9b4ab84f5134dc6ac89",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "7c9b70b846a70a1731baf76adc6ffc016628cdabb8b5e9b4ab84f5134dc6ac89",
+                    "hash" : "0x7c9b70b846a70a1731baf76adc6ffc016628cdabb8b5e9b4ab84f5134dc6ac89",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "2d2b88bc228443c611081f7db686b82a1beebe9d0fc79ce5e9604666e0b39fd0",
+                    "hash" : "0x2d2b88bc228443c611081f7db686b82a1beebe9d0fc79ce5e9604666e0b39fd0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -74,14 +74,14 @@
                 ""
             ],
             "gasLimit" : [
-                "55000"
+                "0xd6d8"
             ],
             "gasPrice" : "0x00",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                ""
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransactionTest/EmptyTransaction3.json b/GeneralStateTests/stTransactionTest/EmptyTransaction3.json
index 3e2b3b968..3f683ecb1 100644
--- a/GeneralStateTests/stTransactionTest/EmptyTransaction3.json
+++ b/GeneralStateTests/stTransactionTest/EmptyTransaction3.json
@@ -1,17 +1,17 @@
 {
     "EmptyTransaction3" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "53f5b84edd82703a225e53e9ae3639729eb8e337098531456998af602b0ded0a",
+                    "hash" : "0x53f5b84edd82703a225e53e9ae3639729eb8e337098531456998af602b0ded0a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "01d55964b2d7eb43d050c308c5835cbc9d0d876a35fd855f063ca4fc424c4e28",
+                    "hash" : "0x01d55964b2d7eb43d050c308c5835cbc9d0d876a35fd855f063ca4fc424c4e28",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "cf29b86efa1b7f5f999ef519fcc921062924d5c14d78baf491252fbf5a0d85b8",
+                    "hash" : "0xcf29b86efa1b7f5f999ef519fcc921062924d5c14d78baf491252fbf5a0d85b8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "53f5b84edd82703a225e53e9ae3639729eb8e337098531456998af602b0ded0a",
+                    "hash" : "0x53f5b84edd82703a225e53e9ae3639729eb8e337098531456998af602b0ded0a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "01d55964b2d7eb43d050c308c5835cbc9d0d876a35fd855f063ca4fc424c4e28",
+                    "hash" : "0x01d55964b2d7eb43d050c308c5835cbc9d0d876a35fd855f063ca4fc424c4e28",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -74,14 +74,14 @@
                 ""
             ],
             "gasLimit" : [
-                "55000"
+                "0xd6d8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                ""
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransactionTest/HighGasLimit.json b/GeneralStateTests/stTransactionTest/HighGasLimit.json
index 3af38c7a9..32f566d38 100644
--- a/GeneralStateTests/stTransactionTest/HighGasLimit.json
+++ b/GeneralStateTests/stTransactionTest/HighGasLimit.json
@@ -1,17 +1,17 @@
 {
     "HighGasLimit" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "21c449a88c31cdfc758f8cfcdd080f1bb23d184737c62abd5192d079b5d69a30",
+                    "hash" : "0x21c449a88c31cdfc758f8cfcdd080f1bb23d184737c62abd5192d079b5d69a30",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "21c449a88c31cdfc758f8cfcdd080f1bb23d184737c62abd5192d079b5d69a30",
+                    "hash" : "0x21c449a88c31cdfc758f8cfcdd080f1bb23d184737c62abd5192d079b5d69a30",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "21c449a88c31cdfc758f8cfcdd080f1bb23d184737c62abd5192d079b5d69a30",
+                    "hash" : "0x21c449a88c31cdfc758f8cfcdd080f1bb23d184737c62abd5192d079b5d69a30",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "21c449a88c31cdfc758f8cfcdd080f1bb23d184737c62abd5192d079b5d69a30",
+                    "hash" : "0x21c449a88c31cdfc758f8cfcdd080f1bb23d184737c62abd5192d079b5d69a30",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "21c449a88c31cdfc758f8cfcdd080f1bb23d184737c62abd5192d079b5d69a30",
+                    "hash" : "0x21c449a88c31cdfc758f8cfcdd080f1bb23d184737c62abd5192d079b5d69a30",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -74,14 +74,14 @@
                 "0x3240349548983454"
             ],
             "gasLimit" : [
-                "1152921504606846976"
+                "0x1000000000000000"
             ],
             "gasPrice" : "0x07",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "900"
+                "0x0384"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimit.json b/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimit.json
index 292bca0ba..9da27c07f 100644
--- a/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimit.json
+++ b/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimit.json
@@ -1,17 +1,17 @@
 {
     "InternalCallHittingGasLimit" : {
         "env" : {
-            "currentCoinbase" : "2adf5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "currentCoinbase" : "0x2adf5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x55f0",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6930ba06a213125880c1a12a18ad56614bbb8d56d94599781965c83379db8ce2",
+                    "hash" : "0x6930ba06a213125880c1a12a18ad56614bbb8d56d94599781965c83379db8ce2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6930ba06a213125880c1a12a18ad56614bbb8d56d94599781965c83379db8ce2",
+                    "hash" : "0x6930ba06a213125880c1a12a18ad56614bbb8d56d94599781965c83379db8ce2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6930ba06a213125880c1a12a18ad56614bbb8d56d94599781965c83379db8ce2",
+                    "hash" : "0x6930ba06a213125880c1a12a18ad56614bbb8d56d94599781965c83379db8ce2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6930ba06a213125880c1a12a18ad56614bbb8d56d94599781965c83379db8ce2",
+                    "hash" : "0x6930ba06a213125880c1a12a18ad56614bbb8d56d94599781965c83379db8ce2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6930ba06a213125880c1a12a18ad56614bbb8d56d94599781965c83379db8ce2",
+                    "hash" : "0x6930ba06a213125880c1a12a18ad56614bbb8d56d94599781965c83379db8ce2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
                 "code" : "0x6000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b611388f1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x6037600155",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "21100"
+                "0x526c"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimit2.json b/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimit2.json
index 5bd323313..50c582c88 100644
--- a/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimit2.json
+++ b/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimit2.json
@@ -1,17 +1,17 @@
 {
     "InternalCallHittingGasLimit2" : {
         "env" : {
-            "currentCoinbase" : "2adf5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "currentCoinbase" : "0x2adf5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0xba96",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "0f98867b36ce229df56a98e1454b81797def675ab7b1ff78b9bd95922be5a07e",
+                    "hash" : "0x0f98867b36ce229df56a98e1454b81797def675ab7b1ff78b9bd95922be5a07e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "0f98867b36ce229df56a98e1454b81797def675ab7b1ff78b9bd95922be5a07e",
+                    "hash" : "0x0f98867b36ce229df56a98e1454b81797def675ab7b1ff78b9bd95922be5a07e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "1313600c23f63593b77fc8aca5a6fc20ef894a44e323554f65f2939af28d5e27",
+                    "hash" : "0x1313600c23f63593b77fc8aca5a6fc20ef894a44e323554f65f2939af28d5e27",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "1313600c23f63593b77fc8aca5a6fc20ef894a44e323554f65f2939af28d5e27",
+                    "hash" : "0x1313600c23f63593b77fc8aca5a6fc20ef894a44e323554f65f2939af28d5e27",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0f98867b36ce229df56a98e1454b81797def675ab7b1ff78b9bd95922be5a07e",
+                    "hash" : "0x0f98867b36ce229df56a98e1454b81797def675ab7b1ff78b9bd95922be5a07e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x6000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b6161a8f1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x6037600155",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "47766"
+                "0xba96"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimitSuccess.json b/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimitSuccess.json
index d2d0bd84f..2cafc5580 100644
--- a/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimitSuccess.json
+++ b/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimitSuccess.json
@@ -1,17 +1,17 @@
 {
     "InternalCallHittingGasLimitSuccess" : {
         "env" : {
-            "currentCoinbase" : "2adf5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "currentCoinbase" : "0x2adf5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x035b60",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "2766392b322e4bc9ec7c60c6699445acdc7c66d4fe3cec79f4ddd852f16f8e68",
+                    "hash" : "0x2766392b322e4bc9ec7c60c6699445acdc7c66d4fe3cec79f4ddd852f16f8e68",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "2766392b322e4bc9ec7c60c6699445acdc7c66d4fe3cec79f4ddd852f16f8e68",
+                    "hash" : "0x2766392b322e4bc9ec7c60c6699445acdc7c66d4fe3cec79f4ddd852f16f8e68",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "679ac548468089b4ada3dab4ada7c97b8ea6c6bf46bdaf117b7cf0ad1c7c2a83",
+                    "hash" : "0x679ac548468089b4ada3dab4ada7c97b8ea6c6bf46bdaf117b7cf0ad1c7c2a83",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "679ac548468089b4ada3dab4ada7c97b8ea6c6bf46bdaf117b7cf0ad1c7c2a83",
+                    "hash" : "0x679ac548468089b4ada3dab4ada7c97b8ea6c6bf46bdaf117b7cf0ad1c7c2a83",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "2766392b322e4bc9ec7c60c6699445acdc7c66d4fe3cec79f4ddd852f16f8e68",
+                    "hash" : "0x2766392b322e4bc9ec7c60c6699445acdc7c66d4fe3cec79f4ddd852f16f8e68",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x6000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b6161a8f1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x6037600155",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "150000"
+                "0x0249f0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransactionTest/InternlCallStoreClearsOOG.json b/GeneralStateTests/stTransactionTest/InternlCallStoreClearsOOG.json
index 13af8ee1e..ad8e8fc84 100644
--- a/GeneralStateTests/stTransactionTest/InternlCallStoreClearsOOG.json
+++ b/GeneralStateTests/stTransactionTest/InternlCallStoreClearsOOG.json
@@ -1,17 +1,17 @@
 {
     "InternlCallStoreClearsOOG" : {
         "env" : {
-            "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "currentCoinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c9e68239859ea35d4730ef47b0d8c9df5dfceb5d45f75b13c5cd4ad4790c797a",
+                    "hash" : "0xc9e68239859ea35d4730ef47b0d8c9df5dfceb5d45f75b13c5cd4ad4790c797a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c9e68239859ea35d4730ef47b0d8c9df5dfceb5d45f75b13c5cd4ad4790c797a",
+                    "hash" : "0xc9e68239859ea35d4730ef47b0d8c9df5dfceb5d45f75b13c5cd4ad4790c797a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2ad48fd172154544728a6ab6729ced747f40205158e83444b5e59697fc83cc3e",
+                    "hash" : "0x2ad48fd172154544728a6ab6729ced747f40205158e83444b5e59697fc83cc3e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "2ad48fd172154544728a6ab6729ced747f40205158e83444b5e59697fc83cc3e",
+                    "hash" : "0x2ad48fd172154544728a6ab6729ced747f40205158e83444b5e59697fc83cc3e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c9e68239859ea35d4730ef47b0d8c9df5dfceb5d45f75b13c5cd4ad4790c797a",
+                    "hash" : "0xc9e68239859ea35d4730ef47b0d8c9df5dfceb5d45f75b13c5cd4ad4790c797a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,7 +61,7 @@
             ]
         },
         "pre" : {
-            "0000000000000000000000000000000000000000" : {
+            "0x0000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x6000600055600060015560006002556000600355600060045560006005556000600655600060075560006008556000600955",
                 "nonce" : "0x00",
@@ -78,14 +78,14 @@
                     "0x09" : "0x0c"
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0a",
                 "code" : "0x600060006000600060016000619c40f1",
                 "nonce" : "0x00",
@@ -98,14 +98,14 @@
                 ""
             ],
             "gasLimit" : [
-                "160000"
+                "0x027100"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "c94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransactionTest/InternlCallStoreClearsSucces.json b/GeneralStateTests/stTransactionTest/InternlCallStoreClearsSucces.json
index 9b2e6fbcd..6091a1f6a 100644
--- a/GeneralStateTests/stTransactionTest/InternlCallStoreClearsSucces.json
+++ b/GeneralStateTests/stTransactionTest/InternlCallStoreClearsSucces.json
@@ -1,17 +1,17 @@
 {
     "InternlCallStoreClearsSucces" : {
         "env" : {
-            "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "currentCoinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7405ca6ab4131e0ca94db673e5a959548010ef11f7f2bd0b0bd317bea2ffff89",
+                    "hash" : "0x7405ca6ab4131e0ca94db673e5a959548010ef11f7f2bd0b0bd317bea2ffff89",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7405ca6ab4131e0ca94db673e5a959548010ef11f7f2bd0b0bd317bea2ffff89",
+                    "hash" : "0x7405ca6ab4131e0ca94db673e5a959548010ef11f7f2bd0b0bd317bea2ffff89",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2adbd104f00ce42e212bb8d44a4f34c4702a60e7cde64507bba7da169c6dd22a",
+                    "hash" : "0x2adbd104f00ce42e212bb8d44a4f34c4702a60e7cde64507bba7da169c6dd22a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "2adbd104f00ce42e212bb8d44a4f34c4702a60e7cde64507bba7da169c6dd22a",
+                    "hash" : "0x2adbd104f00ce42e212bb8d44a4f34c4702a60e7cde64507bba7da169c6dd22a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7405ca6ab4131e0ca94db673e5a959548010ef11f7f2bd0b0bd317bea2ffff89",
+                    "hash" : "0x7405ca6ab4131e0ca94db673e5a959548010ef11f7f2bd0b0bd317bea2ffff89",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,7 +61,7 @@
             ]
         },
         "pre" : {
-            "0000000000000000000000000000000000000000" : {
+            "0x0000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x6000600055600060015560006002556000600355600060045560006005556000600655600060075560006008556000600955",
                 "nonce" : "0x00",
@@ -78,14 +78,14 @@
                     "0x09" : "0x0c"
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0a",
                 "code" : "0x600060006000600060016000620186a0f1",
                 "nonce" : "0x00",
@@ -98,14 +98,14 @@
                 ""
             ],
             "gasLimit" : [
-                "160000"
+                "0x027100"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "c94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransactionTest/OverflowGasRequire.json b/GeneralStateTests/stTransactionTest/OverflowGasRequire.json
index ffd67b0a5..e881f3b02 100644
--- a/GeneralStateTests/stTransactionTest/OverflowGasRequire.json
+++ b/GeneralStateTests/stTransactionTest/OverflowGasRequire.json
@@ -1,17 +1,17 @@
 {
     "OverflowGasRequire" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "21e74bd5b4b29e241d402d6d7483d050bbdfcf2ae943522c2875c3f293e1ce70",
+                    "hash" : "0x21e74bd5b4b29e241d402d6d7483d050bbdfcf2ae943522c2875c3f293e1ce70",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "21e74bd5b4b29e241d402d6d7483d050bbdfcf2ae943522c2875c3f293e1ce70",
+                    "hash" : "0x21e74bd5b4b29e241d402d6d7483d050bbdfcf2ae943522c2875c3f293e1ce70",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "21e74bd5b4b29e241d402d6d7483d050bbdfcf2ae943522c2875c3f293e1ce70",
+                    "hash" : "0x21e74bd5b4b29e241d402d6d7483d050bbdfcf2ae943522c2875c3f293e1ce70",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "21e74bd5b4b29e241d402d6d7483d050bbdfcf2ae943522c2875c3f293e1ce70",
+                    "hash" : "0x21e74bd5b4b29e241d402d6d7483d050bbdfcf2ae943522c2875c3f293e1ce70",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "21e74bd5b4b29e241d402d6d7483d050bbdfcf2ae943522c2875c3f293e1ce70",
+                    "hash" : "0x21e74bd5b4b29e241d402d6d7483d050bbdfcf2ae943522c2875c3f293e1ce70",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -74,14 +74,14 @@
                 "0x3240349548983454"
             ],
             "gasLimit" : [
-                "1606938044258990275541962092341162602522202993782792835301376"
+                "0x0100000000000000000000000000000000000000000000000000"
             ],
             "gasPrice" : "0x0a00000000000000",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                ""
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransactionTest/OverflowGasRequire2.json b/GeneralStateTests/stTransactionTest/OverflowGasRequire2.json
index a3bcfa8f6..def29d311 100644
--- a/GeneralStateTests/stTransactionTest/OverflowGasRequire2.json
+++ b/GeneralStateTests/stTransactionTest/OverflowGasRequire2.json
@@ -1,17 +1,17 @@
 {
     "OverflowGasRequire2" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "928134bdccde9e51f4a737d2d227f8109915db01191585aad9341b3de67f83bb",
+                    "hash" : "0x928134bdccde9e51f4a737d2d227f8109915db01191585aad9341b3de67f83bb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7f450a15a566a5af02d0cfd23bada4f0f6963d85c1a20f33eb8dffe2b55262f2",
+                    "hash" : "0x7f450a15a566a5af02d0cfd23bada4f0f6963d85c1a20f33eb8dffe2b55262f2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "928134bdccde9e51f4a737d2d227f8109915db01191585aad9341b3de67f83bb",
+                    "hash" : "0x928134bdccde9e51f4a737d2d227f8109915db01191585aad9341b3de67f83bb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "928134bdccde9e51f4a737d2d227f8109915db01191585aad9341b3de67f83bb",
+                    "hash" : "0x928134bdccde9e51f4a737d2d227f8109915db01191585aad9341b3de67f83bb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7f450a15a566a5af02d0cfd23bada4f0f6963d85c1a20f33eb8dffe2b55262f2",
+                    "hash" : "0x7f450a15a566a5af02d0cfd23bada4f0f6963d85c1a20f33eb8dffe2b55262f2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -74,14 +74,14 @@
                 "0x3240349548983454"
             ],
             "gasLimit" : [
-                "1152921504606846976"
+                "0x1000000000000000"
             ],
             "gasPrice" : "0x50",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                ""
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransactionTest/RefundOverflow.json b/GeneralStateTests/stTransactionTest/RefundOverflow.json
index 655366bd8..ac762c5fb 100644
--- a/GeneralStateTests/stTransactionTest/RefundOverflow.json
+++ b/GeneralStateTests/stTransactionTest/RefundOverflow.json
@@ -1,17 +1,17 @@
 {
     "RefundOverflow" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "50e4efc6066e4158974b1cd159d914e8eda2978d3395f0027146f4a6bb014924",
+                    "hash" : "0x50e4efc6066e4158974b1cd159d914e8eda2978d3395f0027146f4a6bb014924",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "50e4efc6066e4158974b1cd159d914e8eda2978d3395f0027146f4a6bb014924",
+                    "hash" : "0x50e4efc6066e4158974b1cd159d914e8eda2978d3395f0027146f4a6bb014924",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "50e4efc6066e4158974b1cd159d914e8eda2978d3395f0027146f4a6bb014924",
+                    "hash" : "0x50e4efc6066e4158974b1cd159d914e8eda2978d3395f0027146f4a6bb014924",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "50e4efc6066e4158974b1cd159d914e8eda2978d3395f0027146f4a6bb014924",
+                    "hash" : "0x50e4efc6066e4158974b1cd159d914e8eda2978d3395f0027146f4a6bb014924",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "50e4efc6066e4158974b1cd159d914e8eda2978d3395f0027146f4a6bb014924",
+                    "hash" : "0x50e4efc6066e4158974b1cd159d914e8eda2978d3395f0027146f4a6bb014924",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0190",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -74,14 +74,14 @@
                 ""
             ],
             "gasLimit" : [
-                "461168601842738810"
+                "0x066666666666667a"
             ],
             "gasPrice" : "0x14",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                ""
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransactionTest/RefundOverflow2.json b/GeneralStateTests/stTransactionTest/RefundOverflow2.json
index 42c2f9026..bf68e8b4e 100644
--- a/GeneralStateTests/stTransactionTest/RefundOverflow2.json
+++ b/GeneralStateTests/stTransactionTest/RefundOverflow2.json
@@ -1,17 +1,17 @@
 {
     "RefundOverflow2" : {
         "env" : {
-            "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "currentCoinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "50e4efc6066e4158974b1cd159d914e8eda2978d3395f0027146f4a6bb014924",
+                    "hash" : "0x50e4efc6066e4158974b1cd159d914e8eda2978d3395f0027146f4a6bb014924",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "50e4efc6066e4158974b1cd159d914e8eda2978d3395f0027146f4a6bb014924",
+                    "hash" : "0x50e4efc6066e4158974b1cd159d914e8eda2978d3395f0027146f4a6bb014924",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "50e4efc6066e4158974b1cd159d914e8eda2978d3395f0027146f4a6bb014924",
+                    "hash" : "0x50e4efc6066e4158974b1cd159d914e8eda2978d3395f0027146f4a6bb014924",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "50e4efc6066e4158974b1cd159d914e8eda2978d3395f0027146f4a6bb014924",
+                    "hash" : "0x50e4efc6066e4158974b1cd159d914e8eda2978d3395f0027146f4a6bb014924",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "50e4efc6066e4158974b1cd159d914e8eda2978d3395f0027146f4a6bb014924",
+                    "hash" : "0x50e4efc6066e4158974b1cd159d914e8eda2978d3395f0027146f4a6bb014924",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0190",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -74,14 +74,14 @@
                 ""
             ],
             "gasLimit" : [
-                "461168601842738810"
+                "0x066666666666667a"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransactionTest/StoreClearsAndInternlCallStoreClearsOOG.json b/GeneralStateTests/stTransactionTest/StoreClearsAndInternlCallStoreClearsOOG.json
index ef4ec7a07..673d11460 100644
--- a/GeneralStateTests/stTransactionTest/StoreClearsAndInternlCallStoreClearsOOG.json
+++ b/GeneralStateTests/stTransactionTest/StoreClearsAndInternlCallStoreClearsOOG.json
@@ -1,17 +1,17 @@
 {
     "StoreClearsAndInternlCallStoreClearsOOG" : {
         "env" : {
-            "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "currentCoinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e34a15a4c108a728623ec726686e2712d79af48fb40a609d96d421bdaa83e402",
+                    "hash" : "0xe34a15a4c108a728623ec726686e2712d79af48fb40a609d96d421bdaa83e402",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e34a15a4c108a728623ec726686e2712d79af48fb40a609d96d421bdaa83e402",
+                    "hash" : "0xe34a15a4c108a728623ec726686e2712d79af48fb40a609d96d421bdaa83e402",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "860acf740a21f4aa3656c5d77e74502a3dba158b1abc35e74b2d0a8143382a7e",
+                    "hash" : "0x860acf740a21f4aa3656c5d77e74502a3dba158b1abc35e74b2d0a8143382a7e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "860acf740a21f4aa3656c5d77e74502a3dba158b1abc35e74b2d0a8143382a7e",
+                    "hash" : "0x860acf740a21f4aa3656c5d77e74502a3dba158b1abc35e74b2d0a8143382a7e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e34a15a4c108a728623ec726686e2712d79af48fb40a609d96d421bdaa83e402",
+                    "hash" : "0xe34a15a4c108a728623ec726686e2712d79af48fb40a609d96d421bdaa83e402",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,7 +61,7 @@
             ]
         },
         "pre" : {
-            "0000000000000000000000000000000000000000" : {
+            "0x0000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x6000600055600060015560006002556000600355600060045560006005556000600655600060075560006008556000600955",
                 "nonce" : "0x00",
@@ -78,14 +78,14 @@
                     "0x09" : "0x0c"
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x07a120",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0a",
                 "code" : "0x6000600055600060015560006002556000600355600060006000600060016000614e20f1",
                 "nonce" : "0x00",
@@ -103,14 +103,14 @@
                 ""
             ],
             "gasLimit" : [
-                "200000"
+                "0x030d40"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "c94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransactionTest/StoreClearsAndInternlCallStoreClearsSuccess.json b/GeneralStateTests/stTransactionTest/StoreClearsAndInternlCallStoreClearsSuccess.json
index 0c917535b..0499ea761 100644
--- a/GeneralStateTests/stTransactionTest/StoreClearsAndInternlCallStoreClearsSuccess.json
+++ b/GeneralStateTests/stTransactionTest/StoreClearsAndInternlCallStoreClearsSuccess.json
@@ -1,17 +1,17 @@
 {
     "StoreClearsAndInternlCallStoreClearsSuccess" : {
         "env" : {
-            "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "currentCoinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "488534cbee9b940581e2e9d39c252750b6b3582e5a159e1593ae1f36e17168db",
+                    "hash" : "0x488534cbee9b940581e2e9d39c252750b6b3582e5a159e1593ae1f36e17168db",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "488534cbee9b940581e2e9d39c252750b6b3582e5a159e1593ae1f36e17168db",
+                    "hash" : "0x488534cbee9b940581e2e9d39c252750b6b3582e5a159e1593ae1f36e17168db",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b5ae140f33246605ed01f44613b78305993d1edd4b87f62151f09146d9111c24",
+                    "hash" : "0xb5ae140f33246605ed01f44613b78305993d1edd4b87f62151f09146d9111c24",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b5ae140f33246605ed01f44613b78305993d1edd4b87f62151f09146d9111c24",
+                    "hash" : "0xb5ae140f33246605ed01f44613b78305993d1edd4b87f62151f09146d9111c24",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "488534cbee9b940581e2e9d39c252750b6b3582e5a159e1593ae1f36e17168db",
+                    "hash" : "0x488534cbee9b940581e2e9d39c252750b6b3582e5a159e1593ae1f36e17168db",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,7 +61,7 @@
             ]
         },
         "pre" : {
-            "0000000000000000000000000000000000000000" : {
+            "0x0000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x6000600055600060015560006002556000600355600060045560006005556000600655600060075560006008556000600955",
                 "nonce" : "0x00",
@@ -78,14 +78,14 @@
                     "0x09" : "0x0c"
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x07a120",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0a",
                 "code" : "0x600060005560006001556000600255600060035560006000600060006001600061c350f1",
                 "nonce" : "0x00",
@@ -103,14 +103,14 @@
                 ""
             ],
             "gasLimit" : [
-                "200000"
+                "0x030d40"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "c94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransactionTest/StoreGasOnCreate.json b/GeneralStateTests/stTransactionTest/StoreGasOnCreate.json
index d359a47ea..f9a719e82 100644
--- a/GeneralStateTests/stTransactionTest/StoreGasOnCreate.json
+++ b/GeneralStateTests/stTransactionTest/StoreGasOnCreate.json
@@ -1,17 +1,17 @@
 {
     "StoreGasOnCreate" : {
         "env" : {
-            "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "currentCoinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "981251c50c9eaf41a1b1c05b9e396999e16dda2117366dfc6435e930f9024a6b",
+                    "hash" : "0x981251c50c9eaf41a1b1c05b9e396999e16dda2117366dfc6435e930f9024a6b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f89245b6f80697b4b587dfbe85a9cc1fd2a9ef3b4d8fc4bac922c2c2a4de2974",
+                    "hash" : "0xf89245b6f80697b4b587dfbe85a9cc1fd2a9ef3b4d8fc4bac922c2c2a4de2974",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "ec303faac197a7d9d7602656492d111348e936d7cf5a58ee923b13db4028c53c",
+                    "hash" : "0xec303faac197a7d9d7602656492d111348e936d7cf5a58ee923b13db4028c53c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ec303faac197a7d9d7602656492d111348e936d7cf5a58ee923b13db4028c53c",
+                    "hash" : "0xec303faac197a7d9d7602656492d111348e936d7cf5a58ee923b13db4028c53c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f89245b6f80697b4b587dfbe85a9cc1fd2a9ef3b4d8fc4bac922c2c2a4de2974",
+                    "hash" : "0xf89245b6f80697b4b587dfbe85a9cc1fd2a9ef3b4d8fc4bac922c2c2a4de2974",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,14 +61,14 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x061a80",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x635a60fd556000526004601c6000f0",
                 "nonce" : "0x00",
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "131882"
+                "0x02032a"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "100"
+                "0x64"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCall.json b/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCall.json
index d1cbab4f6..da49396ea 100644
--- a/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCall.json
+++ b/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCall.json
@@ -1,17 +1,17 @@
 {
     "SuicidesAndInternlCallSuicidesBonusGasAtCall" : {
         "env" : {
-            "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "currentCoinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "38d59e131e4d4e76ec2c1fe16066a42649618c65eba3cf6c776ab41a09821c62",
+                    "hash" : "0x38d59e131e4d4e76ec2c1fe16066a42649618c65eba3cf6c776ab41a09821c62",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "38d59e131e4d4e76ec2c1fe16066a42649618c65eba3cf6c776ab41a09821c62",
+                    "hash" : "0x38d59e131e4d4e76ec2c1fe16066a42649618c65eba3cf6c776ab41a09821c62",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9bdb18aab851bd449403247691c69d81c785cf22e6e8a0150c29cbe778e1c8da",
+                    "hash" : "0x9bdb18aab851bd449403247691c69d81c785cf22e6e8a0150c29cbe778e1c8da",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9bdb18aab851bd449403247691c69d81c785cf22e6e8a0150c29cbe778e1c8da",
+                    "hash" : "0x9bdb18aab851bd449403247691c69d81c785cf22e6e8a0150c29cbe778e1c8da",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "38d59e131e4d4e76ec2c1fe16066a42649618c65eba3cf6c776ab41a09821c62",
+                    "hash" : "0x38d59e131e4d4e76ec2c1fe16066a42649618c65eba3cf6c776ab41a09821c62",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "0000000000000000000000000000000000000000" : {
+            "0x0000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x6001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0a",
                 "code" : "0x6000600060006000600160006000f1506000ff",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "50000"
+                "0xc350"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "c94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCallFailed.json b/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCallFailed.json
index a512da874..0b4401d75 100644
--- a/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCallFailed.json
+++ b/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCallFailed.json
@@ -1,17 +1,17 @@
 {
     "SuicidesAndInternlCallSuicidesBonusGasAtCallFailed" : {
         "env" : {
-            "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "currentCoinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "67e8629b58470a4fe1c51cf03c7f0f6093f6dd3564c02879f0ae10830c179307",
+                    "hash" : "0x67e8629b58470a4fe1c51cf03c7f0f6093f6dd3564c02879f0ae10830c179307",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "67e8629b58470a4fe1c51cf03c7f0f6093f6dd3564c02879f0ae10830c179307",
+                    "hash" : "0x67e8629b58470a4fe1c51cf03c7f0f6093f6dd3564c02879f0ae10830c179307",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "7437f919a123aec38b460e95dc8d77c33c92d92dc68efc2fd2d541960f4192ad",
+                    "hash" : "0x7437f919a123aec38b460e95dc8d77c33c92d92dc68efc2fd2d541960f4192ad",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "7437f919a123aec38b460e95dc8d77c33c92d92dc68efc2fd2d541960f4192ad",
+                    "hash" : "0x7437f919a123aec38b460e95dc8d77c33c92d92dc68efc2fd2d541960f4192ad",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "67e8629b58470a4fe1c51cf03c7f0f6093f6dd3564c02879f0ae10830c179307",
+                    "hash" : "0x67e8629b58470a4fe1c51cf03c7f0f6093f6dd3564c02879f0ae10830c179307",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "0000000000000000000000000000000000000000" : {
+            "0x0000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x6001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0a",
                 "code" : "0x6000600060006000600060006000f1506000ff",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "50000"
+                "0xc350"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "c94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesOOG.json b/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesOOG.json
index 3ef36ee6f..8df9cceab 100644
--- a/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesOOG.json
+++ b/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesOOG.json
@@ -1,17 +1,17 @@
 {
     "SuicidesAndInternlCallSuicidesOOG" : {
         "env" : {
-            "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "currentCoinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b9db1ad8faa2ab7375b7e3214d04e444c7bae2eaa9c6555e1506d5421f5b89be",
+                    "hash" : "0xb9db1ad8faa2ab7375b7e3214d04e444c7bae2eaa9c6555e1506d5421f5b89be",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b9db1ad8faa2ab7375b7e3214d04e444c7bae2eaa9c6555e1506d5421f5b89be",
+                    "hash" : "0xb9db1ad8faa2ab7375b7e3214d04e444c7bae2eaa9c6555e1506d5421f5b89be",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b9db1ad8faa2ab7375b7e3214d04e444c7bae2eaa9c6555e1506d5421f5b89be",
+                    "hash" : "0xb9db1ad8faa2ab7375b7e3214d04e444c7bae2eaa9c6555e1506d5421f5b89be",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b9db1ad8faa2ab7375b7e3214d04e444c7bae2eaa9c6555e1506d5421f5b89be",
+                    "hash" : "0xb9db1ad8faa2ab7375b7e3214d04e444c7bae2eaa9c6555e1506d5421f5b89be",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b9db1ad8faa2ab7375b7e3214d04e444c7bae2eaa9c6555e1506d5421f5b89be",
+                    "hash" : "0xb9db1ad8faa2ab7375b7e3214d04e444c7bae2eaa9c6555e1506d5421f5b89be",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "0000000000000000000000000000000000000000" : {
+            "0x0000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x6001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0a",
                 "code" : "0x6000600060006000600160006155f0f1506000ff",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "50000"
+                "0xc350"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "c94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesSuccess.json b/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesSuccess.json
index 8761b3944..cb35d6ff3 100644
--- a/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesSuccess.json
+++ b/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesSuccess.json
@@ -1,17 +1,17 @@
 {
     "SuicidesAndInternlCallSuicidesSuccess" : {
         "env" : {
-            "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "currentCoinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "128115aec92c4018e4356912d56025520a6ef7fdaef2498b48c046fc5f1f957d",
+                    "hash" : "0x128115aec92c4018e4356912d56025520a6ef7fdaef2498b48c046fc5f1f957d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "b09e2c82c72eab1acce2b3a97356325801b519b38bb3812e01a9f2e0b3f053cb",
+                    "hash" : "0xb09e2c82c72eab1acce2b3a97356325801b519b38bb3812e01a9f2e0b3f053cb",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -29,7 +29,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "128115aec92c4018e4356912d56025520a6ef7fdaef2498b48c046fc5f1f957d",
+                    "hash" : "0x128115aec92c4018e4356912d56025520a6ef7fdaef2498b48c046fc5f1f957d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -37,7 +37,7 @@
                     }
                 },
                 {
-                    "hash" : "b09e2c82c72eab1acce2b3a97356325801b519b38bb3812e01a9f2e0b3f053cb",
+                    "hash" : "0xb09e2c82c72eab1acce2b3a97356325801b519b38bb3812e01a9f2e0b3f053cb",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -47,7 +47,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "edcf939a1838a72b983b33625bb64aafe89e5dc0e6868f13f75aa8b8ed4676b5",
+                    "hash" : "0xedcf939a1838a72b983b33625bb64aafe89e5dc0e6868f13f75aa8b8ed4676b5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -55,7 +55,7 @@
                     }
                 },
                 {
-                    "hash" : "edcf939a1838a72b983b33625bb64aafe89e5dc0e6868f13f75aa8b8ed4676b5",
+                    "hash" : "0xedcf939a1838a72b983b33625bb64aafe89e5dc0e6868f13f75aa8b8ed4676b5",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -65,7 +65,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "edcf939a1838a72b983b33625bb64aafe89e5dc0e6868f13f75aa8b8ed4676b5",
+                    "hash" : "0xedcf939a1838a72b983b33625bb64aafe89e5dc0e6868f13f75aa8b8ed4676b5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -73,7 +73,7 @@
                     }
                 },
                 {
-                    "hash" : "edcf939a1838a72b983b33625bb64aafe89e5dc0e6868f13f75aa8b8ed4676b5",
+                    "hash" : "0xedcf939a1838a72b983b33625bb64aafe89e5dc0e6868f13f75aa8b8ed4676b5",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -83,7 +83,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "128115aec92c4018e4356912d56025520a6ef7fdaef2498b48c046fc5f1f957d",
+                    "hash" : "0x128115aec92c4018e4356912d56025520a6ef7fdaef2498b48c046fc5f1f957d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -91,7 +91,7 @@
                     }
                 },
                 {
-                    "hash" : "b09e2c82c72eab1acce2b3a97356325801b519b38bb3812e01a9f2e0b3f053cb",
+                    "hash" : "0xb09e2c82c72eab1acce2b3a97356325801b519b38bb3812e01a9f2e0b3f053cb",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -101,21 +101,21 @@
             ]
         },
         "pre" : {
-            "0000000000000000000000000000000000000000" : {
+            "0x0000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x6001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x02bf20",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x03e8",
                 "code" : "0x600060006000600060016000600035f1506000ff",
                 "nonce" : "0x00",
@@ -129,14 +129,14 @@
                 "0x000000000000000000000000000000000000000000000000000000000000aaf0"
             ],
             "gasLimit" : [
-                "150000"
+                "0x0249f0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "c94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransactionTest/SuicidesAndSendMoneyToItselfEtherDestroyed.json b/GeneralStateTests/stTransactionTest/SuicidesAndSendMoneyToItselfEtherDestroyed.json
index ec4698bf7..3ecaf5fc0 100644
--- a/GeneralStateTests/stTransactionTest/SuicidesAndSendMoneyToItselfEtherDestroyed.json
+++ b/GeneralStateTests/stTransactionTest/SuicidesAndSendMoneyToItselfEtherDestroyed.json
@@ -1,17 +1,17 @@
 {
     "SuicidesAndSendMoneyToItselfEtherDestroyed" : {
         "env" : {
-            "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "currentCoinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "8b093cfb172562c95fdc93897a0c9133270c68b3010ce4d586ce4247b706483f",
+                    "hash" : "0x8b093cfb172562c95fdc93897a0c9133270c68b3010ce4d586ce4247b706483f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "8b093cfb172562c95fdc93897a0c9133270c68b3010ce4d586ce4247b706483f",
+                    "hash" : "0x8b093cfb172562c95fdc93897a0c9133270c68b3010ce4d586ce4247b706483f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6dd22dec58b209e1234c1fbfab5251329a95e1a708723ea9a5aad999967be8cd",
+                    "hash" : "0x6dd22dec58b209e1234c1fbfab5251329a95e1a708723ea9a5aad999967be8cd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6dd22dec58b209e1234c1fbfab5251329a95e1a708723ea9a5aad999967be8cd",
+                    "hash" : "0x6dd22dec58b209e1234c1fbfab5251329a95e1a708723ea9a5aad999967be8cd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "8b093cfb172562c95fdc93897a0c9133270c68b3010ce4d586ce4247b706483f",
+                    "hash" : "0x8b093cfb172562c95fdc93897a0c9133270c68b3010ce4d586ce4247b706483f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,14 +61,14 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01dc90",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x03e8",
                 "code" : "0x73c94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
                 "nonce" : "0x00",
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "31700"
+                "0x7bd4"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "c94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransactionTest/SuicidesMixingCoinbase.json b/GeneralStateTests/stTransactionTest/SuicidesMixingCoinbase.json
index 371efeb0b..4080ff1a9 100644
--- a/GeneralStateTests/stTransactionTest/SuicidesMixingCoinbase.json
+++ b/GeneralStateTests/stTransactionTest/SuicidesMixingCoinbase.json
@@ -1,17 +1,17 @@
 {
     "SuicidesMixingCoinbase" : {
         "env" : {
-            "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "currentCoinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "ebb113c5ae196dafdbb9c9a8e77c02e7b1e6bb6faf4339ea869bb1d0a6b9559f",
+                    "hash" : "0xebb113c5ae196dafdbb9c9a8e77c02e7b1e6bb6faf4339ea869bb1d0a6b9559f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "101a8295ac56dc085b0c840487b73794c7b05226580c431e947f56c4424379f4",
+                    "hash" : "0x101a8295ac56dc085b0c840487b73794c7b05226580c431e947f56c4424379f4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -29,7 +29,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "ebb113c5ae196dafdbb9c9a8e77c02e7b1e6bb6faf4339ea869bb1d0a6b9559f",
+                    "hash" : "0xebb113c5ae196dafdbb9c9a8e77c02e7b1e6bb6faf4339ea869bb1d0a6b9559f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -37,7 +37,7 @@
                     }
                 },
                 {
-                    "hash" : "101a8295ac56dc085b0c840487b73794c7b05226580c431e947f56c4424379f4",
+                    "hash" : "0x101a8295ac56dc085b0c840487b73794c7b05226580c431e947f56c4424379f4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -47,7 +47,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6b09010bb30d1549da181bece2a888b61748c94829410ceb38bccdf8bd226ee2",
+                    "hash" : "0x6b09010bb30d1549da181bece2a888b61748c94829410ceb38bccdf8bd226ee2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -55,7 +55,7 @@
                     }
                 },
                 {
-                    "hash" : "6b09010bb30d1549da181bece2a888b61748c94829410ceb38bccdf8bd226ee2",
+                    "hash" : "0x6b09010bb30d1549da181bece2a888b61748c94829410ceb38bccdf8bd226ee2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -65,7 +65,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6b09010bb30d1549da181bece2a888b61748c94829410ceb38bccdf8bd226ee2",
+                    "hash" : "0x6b09010bb30d1549da181bece2a888b61748c94829410ceb38bccdf8bd226ee2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -73,7 +73,7 @@
                     }
                 },
                 {
-                    "hash" : "6b09010bb30d1549da181bece2a888b61748c94829410ceb38bccdf8bd226ee2",
+                    "hash" : "0x6b09010bb30d1549da181bece2a888b61748c94829410ceb38bccdf8bd226ee2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -83,7 +83,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "ebb113c5ae196dafdbb9c9a8e77c02e7b1e6bb6faf4339ea869bb1d0a6b9559f",
+                    "hash" : "0xebb113c5ae196dafdbb9c9a8e77c02e7b1e6bb6faf4339ea869bb1d0a6b9559f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -91,7 +91,7 @@
                     }
                 },
                 {
-                    "hash" : "101a8295ac56dc085b0c840487b73794c7b05226580c431e947f56c4424379f4",
+                    "hash" : "0x101a8295ac56dc085b0c840487b73794c7b05226580c431e947f56c4424379f4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -101,14 +101,14 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x035b60",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x03e8",
                 "code" : "0x73c94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
                 "nonce" : "0x00",
@@ -121,15 +121,15 @@
                 ""
             ],
             "gasLimit" : [
-                "21700",
-                "60000"
+                "0x54c4",
+                "0xea60"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransactionTest/SuicidesStopAfterSuicide.json b/GeneralStateTests/stTransactionTest/SuicidesStopAfterSuicide.json
index d07158fbd..7b59d36c7 100644
--- a/GeneralStateTests/stTransactionTest/SuicidesStopAfterSuicide.json
+++ b/GeneralStateTests/stTransactionTest/SuicidesStopAfterSuicide.json
@@ -1,17 +1,17 @@
 {
     "SuicidesStopAfterSuicide" : {
         "env" : {
-            "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "currentCoinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0186a0",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "8fa1ffcea85df2b5017dc0f74dc680bd0c308fdd19b0d74c2a8fcb4b99d27f61",
+                    "hash" : "0x8fa1ffcea85df2b5017dc0f74dc680bd0c308fdd19b0d74c2a8fcb4b99d27f61",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "8fa1ffcea85df2b5017dc0f74dc680bd0c308fdd19b0d74c2a8fcb4b99d27f61",
+                    "hash" : "0x8fa1ffcea85df2b5017dc0f74dc680bd0c308fdd19b0d74c2a8fcb4b99d27f61",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "dc9bf412e9770d2c1500b0be40f27b91d966320ea211c96f34faba0d4d7fb2c0",
+                    "hash" : "0xdc9bf412e9770d2c1500b0be40f27b91d966320ea211c96f34faba0d4d7fb2c0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "dc9bf412e9770d2c1500b0be40f27b91d966320ea211c96f34faba0d4d7fb2c0",
+                    "hash" : "0xdc9bf412e9770d2c1500b0be40f27b91d966320ea211c96f34faba0d4d7fb2c0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "8fa1ffcea85df2b5017dc0f74dc680bd0c308fdd19b0d74c2a8fcb4b99d27f61",
+                    "hash" : "0x8fa1ffcea85df2b5017dc0f74dc680bd0c308fdd19b0d74c2a8fcb4b99d27f61",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "0000000000000000000000000000000000000000" : {
+            "0x0000000000000000000000000000000000000000" : {
                 "balance" : "0x0456",
                 "code" : "0x6001ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01dc90",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2710",
-                "code" : "0x6000ff600060006000600060006000617530f1",
+                "code" : "0x6000ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "83700"
+                "0x0146f4"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "c94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransactionTest/TransactionDataCosts652.json b/GeneralStateTests/stTransactionTest/TransactionDataCosts652.json
index 32aab8c36..78a295931 100644
--- a/GeneralStateTests/stTransactionTest/TransactionDataCosts652.json
+++ b/GeneralStateTests/stTransactionTest/TransactionDataCosts652.json
@@ -1,17 +1,17 @@
 {
     "TransactionDataCosts652" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "2df913175b2031af6b36c9da0197f325e1c175b774b3338d86319a5bdf9ec257",
+                    "hash" : "0x2df913175b2031af6b36c9da0197f325e1c175b774b3338d86319a5bdf9ec257",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "8dca95be8393071025319ae78d7804a6ec176d716711c8bff783950d11cad4bb",
+                    "hash" : "0x8dca95be8393071025319ae78d7804a6ec176d716711c8bff783950d11cad4bb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2df913175b2031af6b36c9da0197f325e1c175b774b3338d86319a5bdf9ec257",
+                    "hash" : "0x2df913175b2031af6b36c9da0197f325e1c175b774b3338d86319a5bdf9ec257",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "2df913175b2031af6b36c9da0197f325e1c175b774b3338d86319a5bdf9ec257",
+                    "hash" : "0x2df913175b2031af6b36c9da0197f325e1c175b774b3338d86319a5bdf9ec257",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "8dca95be8393071025319ae78d7804a6ec176d716711c8bff783950d11cad4bb",
+                    "hash" : "0x8dca95be8393071025319ae78d7804a6ec176d716711c8bff783950d11cad4bb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -74,14 +74,14 @@
                 "0x00000000000000000000112233445566778f32"
             ],
             "gasLimit" : [
-                "22000"
+                "0x55f0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransactionTest/TransactionFromCoinbaseHittingBlockGasLimit.json b/GeneralStateTests/stTransactionTest/TransactionFromCoinbaseHittingBlockGasLimit.json
index fb2e00a78..883804ce4 100644
--- a/GeneralStateTests/stTransactionTest/TransactionFromCoinbaseHittingBlockGasLimit.json
+++ b/GeneralStateTests/stTransactionTest/TransactionFromCoinbaseHittingBlockGasLimit.json
@@ -1,17 +1,17 @@
 {
     "TransactionFromCoinbaseHittingBlockGasLimit" : {
         "env" : {
-            "currentCoinbase" : "a94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "currentCoinbase" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x526c",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "5438f629c851f45088db1f479003aa8517c0cbe106008db7a44f63ea4a1f3967",
+                    "hash" : "0x5438f629c851f45088db1f479003aa8517c0cbe106008db7a44f63ea4a1f3967",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "5438f629c851f45088db1f479003aa8517c0cbe106008db7a44f63ea4a1f3967",
+                    "hash" : "0x5438f629c851f45088db1f479003aa8517c0cbe106008db7a44f63ea4a1f3967",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5438f629c851f45088db1f479003aa8517c0cbe106008db7a44f63ea4a1f3967",
+                    "hash" : "0x5438f629c851f45088db1f479003aa8517c0cbe106008db7a44f63ea4a1f3967",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5438f629c851f45088db1f479003aa8517c0cbe106008db7a44f63ea4a1f3967",
+                    "hash" : "0x5438f629c851f45088db1f479003aa8517c0cbe106008db7a44f63ea4a1f3967",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "5438f629c851f45088db1f479003aa8517c0cbe106008db7a44f63ea4a1f3967",
+                    "hash" : "0x5438f629c851f45088db1f479003aa8517c0cbe106008db7a44f63ea4a1f3967",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -74,14 +74,14 @@
                 ""
             ],
             "gasLimit" : [
-                "21100"
+                "0x526c"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransactionTest/TransactionFromCoinbaseHittingBlockGasLimit1.json b/GeneralStateTests/stTransactionTest/TransactionFromCoinbaseHittingBlockGasLimit1.json
index b147a9f20..343d7a5b0 100644
--- a/GeneralStateTests/stTransactionTest/TransactionFromCoinbaseHittingBlockGasLimit1.json
+++ b/GeneralStateTests/stTransactionTest/TransactionFromCoinbaseHittingBlockGasLimit1.json
@@ -1,17 +1,17 @@
 {
     "TransactionFromCoinbaseHittingBlockGasLimit1" : {
         "env" : {
-            "currentCoinbase" : "a94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "currentCoinbase" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x526c",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
+                    "hash" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
+                    "hash" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
+                    "hash" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
+                    "hash" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
+                    "hash" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -74,14 +74,14 @@
                 ""
             ],
             "gasLimit" : [
-                "21101"
+                "0x526d"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransactionTest/TransactionFromCoinbaseNotEnoughFounds.json b/GeneralStateTests/stTransactionTest/TransactionFromCoinbaseNotEnoughFounds.json
index 0ac982e34..f7306b2a1 100644
--- a/GeneralStateTests/stTransactionTest/TransactionFromCoinbaseNotEnoughFounds.json
+++ b/GeneralStateTests/stTransactionTest/TransactionFromCoinbaseNotEnoughFounds.json
@@ -1,17 +1,17 @@
 {
     "TransactionFromCoinbaseNotEnoughFounds" : {
         "env" : {
-            "currentCoinbase" : "a94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "currentCoinbase" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x01adb0",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "aaf022c10376f6d4542ba13ab000910f5aea0ea458395b8f074a64006f6e1ec2",
+                    "hash" : "0xaaf022c10376f6d4542ba13ab000910f5aea0ea458395b8f074a64006f6e1ec2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "aaf022c10376f6d4542ba13ab000910f5aea0ea458395b8f074a64006f6e1ec2",
+                    "hash" : "0xaaf022c10376f6d4542ba13ab000910f5aea0ea458395b8f074a64006f6e1ec2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "aaf022c10376f6d4542ba13ab000910f5aea0ea458395b8f074a64006f6e1ec2",
+                    "hash" : "0xaaf022c10376f6d4542ba13ab000910f5aea0ea458395b8f074a64006f6e1ec2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "aaf022c10376f6d4542ba13ab000910f5aea0ea458395b8f074a64006f6e1ec2",
+                    "hash" : "0xaaf022c10376f6d4542ba13ab000910f5aea0ea458395b8f074a64006f6e1ec2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "aaf022c10376f6d4542ba13ab000910f5aea0ea458395b8f074a64006f6e1ec2",
+                    "hash" : "0xaaf022c10376f6d4542ba13ab000910f5aea0ea458395b8f074a64006f6e1ec2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x55f0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -74,14 +74,14 @@
                 ""
             ],
             "gasLimit" : [
-                "21600"
+                "0x5460"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "5000"
+                "0x1388"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransactionTest/TransactionNonceCheck.json b/GeneralStateTests/stTransactionTest/TransactionNonceCheck.json
index bd7dd321c..b31c53cac 100644
--- a/GeneralStateTests/stTransactionTest/TransactionNonceCheck.json
+++ b/GeneralStateTests/stTransactionTest/TransactionNonceCheck.json
@@ -1,17 +1,17 @@
 {
     "TransactionNonceCheck" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "fdb4ec6fbe1f71e310dcbd7efaa690f8e6acf00bb5bf7940b39af182cd5f92aa",
+                    "hash" : "0xfdb4ec6fbe1f71e310dcbd7efaa690f8e6acf00bb5bf7940b39af182cd5f92aa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "fdb4ec6fbe1f71e310dcbd7efaa690f8e6acf00bb5bf7940b39af182cd5f92aa",
+                    "hash" : "0xfdb4ec6fbe1f71e310dcbd7efaa690f8e6acf00bb5bf7940b39af182cd5f92aa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "fdb4ec6fbe1f71e310dcbd7efaa690f8e6acf00bb5bf7940b39af182cd5f92aa",
+                    "hash" : "0xfdb4ec6fbe1f71e310dcbd7efaa690f8e6acf00bb5bf7940b39af182cd5f92aa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "fdb4ec6fbe1f71e310dcbd7efaa690f8e6acf00bb5bf7940b39af182cd5f92aa",
+                    "hash" : "0xfdb4ec6fbe1f71e310dcbd7efaa690f8e6acf00bb5bf7940b39af182cd5f92aa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "fdb4ec6fbe1f71e310dcbd7efaa690f8e6acf00bb5bf7940b39af182cd5f92aa",
+                    "hash" : "0xfdb4ec6fbe1f71e310dcbd7efaa690f8e6acf00bb5bf7940b39af182cd5f92aa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x0a",
                 "storage" : {
                 }
@@ -74,14 +74,14 @@
                 ""
             ],
             "gasLimit" : [
-                "22000"
+                "0x55f0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransactionTest/TransactionNonceCheck2.json b/GeneralStateTests/stTransactionTest/TransactionNonceCheck2.json
index b3597ef0f..e1a75d4ee 100644
--- a/GeneralStateTests/stTransactionTest/TransactionNonceCheck2.json
+++ b/GeneralStateTests/stTransactionTest/TransactionNonceCheck2.json
@@ -1,17 +1,17 @@
 {
     "TransactionNonceCheck2" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x05f5e100",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
+                    "hash" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
+                    "hash" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
+                    "hash" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
+                    "hash" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
+                    "hash" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -74,14 +74,14 @@
                 ""
             ],
             "gasLimit" : [
-                "22000"
+                "0x55f0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x0a",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransactionTest/TransactionSendingToEmpty.json b/GeneralStateTests/stTransactionTest/TransactionSendingToEmpty.json
index 5bd3df0aa..c5ee38142 100644
--- a/GeneralStateTests/stTransactionTest/TransactionSendingToEmpty.json
+++ b/GeneralStateTests/stTransactionTest/TransactionSendingToEmpty.json
@@ -1,17 +1,17 @@
 {
     "TransactionSendingToEmpty" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "53f5b84edd82703a225e53e9ae3639729eb8e337098531456998af602b0ded0a",
+                    "hash" : "0x53f5b84edd82703a225e53e9ae3639729eb8e337098531456998af602b0ded0a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "01d55964b2d7eb43d050c308c5835cbc9d0d876a35fd855f063ca4fc424c4e28",
+                    "hash" : "0x01d55964b2d7eb43d050c308c5835cbc9d0d876a35fd855f063ca4fc424c4e28",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "cf29b86efa1b7f5f999ef519fcc921062924d5c14d78baf491252fbf5a0d85b8",
+                    "hash" : "0xcf29b86efa1b7f5f999ef519fcc921062924d5c14d78baf491252fbf5a0d85b8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "53f5b84edd82703a225e53e9ae3639729eb8e337098531456998af602b0ded0a",
+                    "hash" : "0x53f5b84edd82703a225e53e9ae3639729eb8e337098531456998af602b0ded0a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "01d55964b2d7eb43d050c308c5835cbc9d0d876a35fd855f063ca4fc424c4e28",
+                    "hash" : "0x01d55964b2d7eb43d050c308c5835cbc9d0d876a35fd855f063ca4fc424c4e28",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -74,14 +74,14 @@
                 ""
             ],
             "gasLimit" : [
-                "53000"
+                "0xcf08"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                ""
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransactionTest/TransactionSendingToZero.json b/GeneralStateTests/stTransactionTest/TransactionSendingToZero.json
index 8856edb4b..50d9faf6e 100644
--- a/GeneralStateTests/stTransactionTest/TransactionSendingToZero.json
+++ b/GeneralStateTests/stTransactionTest/TransactionSendingToZero.json
@@ -1,17 +1,17 @@
 {
     "TransactionSendingToZero" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b7e0e61fec1cd4c8eee3e2f5e571716440f43a55bd2d2068fc276cb20c0bf5f4",
+                    "hash" : "0xb7e0e61fec1cd4c8eee3e2f5e571716440f43a55bd2d2068fc276cb20c0bf5f4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b7e0e61fec1cd4c8eee3e2f5e571716440f43a55bd2d2068fc276cb20c0bf5f4",
+                    "hash" : "0xb7e0e61fec1cd4c8eee3e2f5e571716440f43a55bd2d2068fc276cb20c0bf5f4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b7e0e61fec1cd4c8eee3e2f5e571716440f43a55bd2d2068fc276cb20c0bf5f4",
+                    "hash" : "0xb7e0e61fec1cd4c8eee3e2f5e571716440f43a55bd2d2068fc276cb20c0bf5f4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b7e0e61fec1cd4c8eee3e2f5e571716440f43a55bd2d2068fc276cb20c0bf5f4",
+                    "hash" : "0xb7e0e61fec1cd4c8eee3e2f5e571716440f43a55bd2d2068fc276cb20c0bf5f4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b7e0e61fec1cd4c8eee3e2f5e571716440f43a55bd2d2068fc276cb20c0bf5f4",
+                    "hash" : "0xb7e0e61fec1cd4c8eee3e2f5e571716440f43a55bd2d2068fc276cb20c0bf5f4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -74,14 +74,14 @@
                 ""
             ],
             "gasLimit" : [
-                "25000"
+                "0x61a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0000000000000000000000000000000000000000",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransactionTest/TransactionToAddressh160minusOne.json b/GeneralStateTests/stTransactionTest/TransactionToAddressh160minusOne.json
index f80158497..334c226fc 100644
--- a/GeneralStateTests/stTransactionTest/TransactionToAddressh160minusOne.json
+++ b/GeneralStateTests/stTransactionTest/TransactionToAddressh160minusOne.json
@@ -1,17 +1,17 @@
 {
     "TransactionToAddressh160minusOne" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0186a0",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c406c576c227c1f4e33a5044b87c619a494004546ce997d2b424d70609ac32c3",
+                    "hash" : "0xc406c576c227c1f4e33a5044b87c619a494004546ce997d2b424d70609ac32c3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c406c576c227c1f4e33a5044b87c619a494004546ce997d2b424d70609ac32c3",
+                    "hash" : "0xc406c576c227c1f4e33a5044b87c619a494004546ce997d2b424d70609ac32c3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "c406c576c227c1f4e33a5044b87c619a494004546ce997d2b424d70609ac32c3",
+                    "hash" : "0xc406c576c227c1f4e33a5044b87c619a494004546ce997d2b424d70609ac32c3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c406c576c227c1f4e33a5044b87c619a494004546ce997d2b424d70609ac32c3",
+                    "hash" : "0xc406c576c227c1f4e33a5044b87c619a494004546ce997d2b424d70609ac32c3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c406c576c227c1f4e33a5044b87c619a494004546ce997d2b424d70609ac32c3",
+                    "hash" : "0xc406c576c227c1f4e33a5044b87c619a494004546ce997d2b424d70609ac32c3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -74,15 +74,15 @@
                 ""
             ],
             "gasLimit" : [
-                "22000"
+                "0x55f0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "ffffffffffffffffffffffffffffffffffffffff",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xffffffffffffffffffffffffffffffffffffffff",
             "value" : [
-                "100"
+                "0x64"
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/GeneralStateTests/stTransactionTest/TransactionToItself.json b/GeneralStateTests/stTransactionTest/TransactionToItself.json
index bf6b66094..be85be4b3 100644
--- a/GeneralStateTests/stTransactionTest/TransactionToItself.json
+++ b/GeneralStateTests/stTransactionTest/TransactionToItself.json
@@ -1,17 +1,17 @@
 {
     "TransactionToItself" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "387018dfa6e56ba2a1b7fc2641d6b3377fd589b23a4b8bde3966423afbd69cae",
+                    "hash" : "0x387018dfa6e56ba2a1b7fc2641d6b3377fd589b23a4b8bde3966423afbd69cae",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "387018dfa6e56ba2a1b7fc2641d6b3377fd589b23a4b8bde3966423afbd69cae",
+                    "hash" : "0x387018dfa6e56ba2a1b7fc2641d6b3377fd589b23a4b8bde3966423afbd69cae",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "387018dfa6e56ba2a1b7fc2641d6b3377fd589b23a4b8bde3966423afbd69cae",
+                    "hash" : "0x387018dfa6e56ba2a1b7fc2641d6b3377fd589b23a4b8bde3966423afbd69cae",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "387018dfa6e56ba2a1b7fc2641d6b3377fd589b23a4b8bde3966423afbd69cae",
+                    "hash" : "0x387018dfa6e56ba2a1b7fc2641d6b3377fd589b23a4b8bde3966423afbd69cae",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "387018dfa6e56ba2a1b7fc2641d6b3377fd589b23a4b8bde3966423afbd69cae",
+                    "hash" : "0x387018dfa6e56ba2a1b7fc2641d6b3377fd589b23a4b8bde3966423afbd69cae",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -74,14 +74,14 @@
                 ""
             ],
             "gasLimit" : [
-                "25000"
+                "0x61a8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "a94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransactionTest/TransactionToItselfNotEnoughFounds.json b/GeneralStateTests/stTransactionTest/TransactionToItselfNotEnoughFounds.json
index 6439ae0d7..2e4c15664 100644
--- a/GeneralStateTests/stTransactionTest/TransactionToItselfNotEnoughFounds.json
+++ b/GeneralStateTests/stTransactionTest/TransactionToItselfNotEnoughFounds.json
@@ -1,17 +1,17 @@
 {
     "TransactionToItselfNotEnoughFounds" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "aaf022c10376f6d4542ba13ab000910f5aea0ea458395b8f074a64006f6e1ec2",
+                    "hash" : "0xaaf022c10376f6d4542ba13ab000910f5aea0ea458395b8f074a64006f6e1ec2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "aaf022c10376f6d4542ba13ab000910f5aea0ea458395b8f074a64006f6e1ec2",
+                    "hash" : "0xaaf022c10376f6d4542ba13ab000910f5aea0ea458395b8f074a64006f6e1ec2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "aaf022c10376f6d4542ba13ab000910f5aea0ea458395b8f074a64006f6e1ec2",
+                    "hash" : "0xaaf022c10376f6d4542ba13ab000910f5aea0ea458395b8f074a64006f6e1ec2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "aaf022c10376f6d4542ba13ab000910f5aea0ea458395b8f074a64006f6e1ec2",
+                    "hash" : "0xaaf022c10376f6d4542ba13ab000910f5aea0ea458395b8f074a64006f6e1ec2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "aaf022c10376f6d4542ba13ab000910f5aea0ea458395b8f074a64006f6e1ec2",
+                    "hash" : "0xaaf022c10376f6d4542ba13ab000910f5aea0ea458395b8f074a64006f6e1ec2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x55f0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -74,14 +74,14 @@
                 ""
             ],
             "gasLimit" : [
-                "21600"
+                "0x5460"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "a94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "5000"
+                "0x1388"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransactionTest/UserTransactionGasLimitIsTooLowWhenZeroCost.json b/GeneralStateTests/stTransactionTest/UserTransactionGasLimitIsTooLowWhenZeroCost.json
index fc3bda7bb..09cee27e8 100644
--- a/GeneralStateTests/stTransactionTest/UserTransactionGasLimitIsTooLowWhenZeroCost.json
+++ b/GeneralStateTests/stTransactionTest/UserTransactionGasLimitIsTooLowWhenZeroCost.json
@@ -1,17 +1,17 @@
 {
     "UserTransactionGasLimitIsTooLowWhenZeroCost" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x05f5e100",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "5bbf78f4da91159120044b2cee74ebd400cc5a2b5f54e7d9833afa156ad35d6c",
+                    "hash" : "0x5bbf78f4da91159120044b2cee74ebd400cc5a2b5f54e7d9833afa156ad35d6c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "5bbf78f4da91159120044b2cee74ebd400cc5a2b5f54e7d9833afa156ad35d6c",
+                    "hash" : "0x5bbf78f4da91159120044b2cee74ebd400cc5a2b5f54e7d9833afa156ad35d6c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5bbf78f4da91159120044b2cee74ebd400cc5a2b5f54e7d9833afa156ad35d6c",
+                    "hash" : "0x5bbf78f4da91159120044b2cee74ebd400cc5a2b5f54e7d9833afa156ad35d6c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5bbf78f4da91159120044b2cee74ebd400cc5a2b5f54e7d9833afa156ad35d6c",
+                    "hash" : "0x5bbf78f4da91159120044b2cee74ebd400cc5a2b5f54e7d9833afa156ad35d6c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "5bbf78f4da91159120044b2cee74ebd400cc5a2b5f54e7d9833afa156ad35d6c",
+                    "hash" : "0x5bbf78f4da91159120044b2cee74ebd400cc5a2b5f54e7d9833afa156ad35d6c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x80e8",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -74,14 +74,14 @@
                 ""
             ],
             "gasLimit" : [
-                "12"
+                "0x0c"
             ],
             "gasPrice" : "0x00",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "900"
+                "0x0384"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransactionTest/UserTransactionZeroCost.json b/GeneralStateTests/stTransactionTest/UserTransactionZeroCost.json
index c9a10954e..945004bec 100644
--- a/GeneralStateTests/stTransactionTest/UserTransactionZeroCost.json
+++ b/GeneralStateTests/stTransactionTest/UserTransactionZeroCost.json
@@ -1,17 +1,17 @@
 {
     "UserTransactionZeroCost" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a2bff976f733022a4932ccfca0b8049b1569bfa83309e50b1fe698ec3d8e3c74",
+                    "hash" : "0xa2bff976f733022a4932ccfca0b8049b1569bfa83309e50b1fe698ec3d8e3c74",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6fa96e06aa7cafbd86e0d99b4cbd4b2924eb3e5c8d66eccba3b11a2c93907652",
+                    "hash" : "0x6fa96e06aa7cafbd86e0d99b4cbd4b2924eb3e5c8d66eccba3b11a2c93907652",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a2bff976f733022a4932ccfca0b8049b1569bfa83309e50b1fe698ec3d8e3c74",
+                    "hash" : "0xa2bff976f733022a4932ccfca0b8049b1569bfa83309e50b1fe698ec3d8e3c74",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a2bff976f733022a4932ccfca0b8049b1569bfa83309e50b1fe698ec3d8e3c74",
+                    "hash" : "0xa2bff976f733022a4932ccfca0b8049b1569bfa83309e50b1fe698ec3d8e3c74",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6fa96e06aa7cafbd86e0d99b4cbd4b2924eb3e5c8d66eccba3b11a2c93907652",
+                    "hash" : "0x6fa96e06aa7cafbd86e0d99b4cbd4b2924eb3e5c8d66eccba3b11a2c93907652",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xa7f8",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -74,14 +74,14 @@
                 ""
             ],
             "gasLimit" : [
-                "35100"
+                "0x891c"
             ],
             "gasPrice" : "0x00",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "900"
+                "0x0384"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransactionTest/UserTransactionZeroCostWithData.json b/GeneralStateTests/stTransactionTest/UserTransactionZeroCostWithData.json
index 0616b4402..63f9db71e 100644
--- a/GeneralStateTests/stTransactionTest/UserTransactionZeroCostWithData.json
+++ b/GeneralStateTests/stTransactionTest/UserTransactionZeroCostWithData.json
@@ -1,17 +1,17 @@
 {
     "UserTransactionZeroCostWithData" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "3a5e8a1cf1708fdf3de65990a78901893ff686d889e78b387e039206bb41b1ba",
+                    "hash" : "0x3a5e8a1cf1708fdf3de65990a78901893ff686d889e78b387e039206bb41b1ba",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "3a5e8a1cf1708fdf3de65990a78901893ff686d889e78b387e039206bb41b1ba",
+                    "hash" : "0x3a5e8a1cf1708fdf3de65990a78901893ff686d889e78b387e039206bb41b1ba",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -29,7 +29,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a58bfc327c55e66f416e226023e67a47dd01e8f1c9e370379ec936551dd4aeb1",
+                    "hash" : "0xa58bfc327c55e66f416e226023e67a47dd01e8f1c9e370379ec936551dd4aeb1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -37,7 +37,7 @@
                     }
                 },
                 {
-                    "hash" : "a58bfc327c55e66f416e226023e67a47dd01e8f1c9e370379ec936551dd4aeb1",
+                    "hash" : "0xa58bfc327c55e66f416e226023e67a47dd01e8f1c9e370379ec936551dd4aeb1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -47,7 +47,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3a5e8a1cf1708fdf3de65990a78901893ff686d889e78b387e039206bb41b1ba",
+                    "hash" : "0x3a5e8a1cf1708fdf3de65990a78901893ff686d889e78b387e039206bb41b1ba",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -55,7 +55,7 @@
                     }
                 },
                 {
-                    "hash" : "3a5e8a1cf1708fdf3de65990a78901893ff686d889e78b387e039206bb41b1ba",
+                    "hash" : "0x3a5e8a1cf1708fdf3de65990a78901893ff686d889e78b387e039206bb41b1ba",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -65,7 +65,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3a5e8a1cf1708fdf3de65990a78901893ff686d889e78b387e039206bb41b1ba",
+                    "hash" : "0x3a5e8a1cf1708fdf3de65990a78901893ff686d889e78b387e039206bb41b1ba",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -73,7 +73,7 @@
                     }
                 },
                 {
-                    "hash" : "3a5e8a1cf1708fdf3de65990a78901893ff686d889e78b387e039206bb41b1ba",
+                    "hash" : "0x3a5e8a1cf1708fdf3de65990a78901893ff686d889e78b387e039206bb41b1ba",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -83,7 +83,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a58bfc327c55e66f416e226023e67a47dd01e8f1c9e370379ec936551dd4aeb1",
+                    "hash" : "0xa58bfc327c55e66f416e226023e67a47dd01e8f1c9e370379ec936551dd4aeb1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -91,7 +91,7 @@
                     }
                 },
                 {
-                    "hash" : "a58bfc327c55e66f416e226023e67a47dd01e8f1c9e370379ec936551dd4aeb1",
+                    "hash" : "0xa58bfc327c55e66f416e226023e67a47dd01e8f1c9e370379ec936551dd4aeb1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -101,9 +101,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x020788",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -114,15 +114,15 @@
                 "0x3240349548983454"
             ],
             "gasLimit" : [
-                "32600",
-                "60000"
+                "0x7f58",
+                "0xea60"
             ],
             "gasPrice" : "0x00",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "900"
+                "0x0384"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransactionTest/zeroSigTransacrionCreate.json b/GeneralStateTests/stTransactionTest/zeroSigTransacrionCreate.json
index 1d75f263a..6ba4934a3 100644
--- a/GeneralStateTests/stTransactionTest/zeroSigTransacrionCreate.json
+++ b/GeneralStateTests/stTransactionTest/zeroSigTransacrionCreate.json
@@ -1,17 +1,17 @@
 {
     "zeroSigTransacrionCreate" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "ebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "ebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -27,7 +27,7 @@
                     }
                 },
                 {
-                    "hash" : "ebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -35,7 +35,7 @@
                     }
                 },
                 {
-                    "hash" : "ebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
@@ -43,7 +43,7 @@
                     }
                 },
                 {
-                    "hash" : "ebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -51,7 +51,7 @@
                     }
                 },
                 {
-                    "hash" : "ebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -59,7 +59,7 @@
                     }
                 },
                 {
-                    "hash" : "ebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -67,7 +67,7 @@
                     }
                 },
                 {
-                    "hash" : "ebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 3,
@@ -77,7 +77,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "ebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -85,7 +85,7 @@
                     }
                 },
                 {
-                    "hash" : "ebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -93,7 +93,7 @@
                     }
                 },
                 {
-                    "hash" : "ebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -101,7 +101,7 @@
                     }
                 },
                 {
-                    "hash" : "ebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
@@ -109,7 +109,7 @@
                     }
                 },
                 {
-                    "hash" : "ebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -117,7 +117,7 @@
                     }
                 },
                 {
-                    "hash" : "ebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -125,7 +125,7 @@
                     }
                 },
                 {
-                    "hash" : "ebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -133,7 +133,7 @@
                     }
                 },
                 {
-                    "hash" : "ebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 3,
@@ -143,7 +143,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "ebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -151,7 +151,7 @@
                     }
                 },
                 {
-                    "hash" : "ebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -159,7 +159,7 @@
                     }
                 },
                 {
-                    "hash" : "ebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -167,7 +167,7 @@
                     }
                 },
                 {
-                    "hash" : "ebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
@@ -175,7 +175,7 @@
                     }
                 },
                 {
-                    "hash" : "ebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -183,7 +183,7 @@
                     }
                 },
                 {
-                    "hash" : "ebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -191,7 +191,7 @@
                     }
                 },
                 {
-                    "hash" : "ebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -199,7 +199,7 @@
                     }
                 },
                 {
-                    "hash" : "ebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 3,
@@ -209,7 +209,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -217,7 +217,7 @@
                     }
                 },
                 {
-                    "hash" : "ebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -225,7 +225,7 @@
                     }
                 },
                 {
-                    "hash" : "ebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -233,7 +233,7 @@
                     }
                 },
                 {
-                    "hash" : "ebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
@@ -241,7 +241,7 @@
                     }
                 },
                 {
-                    "hash" : "ebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -249,7 +249,7 @@
                     }
                 },
                 {
-                    "hash" : "ebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -257,7 +257,7 @@
                     }
                 },
                 {
-                    "hash" : "ebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -265,7 +265,7 @@
                     }
                 },
                 {
-                    "hash" : "ebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 3,
@@ -275,7 +275,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0673ca46ef9ac57cee329d3a20161c6dd6b5722b59191335976819b2136e2682",
+                    "hash" : "0x0673ca46ef9ac57cee329d3a20161c6dd6b5722b59191335976819b2136e2682",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -283,7 +283,7 @@
                     }
                 },
                 {
-                    "hash" : "ebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -291,7 +291,7 @@
                     }
                 },
                 {
-                    "hash" : "ebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -299,7 +299,7 @@
                     }
                 },
                 {
-                    "hash" : "0673ca46ef9ac57cee329d3a20161c6dd6b5722b59191335976819b2136e2682",
+                    "hash" : "0x0673ca46ef9ac57cee329d3a20161c6dd6b5722b59191335976819b2136e2682",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
@@ -307,7 +307,7 @@
                     }
                 },
                 {
-                    "hash" : "ebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -315,7 +315,7 @@
                     }
                 },
                 {
-                    "hash" : "ebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -323,7 +323,7 @@
                     }
                 },
                 {
-                    "hash" : "ebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -331,7 +331,7 @@
                     }
                 },
                 {
-                    "hash" : "ebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
+                    "hash" : "0xebdc9f1983a0ddb5c876542cf78eea10f684f4220f47be93c7505e3c3c7b6a0c",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 3,
@@ -341,9 +341,9 @@
             ]
         },
         "pre" : {
-            "ffffffffffffffffffffffffffffffffffffffff" : {
+            "0xffffffffffffffffffffffffffffffffffffffff" : {
                 "balance" : "0x0186a0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -355,10 +355,10 @@
                 "0x1122334455667788990011223344556677889910"
             ],
             "gasLimit" : [
-                "60000",
-                "20000",
-                "21000",
-                "121000"
+                "0xea60",
+                "0x4e20",
+                "0x5208",
+                "0x01d8a8"
             ],
             "gasPrice" : "0x00",
             "nonce" : "0x00",
@@ -367,7 +367,7 @@
             "to" : "",
             "v" : "0x01",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransactionTest/zeroSigTransacrionCreatePrice0.json b/GeneralStateTests/stTransactionTest/zeroSigTransacrionCreatePrice0.json
index 38a625f53..c6f6718f2 100644
--- a/GeneralStateTests/stTransactionTest/zeroSigTransacrionCreatePrice0.json
+++ b/GeneralStateTests/stTransactionTest/zeroSigTransacrionCreatePrice0.json
@@ -1,17 +1,17 @@
 {
     "zeroSigTransacrionCreatePrice0" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -27,7 +27,7 @@
                     }
                 },
                 {
-                    "hash" : "667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -35,7 +35,7 @@
                     }
                 },
                 {
-                    "hash" : "667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
@@ -43,7 +43,7 @@
                     }
                 },
                 {
-                    "hash" : "667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -51,7 +51,7 @@
                     }
                 },
                 {
-                    "hash" : "667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -59,7 +59,7 @@
                     }
                 },
                 {
-                    "hash" : "667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -67,7 +67,7 @@
                     }
                 },
                 {
-                    "hash" : "667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 3,
@@ -77,7 +77,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -85,7 +85,7 @@
                     }
                 },
                 {
-                    "hash" : "667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -93,7 +93,7 @@
                     }
                 },
                 {
-                    "hash" : "667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -101,7 +101,7 @@
                     }
                 },
                 {
-                    "hash" : "667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
@@ -109,7 +109,7 @@
                     }
                 },
                 {
-                    "hash" : "667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -117,7 +117,7 @@
                     }
                 },
                 {
-                    "hash" : "667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -125,7 +125,7 @@
                     }
                 },
                 {
-                    "hash" : "667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -133,7 +133,7 @@
                     }
                 },
                 {
-                    "hash" : "667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 3,
@@ -143,7 +143,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -151,7 +151,7 @@
                     }
                 },
                 {
-                    "hash" : "667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -159,7 +159,7 @@
                     }
                 },
                 {
-                    "hash" : "667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -167,7 +167,7 @@
                     }
                 },
                 {
-                    "hash" : "667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
@@ -175,7 +175,7 @@
                     }
                 },
                 {
-                    "hash" : "667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -183,7 +183,7 @@
                     }
                 },
                 {
-                    "hash" : "667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -191,7 +191,7 @@
                     }
                 },
                 {
-                    "hash" : "667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -199,7 +199,7 @@
                     }
                 },
                 {
-                    "hash" : "667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 3,
@@ -209,7 +209,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -217,7 +217,7 @@
                     }
                 },
                 {
-                    "hash" : "667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -225,7 +225,7 @@
                     }
                 },
                 {
-                    "hash" : "667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -233,7 +233,7 @@
                     }
                 },
                 {
-                    "hash" : "667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
@@ -241,7 +241,7 @@
                     }
                 },
                 {
-                    "hash" : "667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -249,7 +249,7 @@
                     }
                 },
                 {
-                    "hash" : "667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -257,7 +257,7 @@
                     }
                 },
                 {
-                    "hash" : "667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -265,7 +265,7 @@
                     }
                 },
                 {
-                    "hash" : "667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 3,
@@ -275,7 +275,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "fb2ea6e0ff1e07388976b5a96337d9b1fcb37f5a01559b06823e70a022f1c2c9",
+                    "hash" : "0xfb2ea6e0ff1e07388976b5a96337d9b1fcb37f5a01559b06823e70a022f1c2c9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -283,7 +283,7 @@
                     }
                 },
                 {
-                    "hash" : "667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -291,7 +291,7 @@
                     }
                 },
                 {
-                    "hash" : "667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -299,7 +299,7 @@
                     }
                 },
                 {
-                    "hash" : "fb2ea6e0ff1e07388976b5a96337d9b1fcb37f5a01559b06823e70a022f1c2c9",
+                    "hash" : "0xfb2ea6e0ff1e07388976b5a96337d9b1fcb37f5a01559b06823e70a022f1c2c9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
@@ -307,7 +307,7 @@
                     }
                 },
                 {
-                    "hash" : "667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -315,7 +315,7 @@
                     }
                 },
                 {
-                    "hash" : "667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -323,7 +323,7 @@
                     }
                 },
                 {
-                    "hash" : "667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -331,7 +331,7 @@
                     }
                 },
                 {
-                    "hash" : "667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
+                    "hash" : "0x667bef7fd0ad2f1be7a6f8ab214badcb737770ddd18d70ffc424e9a25a27f031",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 3,
@@ -341,9 +341,9 @@
             ]
         },
         "pre" : {
-            "ffffffffffffffffffffffffffffffffffffffff" : {
+            "0xffffffffffffffffffffffffffffffffffffffff" : {
                 "balance" : "0x64",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -355,10 +355,10 @@
                 "0x1122334455667788990011223344556677889910"
             ],
             "gasLimit" : [
-                "60000",
-                "20000",
-                "21000",
-                "121000"
+                "0xea60",
+                "0x4e20",
+                "0x5208",
+                "0x01d8a8"
             ],
             "gasPrice" : "0x00",
             "nonce" : "0x00",
@@ -367,7 +367,7 @@
             "to" : "",
             "v" : "0x01",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransactionTest/zeroSigTransaction.json b/GeneralStateTests/stTransactionTest/zeroSigTransaction.json
index 4b65e8a72..b7ffcc0bc 100644
--- a/GeneralStateTests/stTransactionTest/zeroSigTransaction.json
+++ b/GeneralStateTests/stTransactionTest/zeroSigTransaction.json
@@ -1,17 +1,17 @@
 {
     "zeroSigTransaction" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -27,7 +27,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -35,7 +35,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -43,7 +43,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -51,7 +51,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -59,7 +59,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
@@ -67,7 +67,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
@@ -75,7 +75,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -83,7 +83,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -91,7 +91,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -99,7 +99,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -107,7 +107,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -115,7 +115,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -123,7 +123,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 3,
@@ -131,7 +131,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 3,
@@ -141,7 +141,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -149,7 +149,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -157,7 +157,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -165,7 +165,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -173,7 +173,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -181,7 +181,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -189,7 +189,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
@@ -197,7 +197,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
@@ -205,7 +205,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -213,7 +213,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -221,7 +221,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -229,7 +229,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -237,7 +237,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -245,7 +245,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -253,7 +253,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 3,
@@ -261,7 +261,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 3,
@@ -271,7 +271,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -279,7 +279,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -287,7 +287,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -295,7 +295,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -303,7 +303,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -311,7 +311,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -319,7 +319,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
@@ -327,7 +327,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
@@ -335,7 +335,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -343,7 +343,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -351,7 +351,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -359,7 +359,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -367,7 +367,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -375,7 +375,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -383,7 +383,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 3,
@@ -391,7 +391,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 3,
@@ -401,7 +401,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -409,7 +409,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -417,7 +417,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -425,7 +425,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -433,7 +433,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -441,7 +441,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -449,7 +449,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
@@ -457,7 +457,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
@@ -465,7 +465,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -473,7 +473,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -481,7 +481,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -489,7 +489,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -497,7 +497,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -505,7 +505,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -513,7 +513,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 3,
@@ -521,7 +521,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 3,
@@ -531,7 +531,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "bb025b193860ec94ae49ccf6eb385746db95e92602013b3b70411666fa2007e2",
+                    "hash" : "0xbb025b193860ec94ae49ccf6eb385746db95e92602013b3b70411666fa2007e2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -539,7 +539,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -547,7 +547,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -555,7 +555,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -563,7 +563,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -571,7 +571,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -579,7 +579,7 @@
                     }
                 },
                 {
-                    "hash" : "bb025b193860ec94ae49ccf6eb385746db95e92602013b3b70411666fa2007e2",
+                    "hash" : "0xbb025b193860ec94ae49ccf6eb385746db95e92602013b3b70411666fa2007e2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
@@ -587,7 +587,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
@@ -595,7 +595,7 @@
                     }
                 },
                 {
-                    "hash" : "bb025b193860ec94ae49ccf6eb385746db95e92602013b3b70411666fa2007e2",
+                    "hash" : "0xbb025b193860ec94ae49ccf6eb385746db95e92602013b3b70411666fa2007e2",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -603,7 +603,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -611,7 +611,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -619,7 +619,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -627,7 +627,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -635,7 +635,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -643,7 +643,7 @@
                     }
                 },
                 {
-                    "hash" : "bb025b193860ec94ae49ccf6eb385746db95e92602013b3b70411666fa2007e2",
+                    "hash" : "0xbb025b193860ec94ae49ccf6eb385746db95e92602013b3b70411666fa2007e2",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 3,
@@ -651,7 +651,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 3,
@@ -661,16 +661,16 @@
             ]
         },
         "pre" : {
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x6001600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "ffffffffffffffffffffffffffffffffffffffff" : {
+            "0xffffffffffffffffffffffffffffffffffffffff" : {
                 "balance" : "0x0186a0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -682,20 +682,20 @@
                 "0x1122334455667788990011223344556677889910"
             ],
             "gasLimit" : [
-                "60000",
-                "20000",
-                "21000",
-                "121000"
+                "0xea60",
+                "0x4e20",
+                "0x5208",
+                "0x01d8a8"
             ],
             "gasPrice" : "0x00",
             "nonce" : "0x00",
             "r" : "0x00",
             "s" : "0x00",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "v" : "0x01",
             "value" : [
-                "0",
-                "1"
+                "0x00",
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransactionTest/zeroSigTransaction0Price.json b/GeneralStateTests/stTransactionTest/zeroSigTransaction0Price.json
index 182a209c9..e15ee9bd5 100644
--- a/GeneralStateTests/stTransactionTest/zeroSigTransaction0Price.json
+++ b/GeneralStateTests/stTransactionTest/zeroSigTransaction0Price.json
@@ -1,17 +1,17 @@
 {
     "zeroSigTransaction0Price" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -27,7 +27,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -35,7 +35,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -43,7 +43,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -51,7 +51,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -59,7 +59,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
@@ -67,7 +67,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
@@ -75,7 +75,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -83,7 +83,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -91,7 +91,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -99,7 +99,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -107,7 +107,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -115,7 +115,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -123,7 +123,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 3,
@@ -131,7 +131,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 3,
@@ -141,7 +141,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -149,7 +149,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -157,7 +157,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -165,7 +165,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -173,7 +173,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -181,7 +181,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -189,7 +189,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
@@ -197,7 +197,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
@@ -205,7 +205,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -213,7 +213,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -221,7 +221,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -229,7 +229,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -237,7 +237,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -245,7 +245,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -253,7 +253,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 3,
@@ -261,7 +261,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 3,
@@ -271,7 +271,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -279,7 +279,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -287,7 +287,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -295,7 +295,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -303,7 +303,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -311,7 +311,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -319,7 +319,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
@@ -327,7 +327,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
@@ -335,7 +335,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -343,7 +343,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -351,7 +351,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -359,7 +359,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -367,7 +367,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -375,7 +375,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -383,7 +383,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 3,
@@ -391,7 +391,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 3,
@@ -401,7 +401,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -409,7 +409,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -417,7 +417,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -425,7 +425,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -433,7 +433,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -441,7 +441,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -449,7 +449,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
@@ -457,7 +457,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
@@ -465,7 +465,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -473,7 +473,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -481,7 +481,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -489,7 +489,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -497,7 +497,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -505,7 +505,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -513,7 +513,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 3,
@@ -521,7 +521,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 3,
@@ -531,7 +531,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "bb025b193860ec94ae49ccf6eb385746db95e92602013b3b70411666fa2007e2",
+                    "hash" : "0xbb025b193860ec94ae49ccf6eb385746db95e92602013b3b70411666fa2007e2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -539,7 +539,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -547,7 +547,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -555,7 +555,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -563,7 +563,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -571,7 +571,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -579,7 +579,7 @@
                     }
                 },
                 {
-                    "hash" : "bb025b193860ec94ae49ccf6eb385746db95e92602013b3b70411666fa2007e2",
+                    "hash" : "0xbb025b193860ec94ae49ccf6eb385746db95e92602013b3b70411666fa2007e2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
@@ -587,7 +587,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
@@ -595,7 +595,7 @@
                     }
                 },
                 {
-                    "hash" : "bb025b193860ec94ae49ccf6eb385746db95e92602013b3b70411666fa2007e2",
+                    "hash" : "0xbb025b193860ec94ae49ccf6eb385746db95e92602013b3b70411666fa2007e2",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -603,7 +603,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -611,7 +611,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -619,7 +619,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -627,7 +627,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -635,7 +635,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -643,7 +643,7 @@
                     }
                 },
                 {
-                    "hash" : "bb025b193860ec94ae49ccf6eb385746db95e92602013b3b70411666fa2007e2",
+                    "hash" : "0xbb025b193860ec94ae49ccf6eb385746db95e92602013b3b70411666fa2007e2",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 3,
@@ -651,7 +651,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 3,
@@ -661,16 +661,16 @@
             ]
         },
         "pre" : {
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x6001600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "ffffffffffffffffffffffffffffffffffffffff" : {
+            "0xffffffffffffffffffffffffffffffffffffffff" : {
                 "balance" : "0x0186a0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -682,20 +682,20 @@
                 "0x1122334455667788990011223344556677889910"
             ],
             "gasLimit" : [
-                "60000",
-                "20000",
-                "21000",
-                "121000"
+                "0xea60",
+                "0x4e20",
+                "0x5208",
+                "0x01d8a8"
             ],
             "gasPrice" : "0x00",
             "nonce" : "0x00",
             "r" : "0x00",
             "s" : "0x00",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "v" : "0x01",
             "value" : [
-                "0",
-                "1"
+                "0x00",
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransactionTest/zeroSigTransactionInvChainID.json b/GeneralStateTests/stTransactionTest/zeroSigTransactionInvChainID.json
index 30c3cf29a..73db4fd28 100644
--- a/GeneralStateTests/stTransactionTest/zeroSigTransactionInvChainID.json
+++ b/GeneralStateTests/stTransactionTest/zeroSigTransactionInvChainID.json
@@ -1,17 +1,17 @@
 {
     "zeroSigTransactionInvChainID" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -27,7 +27,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -35,7 +35,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -43,7 +43,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -51,7 +51,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -59,7 +59,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -67,7 +67,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -75,7 +75,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -83,7 +83,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -91,7 +91,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -99,7 +99,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -109,7 +109,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -117,7 +117,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -125,7 +125,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -133,7 +133,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -141,7 +141,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -149,7 +149,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -157,7 +157,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -165,7 +165,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -173,7 +173,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -181,7 +181,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -189,7 +189,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -197,7 +197,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -207,7 +207,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -215,7 +215,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -223,7 +223,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -231,7 +231,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -239,7 +239,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -247,7 +247,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -255,7 +255,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -263,7 +263,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -271,7 +271,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -279,7 +279,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -287,7 +287,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -295,7 +295,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -305,7 +305,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -313,7 +313,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -321,7 +321,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -329,7 +329,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -337,7 +337,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -345,7 +345,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -353,7 +353,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -361,7 +361,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -369,7 +369,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -377,7 +377,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -385,7 +385,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -393,7 +393,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -403,7 +403,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -411,7 +411,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -419,7 +419,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -427,7 +427,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -435,7 +435,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -443,7 +443,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -451,7 +451,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -459,7 +459,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -467,7 +467,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -475,7 +475,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -483,7 +483,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -491,7 +491,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -501,16 +501,16 @@
             ]
         },
         "pre" : {
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x6001600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "ffffffffffffffffffffffffffffffffffffffff" : {
+            "0xffffffffffffffffffffffffffffffffffffffff" : {
                 "balance" : "0x0186a0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -522,19 +522,19 @@
                 "0x1122334455667788990011223344556677889910"
             ],
             "gasLimit" : [
-                "60000",
-                "21000",
-                "121000"
+                "0xea60",
+                "0x5208",
+                "0x01d8a8"
             ],
             "gasPrice" : "0x00",
             "nonce" : "0x00",
             "r" : "0x00",
             "s" : "0x00",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "v" : "0x00",
             "value" : [
-                "0",
-                "1"
+                "0x00",
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransactionTest/zeroSigTransactionInvNonce.json b/GeneralStateTests/stTransactionTest/zeroSigTransactionInvNonce.json
index 18f607a3a..6162c9c9f 100644
--- a/GeneralStateTests/stTransactionTest/zeroSigTransactionInvNonce.json
+++ b/GeneralStateTests/stTransactionTest/zeroSigTransactionInvNonce.json
@@ -1,17 +1,17 @@
 {
     "zeroSigTransactionInvNonce" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -27,7 +27,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -35,7 +35,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -43,7 +43,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -51,7 +51,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -59,7 +59,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -67,7 +67,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -75,7 +75,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -83,7 +83,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -91,7 +91,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -99,7 +99,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -109,7 +109,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -117,7 +117,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -125,7 +125,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -133,7 +133,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -141,7 +141,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -149,7 +149,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -157,7 +157,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -165,7 +165,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -173,7 +173,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -181,7 +181,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -189,7 +189,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -197,7 +197,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -207,7 +207,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -215,7 +215,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -223,7 +223,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -231,7 +231,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -239,7 +239,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -247,7 +247,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -255,7 +255,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -263,7 +263,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -271,7 +271,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -279,7 +279,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -287,7 +287,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -295,7 +295,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -305,7 +305,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -313,7 +313,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -321,7 +321,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -329,7 +329,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -337,7 +337,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -345,7 +345,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -353,7 +353,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -361,7 +361,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -369,7 +369,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -377,7 +377,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -385,7 +385,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -393,7 +393,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -403,7 +403,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -411,7 +411,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -419,7 +419,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -427,7 +427,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -435,7 +435,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -443,7 +443,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -451,7 +451,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -459,7 +459,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -467,7 +467,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -475,7 +475,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -483,7 +483,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -491,7 +491,7 @@
                     }
                 },
                 {
-                    "hash" : "c60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
+                    "hash" : "0xc60c9d1b3edf32c1506b900ec78a46004a1557be9703689f9e901e1709518e76",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -501,16 +501,16 @@
             ]
         },
         "pre" : {
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x6001600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "ffffffffffffffffffffffffffffffffffffffff" : {
+            "0xffffffffffffffffffffffffffffffffffffffff" : {
                 "balance" : "0x0186a0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -522,19 +522,19 @@
                 "0x1122334455667788990011223344556677889910"
             ],
             "gasLimit" : [
-                "60000",
-                "21000",
-                "121000"
+                "0xea60",
+                "0x5208",
+                "0x01d8a8"
             ],
             "gasPrice" : "0x00",
             "nonce" : "0x0a",
             "r" : "0x00",
             "s" : "0x00",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "v" : "0x01",
             "value" : [
-                "0",
-                "1"
+                "0x00",
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransactionTest/zeroSigTransactionInvNonce2.json b/GeneralStateTests/stTransactionTest/zeroSigTransactionInvNonce2.json
index cc9eb1091..613aaecd9 100644
--- a/GeneralStateTests/stTransactionTest/zeroSigTransactionInvNonce2.json
+++ b/GeneralStateTests/stTransactionTest/zeroSigTransactionInvNonce2.json
@@ -1,17 +1,17 @@
 {
     "zeroSigTransactionInvNonce2" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -27,7 +27,7 @@
                     }
                 },
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -35,7 +35,7 @@
                     }
                 },
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -43,7 +43,7 @@
                     }
                 },
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -51,7 +51,7 @@
                     }
                 },
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -59,7 +59,7 @@
                     }
                 },
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -67,7 +67,7 @@
                     }
                 },
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -75,7 +75,7 @@
                     }
                 },
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -83,7 +83,7 @@
                     }
                 },
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -91,7 +91,7 @@
                     }
                 },
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -99,7 +99,7 @@
                     }
                 },
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -109,7 +109,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -117,7 +117,7 @@
                     }
                 },
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -125,7 +125,7 @@
                     }
                 },
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -133,7 +133,7 @@
                     }
                 },
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -141,7 +141,7 @@
                     }
                 },
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -149,7 +149,7 @@
                     }
                 },
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -157,7 +157,7 @@
                     }
                 },
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -165,7 +165,7 @@
                     }
                 },
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -173,7 +173,7 @@
                     }
                 },
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -181,7 +181,7 @@
                     }
                 },
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -189,7 +189,7 @@
                     }
                 },
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -197,7 +197,7 @@
                     }
                 },
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -207,7 +207,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -215,7 +215,7 @@
                     }
                 },
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -223,7 +223,7 @@
                     }
                 },
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -231,7 +231,7 @@
                     }
                 },
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -239,7 +239,7 @@
                     }
                 },
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -247,7 +247,7 @@
                     }
                 },
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -255,7 +255,7 @@
                     }
                 },
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -263,7 +263,7 @@
                     }
                 },
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -271,7 +271,7 @@
                     }
                 },
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -279,7 +279,7 @@
                     }
                 },
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -287,7 +287,7 @@
                     }
                 },
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -295,7 +295,7 @@
                     }
                 },
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -305,7 +305,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -313,7 +313,7 @@
                     }
                 },
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -321,7 +321,7 @@
                     }
                 },
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -329,7 +329,7 @@
                     }
                 },
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -337,7 +337,7 @@
                     }
                 },
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -345,7 +345,7 @@
                     }
                 },
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -353,7 +353,7 @@
                     }
                 },
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -361,7 +361,7 @@
                     }
                 },
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -369,7 +369,7 @@
                     }
                 },
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -377,7 +377,7 @@
                     }
                 },
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -385,7 +385,7 @@
                     }
                 },
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -393,7 +393,7 @@
                     }
                 },
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -403,7 +403,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -411,7 +411,7 @@
                     }
                 },
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -419,7 +419,7 @@
                     }
                 },
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -427,7 +427,7 @@
                     }
                 },
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -435,7 +435,7 @@
                     }
                 },
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -443,7 +443,7 @@
                     }
                 },
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -451,7 +451,7 @@
                     }
                 },
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -459,7 +459,7 @@
                     }
                 },
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -467,7 +467,7 @@
                     }
                 },
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -475,7 +475,7 @@
                     }
                 },
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -483,7 +483,7 @@
                     }
                 },
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -491,7 +491,7 @@
                     }
                 },
                 {
-                    "hash" : "e59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
+                    "hash" : "0xe59e520bda82a64dc46cf9880d05f8576e98428c280469c192a2db507ac006c0",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -501,16 +501,16 @@
             ]
         },
         "pre" : {
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x6001600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "ffffffffffffffffffffffffffffffffffffffff" : {
+            "0xffffffffffffffffffffffffffffffffffffffff" : {
                 "balance" : "0x0186a0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
@@ -522,19 +522,19 @@
                 "0x1122334455667788990011223344556677889910"
             ],
             "gasLimit" : [
-                "60000",
-                "21000",
-                "121000"
+                "0xea60",
+                "0x5208",
+                "0x01d8a8"
             ],
             "gasPrice" : "0x00",
             "nonce" : "0x01",
             "r" : "0x00",
             "s" : "0x00",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "v" : "0x01",
             "value" : [
-                "0",
-                "1"
+                "0x00",
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransactionTest/zeroSigTransactionOOG.json b/GeneralStateTests/stTransactionTest/zeroSigTransactionOOG.json
index 4fdce89b7..1ae35c2f9 100644
--- a/GeneralStateTests/stTransactionTest/zeroSigTransactionOOG.json
+++ b/GeneralStateTests/stTransactionTest/zeroSigTransactionOOG.json
@@ -1,17 +1,17 @@
 {
     "zeroSigTransactionOOG" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -27,7 +27,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -35,7 +35,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -43,7 +43,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -51,7 +51,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -59,7 +59,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
@@ -67,7 +67,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
@@ -75,7 +75,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -83,7 +83,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -91,7 +91,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -99,7 +99,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -107,7 +107,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -115,7 +115,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -123,7 +123,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 3,
@@ -131,7 +131,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 3,
@@ -141,7 +141,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -149,7 +149,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -157,7 +157,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -165,7 +165,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -173,7 +173,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -181,7 +181,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -189,7 +189,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
@@ -197,7 +197,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
@@ -205,7 +205,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -213,7 +213,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -221,7 +221,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -229,7 +229,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -237,7 +237,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -245,7 +245,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -253,7 +253,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 3,
@@ -261,7 +261,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 3,
@@ -271,7 +271,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -279,7 +279,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -287,7 +287,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -295,7 +295,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -303,7 +303,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -311,7 +311,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -319,7 +319,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
@@ -327,7 +327,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
@@ -335,7 +335,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -343,7 +343,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -351,7 +351,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -359,7 +359,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -367,7 +367,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -375,7 +375,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -383,7 +383,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 3,
@@ -391,7 +391,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 3,
@@ -401,7 +401,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -409,7 +409,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -417,7 +417,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -425,7 +425,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -433,7 +433,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -441,7 +441,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -449,7 +449,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
@@ -457,7 +457,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
@@ -465,7 +465,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -473,7 +473,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -481,7 +481,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -489,7 +489,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -497,7 +497,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -505,7 +505,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -513,7 +513,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 3,
@@ -521,7 +521,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 3,
@@ -531,15 +531,32 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7bfed3b071d3fde42caf517a24c3a4361124eff0c63743de92b847eeb162d526",
+                    "hash" : "0xae5f6090817aeb40d7d5cf104f738261f67c510ad973e06e8982124f9d1da856",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
+                    },
+                    "postState" : {
+                        "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x00",
+                            "code" : "0x6001600055",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x00" : "0x01"
+                            }
+                        },
+                        "0xffffffffffffffffffffffffffffffffffffffff" : {
+                            "balance" : "0x00",
+                            "code" : "",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        }
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -547,7 +564,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -555,7 +572,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -563,7 +580,7 @@
                     }
                 },
                 {
-                    "hash" : "d506140af993cf273f1e9984a13cd06c1d469640180a5b5a78907e75ae230098",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -571,7 +588,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 2,
@@ -579,15 +596,32 @@
                     }
                 },
                 {
-                    "hash" : "7bfed3b071d3fde42caf517a24c3a4361124eff0c63743de92b847eeb162d526",
+                    "hash" : "0xae5f6090817aeb40d7d5cf104f738261f67c510ad973e06e8982124f9d1da856",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
                         "value" : 0
+                    },
+                    "postState" : {
+                        "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x00",
+                            "code" : "0x6001600055",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x00" : "0x01"
+                            }
+                        },
+                        "0xffffffffffffffffffffffffffffffffffffffff" : {
+                            "balance" : "0x00",
+                            "code" : "",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        }
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 3,
@@ -595,15 +629,32 @@
                     }
                 },
                 {
-                    "hash" : "7bfed3b071d3fde42caf517a24c3a4361124eff0c63743de92b847eeb162d526",
+                    "hash" : "0xae5f6090817aeb40d7d5cf104f738261f67c510ad973e06e8982124f9d1da856",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
                         "value" : 0
+                    },
+                    "postState" : {
+                        "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x00",
+                            "code" : "0x6001600055",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x00" : "0x01"
+                            }
+                        },
+                        "0xffffffffffffffffffffffffffffffffffffffff" : {
+                            "balance" : "0x00",
+                            "code" : "",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        }
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 0,
@@ -611,7 +662,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -619,7 +670,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 1,
@@ -627,7 +678,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -635,7 +686,7 @@
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 2,
@@ -643,15 +694,32 @@
                     }
                 },
                 {
-                    "hash" : "7bfed3b071d3fde42caf517a24c3a4361124eff0c63743de92b847eeb162d526",
+                    "hash" : "0xae5f6090817aeb40d7d5cf104f738261f67c510ad973e06e8982124f9d1da856",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 3,
                         "value" : 0
+                    },
+                    "postState" : {
+                        "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x00",
+                            "code" : "0x6001600055",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x00" : "0x01"
+                            }
+                        },
+                        "0xffffffffffffffffffffffffffffffffffffffff" : {
+                            "balance" : "0x00",
+                            "code" : "",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        }
                     }
                 },
                 {
-                    "hash" : "e2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
+                    "hash" : "0xe2830d5ee03749aa8db4754366e73e851f3f7bf3aa3ce258f75a10af526ad0ed",
                     "indexes" : {
                         "data" : 1,
                         "gas" : 3,
@@ -661,16 +729,16 @@
             ]
         },
         "pre" : {
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x6001600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "ffffffffffffffffffffffffffffffffffffffff" : {
+            "0xffffffffffffffffffffffffffffffffffffffff" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -682,20 +750,20 @@
                 "0x1122334455667788990011223344556677889910"
             ],
             "gasLimit" : [
-                "60000",
-                "20000",
-                "21000",
-                "121000"
+                "0xea60",
+                "0x4e20",
+                "0x5208",
+                "0x01d8a8"
             ],
             "gasPrice" : "0x00",
             "nonce" : "0x00",
             "r" : "0x00",
             "s" : "0x00",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "v" : "0x01",
             "value" : [
-                "0",
-                "1"
+                "0x00",
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsAfter.json b/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsAfter.json
index f3da3b28a..e384a3a09 100644
--- a/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsAfter.json
+++ b/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsAfter.json
@@ -1,17 +1,17 @@
 {
     "createNameRegistratorPerTxsAfter" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x02540be400",
             "currentNumber" : "0x118c31",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a8d7d1b8699bdceade31abacca281e2570461a3083f2767cbaad1ed08581cf2b",
+                    "hash" : "0xa8d7d1b8699bdceade31abacca281e2570461a3083f2767cbaad1ed08581cf2b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "90fb2086df06776e9e04c413551df4b1aafcaeda3b3c5e754e16e65f75671bde",
+                    "hash" : "0x90fb2086df06776e9e04c413551df4b1aafcaeda3b3c5e754e16e65f75671bde",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e0911f5b8035d9192581b3a82ddb0a32955e880088c49e92936789be2310ef90",
+                    "hash" : "0xe0911f5b8035d9192581b3a82ddb0a32955e880088c49e92936789be2310ef90",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a8d7d1b8699bdceade31abacca281e2570461a3083f2767cbaad1ed08581cf2b",
+                    "hash" : "0xa8d7d1b8699bdceade31abacca281e2570461a3083f2767cbaad1ed08581cf2b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "90fb2086df06776e9e04c413551df4b1aafcaeda3b3c5e754e16e65f75671bde",
+                    "hash" : "0x90fb2086df06776e9e04c413551df4b1aafcaeda3b3c5e754e16e65f75671bde",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -78,10 +78,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsAt.json b/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsAt.json
index 35a358a54..0ad40961e 100644
--- a/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsAt.json
+++ b/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsAt.json
@@ -1,17 +1,17 @@
 {
     "createNameRegistratorPerTxsAt" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x02540be400",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a8d7d1b8699bdceade31abacca281e2570461a3083f2767cbaad1ed08581cf2b",
+                    "hash" : "0xa8d7d1b8699bdceade31abacca281e2570461a3083f2767cbaad1ed08581cf2b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "90fb2086df06776e9e04c413551df4b1aafcaeda3b3c5e754e16e65f75671bde",
+                    "hash" : "0x90fb2086df06776e9e04c413551df4b1aafcaeda3b3c5e754e16e65f75671bde",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e0911f5b8035d9192581b3a82ddb0a32955e880088c49e92936789be2310ef90",
+                    "hash" : "0xe0911f5b8035d9192581b3a82ddb0a32955e880088c49e92936789be2310ef90",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a8d7d1b8699bdceade31abacca281e2570461a3083f2767cbaad1ed08581cf2b",
+                    "hash" : "0xa8d7d1b8699bdceade31abacca281e2570461a3083f2767cbaad1ed08581cf2b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "90fb2086df06776e9e04c413551df4b1aafcaeda3b3c5e754e16e65f75671bde",
+                    "hash" : "0x90fb2086df06776e9e04c413551df4b1aafcaeda3b3c5e754e16e65f75671bde",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -78,10 +78,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsBefore.json b/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsBefore.json
index 5bd7ed298..278112d10 100644
--- a/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsBefore.json
+++ b/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsBefore.json
@@ -1,17 +1,17 @@
 {
     "createNameRegistratorPerTxsBefore" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x02540be400",
             "currentNumber" : "0x118c2f",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a8d7d1b8699bdceade31abacca281e2570461a3083f2767cbaad1ed08581cf2b",
+                    "hash" : "0xa8d7d1b8699bdceade31abacca281e2570461a3083f2767cbaad1ed08581cf2b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "90fb2086df06776e9e04c413551df4b1aafcaeda3b3c5e754e16e65f75671bde",
+                    "hash" : "0x90fb2086df06776e9e04c413551df4b1aafcaeda3b3c5e754e16e65f75671bde",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e0911f5b8035d9192581b3a82ddb0a32955e880088c49e92936789be2310ef90",
+                    "hash" : "0xe0911f5b8035d9192581b3a82ddb0a32955e880088c49e92936789be2310ef90",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a8d7d1b8699bdceade31abacca281e2570461a3083f2767cbaad1ed08581cf2b",
+                    "hash" : "0xa8d7d1b8699bdceade31abacca281e2570461a3083f2767cbaad1ed08581cf2b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "90fb2086df06776e9e04c413551df4b1aafcaeda3b3c5e754e16e65f75671bde",
+                    "hash" : "0x90fb2086df06776e9e04c413551df4b1aafcaeda3b3c5e754e16e65f75671bde",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -78,10 +78,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasAfter.json b/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasAfter.json
index 046374224..f28581d11 100644
--- a/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasAfter.json
+++ b/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasAfter.json
@@ -1,17 +1,17 @@
 {
     "createNameRegistratorPerTxsNotEnoughGasAfter" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x02540be400",
             "currentNumber" : "0x118c31",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
+                    "hash" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
+                    "hash" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6dcd1874a8295fa628ca7c100e9fa6248e74b92afd9a7b8511879078dfc2f007",
+                    "hash" : "0x6dcd1874a8295fa628ca7c100e9fa6248e74b92afd9a7b8511879078dfc2f007",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
+                    "hash" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
+                    "hash" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -78,10 +78,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasAt.json b/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasAt.json
index 27283792c..434ee7f86 100644
--- a/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasAt.json
+++ b/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasAt.json
@@ -1,17 +1,17 @@
 {
     "createNameRegistratorPerTxsNotEnoughGasAt" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x02540be400",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
+                    "hash" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
+                    "hash" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6dcd1874a8295fa628ca7c100e9fa6248e74b92afd9a7b8511879078dfc2f007",
+                    "hash" : "0x6dcd1874a8295fa628ca7c100e9fa6248e74b92afd9a7b8511879078dfc2f007",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
+                    "hash" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
+                    "hash" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -78,10 +78,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasBefore.json b/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasBefore.json
index 3ff0c3dbb..37a1c33ae 100644
--- a/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasBefore.json
+++ b/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasBefore.json
@@ -1,17 +1,17 @@
 {
     "createNameRegistratorPerTxsNotEnoughGasBefore" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x02540be400",
             "currentNumber" : "0x118c2f",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
+                    "hash" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
+                    "hash" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6dcd1874a8295fa628ca7c100e9fa6248e74b92afd9a7b8511879078dfc2f007",
+                    "hash" : "0x6dcd1874a8295fa628ca7c100e9fa6248e74b92afd9a7b8511879078dfc2f007",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
+                    "hash" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
+                    "hash" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -78,10 +78,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransitionTest/delegatecallAfterTransition.json b/GeneralStateTests/stTransitionTest/delegatecallAfterTransition.json
index 8a29195f0..c8d6bf884 100644
--- a/GeneralStateTests/stTransitionTest/delegatecallAfterTransition.json
+++ b/GeneralStateTests/stTransitionTest/delegatecallAfterTransition.json
@@ -1,17 +1,17 @@
 {
     "delegatecallAfterTransition" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x118c31",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6130e3b78ce4b97ac76cb8dbfdbddfd077dc718d645273fabda84a910ee3c8ac",
+                    "hash" : "0x6130e3b78ce4b97ac76cb8dbfdbddfd077dc718d645273fabda84a910ee3c8ac",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6130e3b78ce4b97ac76cb8dbfdbddfd077dc718d645273fabda84a910ee3c8ac",
+                    "hash" : "0x6130e3b78ce4b97ac76cb8dbfdbddfd077dc718d645273fabda84a910ee3c8ac",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "34d7901155216d65e87ee1875a09b467b9391bd0a3a704619dfc6ae70b573f71",
+                    "hash" : "0x34d7901155216d65e87ee1875a09b467b9391bd0a3a704619dfc6ae70b573f71",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c771b92f1bfbf013423eeb94a8cba0f29e4420925b3b59e5722d9eb5c8ca5e13",
+                    "hash" : "0xc771b92f1bfbf013423eeb94a8cba0f29e4420925b3b59e5722d9eb5c8ca5e13",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6130e3b78ce4b97ac76cb8dbfdbddfd077dc718d645273fabda84a910ee3c8ac",
+                    "hash" : "0x6130e3b78ce4b97ac76cb8dbfdbddfd077dc718d645273fabda84a910ee3c8ac",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x3360015534600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransitionTest/delegatecallAtTransition.json b/GeneralStateTests/stTransitionTest/delegatecallAtTransition.json
index 717d20352..4c9de8821 100644
--- a/GeneralStateTests/stTransitionTest/delegatecallAtTransition.json
+++ b/GeneralStateTests/stTransitionTest/delegatecallAtTransition.json
@@ -1,17 +1,17 @@
 {
     "delegatecallAtTransition" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6130e3b78ce4b97ac76cb8dbfdbddfd077dc718d645273fabda84a910ee3c8ac",
+                    "hash" : "0x6130e3b78ce4b97ac76cb8dbfdbddfd077dc718d645273fabda84a910ee3c8ac",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6130e3b78ce4b97ac76cb8dbfdbddfd077dc718d645273fabda84a910ee3c8ac",
+                    "hash" : "0x6130e3b78ce4b97ac76cb8dbfdbddfd077dc718d645273fabda84a910ee3c8ac",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "34d7901155216d65e87ee1875a09b467b9391bd0a3a704619dfc6ae70b573f71",
+                    "hash" : "0x34d7901155216d65e87ee1875a09b467b9391bd0a3a704619dfc6ae70b573f71",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c771b92f1bfbf013423eeb94a8cba0f29e4420925b3b59e5722d9eb5c8ca5e13",
+                    "hash" : "0xc771b92f1bfbf013423eeb94a8cba0f29e4420925b3b59e5722d9eb5c8ca5e13",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6130e3b78ce4b97ac76cb8dbfdbddfd077dc718d645273fabda84a910ee3c8ac",
+                    "hash" : "0x6130e3b78ce4b97ac76cb8dbfdbddfd077dc718d645273fabda84a910ee3c8ac",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x3360015534600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stTransitionTest/delegatecallBeforeTransition.json b/GeneralStateTests/stTransitionTest/delegatecallBeforeTransition.json
index c845893d2..bd7e7580e 100644
--- a/GeneralStateTests/stTransitionTest/delegatecallBeforeTransition.json
+++ b/GeneralStateTests/stTransitionTest/delegatecallBeforeTransition.json
@@ -1,17 +1,17 @@
 {
     "delegatecallBeforeTransition" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x118c2f",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6130e3b78ce4b97ac76cb8dbfdbddfd077dc718d645273fabda84a910ee3c8ac",
+                    "hash" : "0x6130e3b78ce4b97ac76cb8dbfdbddfd077dc718d645273fabda84a910ee3c8ac",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6130e3b78ce4b97ac76cb8dbfdbddfd077dc718d645273fabda84a910ee3c8ac",
+                    "hash" : "0x6130e3b78ce4b97ac76cb8dbfdbddfd077dc718d645273fabda84a910ee3c8ac",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "34d7901155216d65e87ee1875a09b467b9391bd0a3a704619dfc6ae70b573f71",
+                    "hash" : "0x34d7901155216d65e87ee1875a09b467b9391bd0a3a704619dfc6ae70b573f71",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c771b92f1bfbf013423eeb94a8cba0f29e4420925b3b59e5722d9eb5c8ca5e13",
+                    "hash" : "0xc771b92f1bfbf013423eeb94a8cba0f29e4420925b3b59e5722d9eb5c8ca5e13",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6130e3b78ce4b97ac76cb8dbfdbddfd077dc718d645273fabda84a910ee3c8ac",
+                    "hash" : "0x6130e3b78ce4b97ac76cb8dbfdbddfd077dc718d645273fabda84a910ee3c8ac",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x3360015534600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "3000000"
+                "0x2dc6c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stWalletTest/dayLimitConstruction.json b/GeneralStateTests/stWalletTest/dayLimitConstruction.json
index 313421f47..d854fd634 100644
--- a/GeneralStateTests/stWalletTest/dayLimitConstruction.json
+++ b/GeneralStateTests/stWalletTest/dayLimitConstruction.json
@@ -1,17 +1,17 @@
 {
     "dayLimitConstruction" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a7ed609d610d1a11fd22807e6c8bb8a2e6764838af4c0a183e90d5424ad2ee7e",
+                    "hash" : "0xa7ed609d610d1a11fd22807e6c8bb8a2e6764838af4c0a183e90d5424ad2ee7e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "a7ed609d610d1a11fd22807e6c8bb8a2e6764838af4c0a183e90d5424ad2ee7e",
+                    "hash" : "0xa7ed609d610d1a11fd22807e6c8bb8a2e6764838af4c0a183e90d5424ad2ee7e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -29,7 +29,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "56e9417d578f0432f2ddf356c7cedadaf71ea194494d8f288ca2ea7fe39fda32",
+                    "hash" : "0x56e9417d578f0432f2ddf356c7cedadaf71ea194494d8f288ca2ea7fe39fda32",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -37,7 +37,7 @@
                     }
                 },
                 {
-                    "hash" : "56e9417d578f0432f2ddf356c7cedadaf71ea194494d8f288ca2ea7fe39fda32",
+                    "hash" : "0x56e9417d578f0432f2ddf356c7cedadaf71ea194494d8f288ca2ea7fe39fda32",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -47,7 +47,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "0ee86fc01d7944c33b3b8babbc4f94d9043ce11d7524cf7d7dcd528e8a830815",
+                    "hash" : "0x0ee86fc01d7944c33b3b8babbc4f94d9043ce11d7524cf7d7dcd528e8a830815",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -55,7 +55,7 @@
                     }
                 },
                 {
-                    "hash" : "0ee86fc01d7944c33b3b8babbc4f94d9043ce11d7524cf7d7dcd528e8a830815",
+                    "hash" : "0x0ee86fc01d7944c33b3b8babbc4f94d9043ce11d7524cf7d7dcd528e8a830815",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -65,7 +65,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a7ed609d610d1a11fd22807e6c8bb8a2e6764838af4c0a183e90d5424ad2ee7e",
+                    "hash" : "0xa7ed609d610d1a11fd22807e6c8bb8a2e6764838af4c0a183e90d5424ad2ee7e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -73,7 +73,7 @@
                     }
                 },
                 {
-                    "hash" : "a7ed609d610d1a11fd22807e6c8bb8a2e6764838af4c0a183e90d5424ad2ee7e",
+                    "hash" : "0xa7ed609d610d1a11fd22807e6c8bb8a2e6764838af4c0a183e90d5424ad2ee7e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -83,7 +83,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "56e9417d578f0432f2ddf356c7cedadaf71ea194494d8f288ca2ea7fe39fda32",
+                    "hash" : "0x56e9417d578f0432f2ddf356c7cedadaf71ea194494d8f288ca2ea7fe39fda32",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -91,7 +91,7 @@
                     }
                 },
                 {
-                    "hash" : "56e9417d578f0432f2ddf356c7cedadaf71ea194494d8f288ca2ea7fe39fda32",
+                    "hash" : "0x56e9417d578f0432f2ddf356c7cedadaf71ea194494d8f288ca2ea7fe39fda32",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -101,9 +101,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75ef08f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
@@ -114,15 +114,15 @@
                 "606060409081526001600081815581805533600160a060020a0316600381905581526101026020529190912055620151804204610107556109b4806100456000396000f300606060405236156100985760e060020a6000350463173825d9811461009a5780632f54bf6e146100f65780634123cb6b1461011a5780635c52c2f5146101235780637065cb4814610154578063746c917114610188578063b20d30a914610191578063b75c7dc6146101c5578063ba51a6df146101f5578063c2cf732614610229578063f00d4b5d14610269578063f1736d86146102a2575b005b6100986004356000600036436040518084848082843750505090910190815260405190819003602001902090506105b9815b600160a060020a0333166000908152610102602052604081205481808083811415610719576108b0565b6102ac6004355b600160a060020a0316600090815261010260205260408120541190565b6102ac60015481565b6100986000364360405180848480828437505050909101908152604051908190036020019020905061070b816100cc565b61009860043560003643604051808484808284375050509091019081526040519081900360200190209050610531816100cc565b6102ac60005481565b610098600435600036436040518084848082843750505090910190815260405190819003602001902090506106ff816100cc565b610098600435600160a060020a03331660009081526101026020526040812054908080838114156102be57610340565b61009860043560003643604051808484808284375050509091019081526040519081900360200190209050610678816100cc565b6102ac600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156106d1576106f5565b6100986004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506103ca816100cc565b6102ac6101055481565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156103405781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156103c3576103d8836100fd565b156103e357506103c5565b600160a060020a03841660009081526101026020526040812054925082141561040c57506103c5565b6103475b6101045460005b8181101561085f576101048054829081101561000257600091825260008051602061099483398151915201541461048a5761010480546101039160009184908110156100025760008051602061099483398151915201548252506020919091526040812081815560018101829055600201555b600101610417565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561052c5761053f826100fd565b1561054a575061052e565b610552610410565b60015460fa90106105675761056561057c565b505b60015460fa9010610492575061052e565b6106365b600060015b600154811015610899575b600154811080156105ac5750600281610100811015610002570154600014155b156108b95760010161058c565b156103c557600160a060020a0383166000908152610102602052604081205492508214156105e7575061052c565b6001600160005054036000600050541115610602575061052c565b600060028361010081101561000257508301819055600160a060020a03841681526101026020526040812055610578610410565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561052c5760015482111561068d575061052e565b600082905561069a610410565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106f057600094506106f5565b600194505b5050505092915050565b1561052c575061010555565b1561052e5760006101065550565b60008681526101036020526040812080549094509092508214156107a2578154835560018381018390556101048054918201808255828015829011610771578183600052602060002091820191016107719190610885565b5050506002840181905561010480548892908110156100025760009190915260008051602061099483398151915201555b506001820154600284900a908116600014156108b05760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a182546001901161089d57600086815261010360205260409020600201546101048054909190811015610002576040600090812060008051602061099483398151915292909201819055808255600180830182905560029092015595506108b09050565b61010480546000808355919091526103c590600080516020610994833981519152908101905b808211156108995760008155600101610885565b5090565b8254600019018355600183018054821790555b50505050919050565b5b600180541180156108dc57506001546002906101008110156100025701546000145b156108f057600180546000190190556108ba565b600154811080156109135750600154600290610100811015610002570154600014155b801561092d57506002816101008110156100025701546000145b1561098e57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61058156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"
             ],
             "gasLimit" : [
-                "817083",
-                "1217083"
+                "0x0c77bb",
+                "0x12923b"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x01",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "100"
+                "0x64"
             ]
         }
     }
diff --git a/GeneralStateTests/stWalletTest/dayLimitConstructionOOG.json b/GeneralStateTests/stWalletTest/dayLimitConstructionOOG.json
index 8f705793f..669edc9fb 100644
--- a/GeneralStateTests/stWalletTest/dayLimitConstructionOOG.json
+++ b/GeneralStateTests/stWalletTest/dayLimitConstructionOOG.json
@@ -1,17 +1,17 @@
 {
     "dayLimitConstructionOOG" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7757eb985d0d319cd645a63d5ce9cecbfb8bb4ea3d481d3c1a8a171d8804c78c",
+                    "hash" : "0x7757eb985d0d319cd645a63d5ce9cecbfb8bb4ea3d481d3c1a8a171d8804c78c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7757eb985d0d319cd645a63d5ce9cecbfb8bb4ea3d481d3c1a8a171d8804c78c",
+                    "hash" : "0x7757eb985d0d319cd645a63d5ce9cecbfb8bb4ea3d481d3c1a8a171d8804c78c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "adcf2b13c275760d72cf61dc682be74826170608f8ef2b352b3612dbe45aaec7",
+                    "hash" : "0xadcf2b13c275760d72cf61dc682be74826170608f8ef2b352b3612dbe45aaec7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "7757eb985d0d319cd645a63d5ce9cecbfb8bb4ea3d481d3c1a8a171d8804c78c",
+                    "hash" : "0x7757eb985d0d319cd645a63d5ce9cecbfb8bb4ea3d481d3c1a8a171d8804c78c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7757eb985d0d319cd645a63d5ce9cecbfb8bb4ea3d481d3c1a8a171d8804c78c",
+                    "hash" : "0x7757eb985d0d319cd645a63d5ce9cecbfb8bb4ea3d481d3c1a8a171d8804c78c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75ef08f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
@@ -78,10 +78,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x01",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "100"
+                "0x64"
             ]
         }
     }
diff --git a/GeneralStateTests/stWalletTest/dayLimitConstructionPartial.json b/GeneralStateTests/stWalletTest/dayLimitConstructionPartial.json
index 74b856997..ff5dee487 100644
--- a/GeneralStateTests/stWalletTest/dayLimitConstructionPartial.json
+++ b/GeneralStateTests/stWalletTest/dayLimitConstructionPartial.json
@@ -1,17 +1,17 @@
 {
     "dayLimitConstructionPartial" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a7ed609d610d1a11fd22807e6c8bb8a2e6764838af4c0a183e90d5424ad2ee7e",
+                    "hash" : "0xa7ed609d610d1a11fd22807e6c8bb8a2e6764838af4c0a183e90d5424ad2ee7e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "56e9417d578f0432f2ddf356c7cedadaf71ea194494d8f288ca2ea7fe39fda32",
+                    "hash" : "0x56e9417d578f0432f2ddf356c7cedadaf71ea194494d8f288ca2ea7fe39fda32",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "0ee86fc01d7944c33b3b8babbc4f94d9043ce11d7524cf7d7dcd528e8a830815",
+                    "hash" : "0x0ee86fc01d7944c33b3b8babbc4f94d9043ce11d7524cf7d7dcd528e8a830815",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a7ed609d610d1a11fd22807e6c8bb8a2e6764838af4c0a183e90d5424ad2ee7e",
+                    "hash" : "0xa7ed609d610d1a11fd22807e6c8bb8a2e6764838af4c0a183e90d5424ad2ee7e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "56e9417d578f0432f2ddf356c7cedadaf71ea194494d8f288ca2ea7fe39fda32",
+                    "hash" : "0x56e9417d578f0432f2ddf356c7cedadaf71ea194494d8f288ca2ea7fe39fda32",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75ef08f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
@@ -74,14 +74,14 @@
                 "606060409081526001600081815581805533600160a060020a0316600381905581526101026020529190912055620151804204610107556109b4806100456000396000f300606060405236156100985760e060020a6000350463173825d9811461009a5780632f54bf6e146100f65780634123cb6b1461011a5780635c52c2f5146101235780637065cb4814610154578063746c917114610188578063b20d30a914610191578063b75c7dc6146101c5578063ba51a6df146101f5578063c2cf732614610229578063f00d4b5d14610269578063f1736d86146102a2575b005b6100986004356000600036436040518084848082843750505090910190815260405190819003602001902090506105b9815b600160a060020a0333166000908152610102602052604081205481808083811415610719576108b0565b6102ac6004355b600160a060020a0316600090815261010260205260408120541190565b6102ac60015481565b6100986000364360405180848480828437505050909101908152604051908190036020019020905061070b816100cc565b61009860043560003643604051808484808284375050509091019081526040519081900360200190209050610531816100cc565b6102ac60005481565b610098600435600036436040518084848082843750505090910190815260405190819003602001902090506106ff816100cc565b610098600435600160a060020a03331660009081526101026020526040812054908080838114156102be57610340565b61009860043560003643604051808484808284375050509091019081526040519081900360200190209050610678816100cc565b6102ac600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156106d1576106f5565b6100986004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506103ca816100cc565b6102ac6101055481565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156103405781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156103c3576103d8836100fd565b156103e357506103c5565b600160a060020a03841660009081526101026020526040812054925082141561040c57506103c5565b6103475b6101045460005b8181101561085f576101048054829081101561000257600091825260008051602061099483398151915201541461048a5761010480546101039160009184908110156100025760008051602061099483398151915201548252506020919091526040812081815560018101829055600201555b600101610417565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561052c5761053f826100fd565b1561054a575061052e565b610552610410565b60015460fa90106105675761056561057c565b505b60015460fa9010610492575061052e565b6106365b600060015b600154811015610899575b600154811080156105ac5750600281610100811015610002570154600014155b156108b95760010161058c565b156103c557600160a060020a0383166000908152610102602052604081205492508214156105e7575061052c565b6001600160005054036000600050541115610602575061052c565b600060028361010081101561000257508301819055600160a060020a03841681526101026020526040812055610578610410565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561052c5760015482111561068d575061052e565b600082905561069a610410565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106f057600094506106f5565b600194505b5050505092915050565b1561052c575061010555565b1561052e5760006101065550565b60008681526101036020526040812080549094509092508214156107a2578154835560018381018390556101048054918201808255828015829011610771578183600052602060002091820191016107719190610885565b5050506002840181905561010480548892908110156100025760009190915260008051602061099483398151915201555b506001820154600284900a908116600014156108b05760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a182546001901161089d57600086815261010360205260409020600201546101048054909190811015610002576040600090812060008051602061099483398151915292909201819055808255600180830182905560029092015595506108b09050565b61010480546000808355919091526103c590600080516020610994833981519152908101905b808211156108995760008155600101610885565b5090565b8254600019018355600183018054821790555b50505050919050565b5b600180541180156108dc57506001546002906101008110156100025701546000145b156108f057600180546000190190556108ba565b600154811080156109135750600154600290610100811015610002570154600014155b801561092d57506002816101008110156100025701546000145b1561098e57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61058156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"
             ],
             "gasLimit" : [
-                "817082"
+                "0x0c77ba"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x01",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "100"
+                "0x64"
             ]
         }
     }
diff --git a/GeneralStateTests/stWalletTest/dayLimitResetSpentToday.json b/GeneralStateTests/stWalletTest/dayLimitResetSpentToday.json
index e0e106135..6fba6b4aa 100644
--- a/GeneralStateTests/stWalletTest/dayLimitResetSpentToday.json
+++ b/GeneralStateTests/stWalletTest/dayLimitResetSpentToday.json
@@ -1,17 +1,17 @@
 {
     "dayLimitResetSpentToday" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f2f751b7fb481f1517fb6e83bdf398b0c46c90686e2a53512a6a3cbb1de60fab",
+                    "hash" : "0xf2f751b7fb481f1517fb6e83bdf398b0c46c90686e2a53512a6a3cbb1de60fab",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e51a9621a6a56da7a889ea18c1ecb980c9b527c28ec7f2fc745d671e3d8edbc0",
+                    "hash" : "0xe51a9621a6a56da7a889ea18c1ecb980c9b527c28ec7f2fc745d671e3d8edbc0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4ad9988542011fbe14fb626fecde5583903b89c44cc4e03f6f3bd494e3c4b9f1",
+                    "hash" : "0x4ad9988542011fbe14fb626fecde5583903b89c44cc4e03f6f3bd494e3c4b9f1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4ad9988542011fbe14fb626fecde5583903b89c44cc4e03f6f3bd494e3c4b9f1",
+                    "hash" : "0x4ad9988542011fbe14fb626fecde5583903b89c44cc4e03f6f3bd494e3c4b9f1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e51a9621a6a56da7a889ea18c1ecb980c9b527c28ec7f2fc745d671e3d8edbc0",
+                    "hash" : "0xe51a9621a6a56da7a889ea18c1ecb980c9b527c28ec7f2fc745d671e3d8edbc0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,14 +61,14 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75ef08f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "ec0e71ad0a90ffe1909d27dac207f7680abba42d" : {
+            "0xec0e71ad0a90ffe1909d27dac207f7680abba42d" : {
                 "balance" : "0x64",
                 "code" : "0x606060405236156100985760e060020a6000350463173825d9811461009a5780632f54bf6e146100f65780634123cb6b1461011a5780635c52c2f5146101235780637065cb4814610154578063746c917114610188578063b20d30a914610191578063b75c7dc6146101c5578063ba51a6df146101f5578063c2cf732614610229578063f00d4b5d14610269578063f1736d86146102a2575b005b6100986004356000600036436040518084848082843750505090910190815260405190819003602001902090506105b9815b600160a060020a0333166000908152610102602052604081205481808083811415610719576108b0565b6102ac6004355b600160a060020a0316600090815261010260205260408120541190565b6102ac60015481565b6100986000364360405180848480828437505050909101908152604051908190036020019020905061070b816100cc565b61009860043560003643604051808484808284375050509091019081526040519081900360200190209050610531816100cc565b6102ac60005481565b610098600435600036436040518084848082843750505090910190815260405190819003602001902090506106ff816100cc565b610098600435600160a060020a03331660009081526101026020526040812054908080838114156102be57610340565b61009860043560003643604051808484808284375050509091019081526040519081900360200190209050610678816100cc565b6102ac600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156106d1576106f5565b6100986004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506103ca816100cc565b6102ac6101055481565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156103405781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156103c3576103d8836100fd565b156103e357506103c5565b600160a060020a03841660009081526101026020526040812054925082141561040c57506103c5565b6103475b6101045460005b8181101561085f576101048054829081101561000257600091825260008051602061099483398151915201541461048a5761010480546101039160009184908110156100025760008051602061099483398151915201548252506020919091526040812081815560018101829055600201555b600101610417565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561052c5761053f826100fd565b1561054a575061052e565b610552610410565b60015460fa90106105675761056561057c565b505b60015460fa9010610492575061052e565b6106365b600060015b600154811015610899575b600154811080156105ac5750600281610100811015610002570154600014155b156108b95760010161058c565b156103c557600160a060020a0383166000908152610102602052604081205492508214156105e7575061052c565b6001600160005054036000600050541115610602575061052c565b600060028361010081101561000257508301819055600160a060020a03841681526101026020526040812055610578610410565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561052c5760015482111561068d575061052e565b600082905561069a610410565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106f057600094506106f5565b600194505b5050505092915050565b1561052c575061010555565b1561052e5760006101065550565b60008681526101036020526040812080549094509092508214156107a2578154835560018381018390556101048054918201808255828015829011610771578183600052602060002091820191016107719190610885565b5050506002840181905561010480548892908110156100025760009190915260008051602061099483398151915201555b506001820154600284900a908116600014156108b05760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a182546001901161089d57600086815261010360205260409020600201546101048054909190811015610002576040600090812060008051602061099483398151915292909201819055808255600180830182905560029092015595506108b09050565b61010480546000808355919091526103c590600080516020610994833981519152908101905b808211156108995760008155600101610885565b5090565b8254600019018355600183018054821790555b50505050919050565b5b600180541180156108dc57506001546002906101008110156100025701546000145b156108f057600180546000190190556108ba565b600154811080156109135750600154600290610100811015610002570154600014155b801561092d57506002816101008110156100025701546000145b1561098e57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61058156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe",
                 "nonce" : "0x00",
@@ -92,10 +92,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x01",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "ec0e71ad0a90ffe1909d27dac207f7680abba42d",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xec0e71ad0a90ffe1909d27dac207f7680abba42d",
             "value" : [
-                "100"
+                "0x64"
             ]
         }
     }
diff --git a/GeneralStateTests/stWalletTest/dayLimitSetDailyLimit.json b/GeneralStateTests/stWalletTest/dayLimitSetDailyLimit.json
index 00f0bcb9d..7541f626e 100644
--- a/GeneralStateTests/stWalletTest/dayLimitSetDailyLimit.json
+++ b/GeneralStateTests/stWalletTest/dayLimitSetDailyLimit.json
@@ -1,17 +1,17 @@
 {
     "dayLimitSetDailyLimit" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "2d9807af3717e5ebfabb1350898a88667b4d1f113d61b5a6b7c9cdc880f19081",
+                    "hash" : "0x2d9807af3717e5ebfabb1350898a88667b4d1f113d61b5a6b7c9cdc880f19081",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "470dee92b65693a8152fdc185281a5e090432f7ba1f7874f078281b7dffaac9f",
+                    "hash" : "0x470dee92b65693a8152fdc185281a5e090432f7ba1f7874f078281b7dffaac9f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6fa926895143a89f95f052e222c85f40b4bdedea3505ae25e1c2a7651f356157",
+                    "hash" : "0x6fa926895143a89f95f052e222c85f40b4bdedea3505ae25e1c2a7651f356157",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6fa926895143a89f95f052e222c85f40b4bdedea3505ae25e1c2a7651f356157",
+                    "hash" : "0x6fa926895143a89f95f052e222c85f40b4bdedea3505ae25e1c2a7651f356157",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "470dee92b65693a8152fdc185281a5e090432f7ba1f7874f078281b7dffaac9f",
+                    "hash" : "0x470dee92b65693a8152fdc185281a5e090432f7ba1f7874f078281b7dffaac9f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,14 +61,14 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75ef08f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "ec0e71ad0a90ffe1909d27dac207f7680abba42d" : {
+            "0xec0e71ad0a90ffe1909d27dac207f7680abba42d" : {
                 "balance" : "0x64",
                 "code" : "0x606060405236156100985760e060020a6000350463173825d9811461009a5780632f54bf6e146100f65780634123cb6b1461011a5780635c52c2f5146101235780637065cb4814610154578063746c917114610188578063b20d30a914610191578063b75c7dc6146101c5578063ba51a6df146101f5578063c2cf732614610229578063f00d4b5d14610269578063f1736d86146102a2575b005b6100986004356000600036436040518084848082843750505090910190815260405190819003602001902090506105b9815b600160a060020a0333166000908152610102602052604081205481808083811415610719576108b0565b6102ac6004355b600160a060020a0316600090815261010260205260408120541190565b6102ac60015481565b6100986000364360405180848480828437505050909101908152604051908190036020019020905061070b816100cc565b61009860043560003643604051808484808284375050509091019081526040519081900360200190209050610531816100cc565b6102ac60005481565b610098600435600036436040518084848082843750505090910190815260405190819003602001902090506106ff816100cc565b610098600435600160a060020a03331660009081526101026020526040812054908080838114156102be57610340565b61009860043560003643604051808484808284375050509091019081526040519081900360200190209050610678816100cc565b6102ac600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156106d1576106f5565b6100986004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506103ca816100cc565b6102ac6101055481565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156103405781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156103c3576103d8836100fd565b156103e357506103c5565b600160a060020a03841660009081526101026020526040812054925082141561040c57506103c5565b6103475b6101045460005b8181101561085f576101048054829081101561000257600091825260008051602061099483398151915201541461048a5761010480546101039160009184908110156100025760008051602061099483398151915201548252506020919091526040812081815560018101829055600201555b600101610417565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561052c5761053f826100fd565b1561054a575061052e565b610552610410565b60015460fa90106105675761056561057c565b505b60015460fa9010610492575061052e565b6106365b600060015b600154811015610899575b600154811080156105ac5750600281610100811015610002570154600014155b156108b95760010161058c565b156103c557600160a060020a0383166000908152610102602052604081205492508214156105e7575061052c565b6001600160005054036000600050541115610602575061052c565b600060028361010081101561000257508301819055600160a060020a03841681526101026020526040812055610578610410565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561052c5760015482111561068d575061052e565b600082905561069a610410565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106f057600094506106f5565b600194505b5050505092915050565b1561052c575061010555565b1561052e5760006101065550565b60008681526101036020526040812080549094509092508214156107a2578154835560018381018390556101048054918201808255828015829011610771578183600052602060002091820191016107719190610885565b5050506002840181905561010480548892908110156100025760009190915260008051602061099483398151915201555b506001820154600284900a908116600014156108b05760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a182546001901161089d57600086815261010360205260409020600201546101048054909190811015610002576040600090812060008051602061099483398151915292909201819055808255600180830182905560029092015595506108b09050565b61010480546000808355919091526103c590600080516020610994833981519152908101905b808211156108995760008155600101610885565b5090565b8254600019018355600183018054821790555b50505050919050565b5b600180541180156108dc57506001546002906101008110156100025701546000145b156108f057600180546000190190556108ba565b600154811080156109135750600154600290610100811015610002570154600014155b801561092d57506002816101008110156100025701546000145b1561098e57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61058156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe",
                 "nonce" : "0x00",
@@ -90,10 +90,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x01",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "ec0e71ad0a90ffe1909d27dac207f7680abba42d",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xec0e71ad0a90ffe1909d27dac207f7680abba42d",
             "value" : [
-                "100"
+                "0x64"
             ]
         }
     }
diff --git a/GeneralStateTests/stWalletTest/dayLimitSetDailyLimitNoData.json b/GeneralStateTests/stWalletTest/dayLimitSetDailyLimitNoData.json
index afffcb0d9..e0f590158 100644
--- a/GeneralStateTests/stWalletTest/dayLimitSetDailyLimitNoData.json
+++ b/GeneralStateTests/stWalletTest/dayLimitSetDailyLimitNoData.json
@@ -1,17 +1,17 @@
 {
     "dayLimitSetDailyLimitNoData" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "96040ba023f020260739b09631662b263039782070ce1d40482d4afea7d00613",
+                    "hash" : "0x96040ba023f020260739b09631662b263039782070ce1d40482d4afea7d00613",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "fa2a0c4ee3c6c9adfc9086c327c2416b81562244c7636a8350572de57eb0e688",
+                    "hash" : "0xfa2a0c4ee3c6c9adfc9086c327c2416b81562244c7636a8350572de57eb0e688",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "cd7b898d9ab81bcd8bbae47b2ecc07c4e45e719eeb232f72458911ed71a8033c",
+                    "hash" : "0xcd7b898d9ab81bcd8bbae47b2ecc07c4e45e719eeb232f72458911ed71a8033c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "cd7b898d9ab81bcd8bbae47b2ecc07c4e45e719eeb232f72458911ed71a8033c",
+                    "hash" : "0xcd7b898d9ab81bcd8bbae47b2ecc07c4e45e719eeb232f72458911ed71a8033c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "fa2a0c4ee3c6c9adfc9086c327c2416b81562244c7636a8350572de57eb0e688",
+                    "hash" : "0xfa2a0c4ee3c6c9adfc9086c327c2416b81562244c7636a8350572de57eb0e688",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,14 +61,14 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75ef08f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "ec0e71ad0a90ffe1909d27dac207f7680abba42d" : {
+            "0xec0e71ad0a90ffe1909d27dac207f7680abba42d" : {
                 "balance" : "0x64",
                 "code" : "0x606060405236156100985760e060020a6000350463173825d9811461009a5780632f54bf6e146100f65780634123cb6b1461011a5780635c52c2f5146101235780637065cb4814610154578063746c917114610188578063b20d30a914610191578063b75c7dc6146101c5578063ba51a6df146101f5578063c2cf732614610229578063f00d4b5d14610269578063f1736d86146102a2575b005b6100986004356000600036436040518084848082843750505090910190815260405190819003602001902090506105b9815b600160a060020a0333166000908152610102602052604081205481808083811415610719576108b0565b6102ac6004355b600160a060020a0316600090815261010260205260408120541190565b6102ac60015481565b6100986000364360405180848480828437505050909101908152604051908190036020019020905061070b816100cc565b61009860043560003643604051808484808284375050509091019081526040519081900360200190209050610531816100cc565b6102ac60005481565b610098600435600036436040518084848082843750505090910190815260405190819003602001902090506106ff816100cc565b610098600435600160a060020a03331660009081526101026020526040812054908080838114156102be57610340565b61009860043560003643604051808484808284375050509091019081526040519081900360200190209050610678816100cc565b6102ac600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156106d1576106f5565b6100986004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506103ca816100cc565b6102ac6101055481565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156103405781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156103c3576103d8836100fd565b156103e357506103c5565b600160a060020a03841660009081526101026020526040812054925082141561040c57506103c5565b6103475b6101045460005b8181101561085f576101048054829081101561000257600091825260008051602061099483398151915201541461048a5761010480546101039160009184908110156100025760008051602061099483398151915201548252506020919091526040812081815560018101829055600201555b600101610417565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561052c5761053f826100fd565b1561054a575061052e565b610552610410565b60015460fa90106105675761056561057c565b505b60015460fa9010610492575061052e565b6106365b600060015b600154811015610899575b600154811080156105ac5750600281610100811015610002570154600014155b156108b95760010161058c565b156103c557600160a060020a0383166000908152610102602052604081205492508214156105e7575061052c565b6001600160005054036000600050541115610602575061052c565b600060028361010081101561000257508301819055600160a060020a03841681526101026020526040812055610578610410565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561052c5760015482111561068d575061052e565b600082905561069a610410565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106f057600094506106f5565b600194505b5050505092915050565b1561052c575061010555565b1561052e5760006101065550565b60008681526101036020526040812080549094509092508214156107a2578154835560018381018390556101048054918201808255828015829011610771578183600052602060002091820191016107719190610885565b5050506002840181905561010480548892908110156100025760009190915260008051602061099483398151915201555b506001820154600284900a908116600014156108b05760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a182546001901161089d57600086815261010360205260409020600201546101048054909190811015610002576040600090812060008051602061099483398151915292909201819055808255600180830182905560029092015595506108b09050565b61010480546000808355919091526103c590600080516020610994833981519152908101905b808211156108995760008155600101610885565b5090565b8254600019018355600183018054821790555b50505050919050565b5b600180541180156108dc57506001546002906101008110156100025701546000145b156108f057600180546000190190556108ba565b600154811080156109135750600154600290610100811015610002570154600014155b801561092d57506002816101008110156100025701546000145b1561098e57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61058156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe",
                 "nonce" : "0x00",
@@ -90,10 +90,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x01",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "ec0e71ad0a90ffe1909d27dac207f7680abba42d",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xec0e71ad0a90ffe1909d27dac207f7680abba42d",
             "value" : [
-                "100"
+                "0x64"
             ]
         }
     }
diff --git a/GeneralStateTests/stWalletTest/multiOwnedAddOwner.json b/GeneralStateTests/stWalletTest/multiOwnedAddOwner.json
index c9a11210e..fd6521c8e 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedAddOwner.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedAddOwner.json
@@ -1,17 +1,17 @@
 {
     "multiOwnedAddOwner" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "21751242b027dcf541e1cd60966343230eed1cd15237d565a0ab2105547ee99d",
+                    "hash" : "0x21751242b027dcf541e1cd60966343230eed1cd15237d565a0ab2105547ee99d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c2cce9d7b2f2a11dd0bb6f8d5a1a1bba962b8ad4231e4b7c811cdf1bfffe7971",
+                    "hash" : "0xc2cce9d7b2f2a11dd0bb6f8d5a1a1bba962b8ad4231e4b7c811cdf1bfffe7971",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "dc2117e5cdd27515659ead4b260e4e13e081aa9c368500a1f69d2b403ffa2899",
+                    "hash" : "0xdc2117e5cdd27515659ead4b260e4e13e081aa9c368500a1f69d2b403ffa2899",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "dc2117e5cdd27515659ead4b260e4e13e081aa9c368500a1f69d2b403ffa2899",
+                    "hash" : "0xdc2117e5cdd27515659ead4b260e4e13e081aa9c368500a1f69d2b403ffa2899",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c2cce9d7b2f2a11dd0bb6f8d5a1a1bba962b8ad4231e4b7c811cdf1bfffe7971",
+                    "hash" : "0xc2cce9d7b2f2a11dd0bb6f8d5a1a1bba962b8ad4231e4b7c811cdf1bfffe7971",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,7 +61,7 @@
             ]
         },
         "pre" : {
-            "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
                 "balance" : "0x64",
                 "code" : "0x606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe",
                 "nonce" : "0x00",
@@ -72,9 +72,9 @@
                     "0x6e369836487c234b9e553ef3f787c2d8865520739d340c67b3d251a33986e58d" : "0x01"
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75ef08f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
@@ -85,14 +85,14 @@
                 "0x7065cb480000000000000000000000003fb1cd2cd96c6d5c0b5eb3322d807b34482481d4"
             ],
             "gasLimit" : [
-                "10000000"
+                "0x989680"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x01",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "6295ee1b4f6dd65047762f924ecd367c17eabf8f",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
             "value" : [
-                "100"
+                "0x64"
             ]
         }
     }
diff --git a/GeneralStateTests/stWalletTest/multiOwnedAddOwnerAddMyself.json b/GeneralStateTests/stWalletTest/multiOwnedAddOwnerAddMyself.json
index d10d5e735..8d5cbdeeb 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedAddOwnerAddMyself.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedAddOwnerAddMyself.json
@@ -1,17 +1,17 @@
 {
     "multiOwnedAddOwnerAddMyself" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "26571ae1ea2375908bf22dbf1cc78035899424046731bb4d4e96fed3cebc811e",
+                    "hash" : "0x26571ae1ea2375908bf22dbf1cc78035899424046731bb4d4e96fed3cebc811e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "26e722fe6f5f192b22ef8f3dc1f4e747f34bbf510f573efb6af738ab92ff120b",
+                    "hash" : "0x26e722fe6f5f192b22ef8f3dc1f4e747f34bbf510f573efb6af738ab92ff120b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9bc4a93f4bd04e46cd43627a33734e4f7d647573586dad53050e554383c2ae91",
+                    "hash" : "0x9bc4a93f4bd04e46cd43627a33734e4f7d647573586dad53050e554383c2ae91",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9bc4a93f4bd04e46cd43627a33734e4f7d647573586dad53050e554383c2ae91",
+                    "hash" : "0x9bc4a93f4bd04e46cd43627a33734e4f7d647573586dad53050e554383c2ae91",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "26e722fe6f5f192b22ef8f3dc1f4e747f34bbf510f573efb6af738ab92ff120b",
+                    "hash" : "0x26e722fe6f5f192b22ef8f3dc1f4e747f34bbf510f573efb6af738ab92ff120b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,7 +61,7 @@
             ]
         },
         "pre" : {
-            "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
                 "balance" : "0x64",
                 "code" : "0x606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe",
                 "nonce" : "0x00",
@@ -72,9 +72,9 @@
                     "0x6e369836487c234b9e553ef3f787c2d8865520739d340c67b3d251a33986e58d" : "0x01"
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75ef08f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
@@ -85,14 +85,14 @@
                 "0x7065cb48000000000000000000000000a94f5374fce5edbc8e2a8697c15331677e6ebf0b"
             ],
             "gasLimit" : [
-                "10000000"
+                "0x989680"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x01",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "6295ee1b4f6dd65047762f924ecd367c17eabf8f",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
             "value" : [
-                "100"
+                "0x64"
             ]
         }
     }
diff --git a/GeneralStateTests/stWalletTest/multiOwnedChangeOwner.json b/GeneralStateTests/stWalletTest/multiOwnedChangeOwner.json
index a8d1c9aac..550689660 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedChangeOwner.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedChangeOwner.json
@@ -1,17 +1,17 @@
 {
     "multiOwnedChangeOwner" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d3148e6d6aaa2f41a172553339875a3e03ad3c2188ea101e25fe46acd3c71767",
+                    "hash" : "0xd3148e6d6aaa2f41a172553339875a3e03ad3c2188ea101e25fe46acd3c71767",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "04a24c8abe2a280f58fb589c896e7ddf11ae087033cc92cb2c8ba138b80b3dcb",
+                    "hash" : "0x04a24c8abe2a280f58fb589c896e7ddf11ae087033cc92cb2c8ba138b80b3dcb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b959e0b6275adbf856ba834353002b770a1c7c98363bccba63898c2e18284c62",
+                    "hash" : "0xb959e0b6275adbf856ba834353002b770a1c7c98363bccba63898c2e18284c62",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b959e0b6275adbf856ba834353002b770a1c7c98363bccba63898c2e18284c62",
+                    "hash" : "0xb959e0b6275adbf856ba834353002b770a1c7c98363bccba63898c2e18284c62",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "04a24c8abe2a280f58fb589c896e7ddf11ae087033cc92cb2c8ba138b80b3dcb",
+                    "hash" : "0x04a24c8abe2a280f58fb589c896e7ddf11ae087033cc92cb2c8ba138b80b3dcb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,7 +61,7 @@
             ]
         },
         "pre" : {
-            "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
                 "balance" : "0x64",
                 "code" : "0x606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe",
                 "nonce" : "0x00",
@@ -72,9 +72,9 @@
                     "0x6e369836487c234b9e553ef3f787c2d8865520739d340c67b3d251a33986e58d" : "0x01"
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75ef08f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
@@ -85,14 +85,14 @@
                 "0xf00d4b5d000000000000000000000000a94f5374fce5edbc8e2a8697c15331677e6ebf0b000000000000000000000000aaaf5374fce5edbc8e2a8697c15331677e6ebaaa"
             ],
             "gasLimit" : [
-                "10000000"
+                "0x989680"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x01",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "6295ee1b4f6dd65047762f924ecd367c17eabf8f",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
             "value" : [
-                "100"
+                "0x64"
             ]
         }
     }
diff --git a/GeneralStateTests/stWalletTest/multiOwnedChangeOwnerNoArgument.json b/GeneralStateTests/stWalletTest/multiOwnedChangeOwnerNoArgument.json
index c3197caa8..4578e7af4 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedChangeOwnerNoArgument.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedChangeOwnerNoArgument.json
@@ -1,17 +1,17 @@
 {
     "multiOwnedChangeOwnerNoArgument" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "556ebd705e6dc4fdb6266e20354eacf8f4079c575bb55d0f11166fd76efaee9f",
+                    "hash" : "0x556ebd705e6dc4fdb6266e20354eacf8f4079c575bb55d0f11166fd76efaee9f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "461884afb67e38da536946c0d744de98acf65d209ec82ff35b5eb68f5a3b68b1",
+                    "hash" : "0x461884afb67e38da536946c0d744de98acf65d209ec82ff35b5eb68f5a3b68b1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "ae77c9fe506655b4133a7d7bbd471286c2fbbab4d0cb0943faa434c696e1ddd4",
+                    "hash" : "0xae77c9fe506655b4133a7d7bbd471286c2fbbab4d0cb0943faa434c696e1ddd4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ae77c9fe506655b4133a7d7bbd471286c2fbbab4d0cb0943faa434c696e1ddd4",
+                    "hash" : "0xae77c9fe506655b4133a7d7bbd471286c2fbbab4d0cb0943faa434c696e1ddd4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "461884afb67e38da536946c0d744de98acf65d209ec82ff35b5eb68f5a3b68b1",
+                    "hash" : "0x461884afb67e38da536946c0d744de98acf65d209ec82ff35b5eb68f5a3b68b1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,7 +61,7 @@
             ]
         },
         "pre" : {
-            "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
                 "balance" : "0x64",
                 "code" : "0x606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe",
                 "nonce" : "0x00",
@@ -72,9 +72,9 @@
                     "0x6e369836487c234b9e553ef3f787c2d8865520739d340c67b3d251a33986e58d" : "0x01"
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75ef08f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
@@ -89,10 +89,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x01",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "6295ee1b4f6dd65047762f924ecd367c17eabf8f",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
             "value" : [
-                "100"
+                "0x64"
             ]
         }
     }
diff --git a/GeneralStateTests/stWalletTest/multiOwnedChangeOwner_fromNotOwner.json b/GeneralStateTests/stWalletTest/multiOwnedChangeOwner_fromNotOwner.json
index bfac2c46b..b2546233e 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedChangeOwner_fromNotOwner.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedChangeOwner_fromNotOwner.json
@@ -1,17 +1,17 @@
 {
     "multiOwnedChangeOwner_fromNotOwner" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7d7233bf2c13cfa192ce9dc2bc8101313971fe6ea493c2403ae2acb91b8d73e6",
+                    "hash" : "0x7d7233bf2c13cfa192ce9dc2bc8101313971fe6ea493c2403ae2acb91b8d73e6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "ed869e9a7d2bc63013cb9a23173ece41d4437d4e4608e513069304529cd54c4e",
+                    "hash" : "0xed869e9a7d2bc63013cb9a23173ece41d4437d4e4608e513069304529cd54c4e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "bb8ac095c7d8380da01a4ad2a200455baea9773de8b07897d223165ef141f5eb",
+                    "hash" : "0xbb8ac095c7d8380da01a4ad2a200455baea9773de8b07897d223165ef141f5eb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "bb8ac095c7d8380da01a4ad2a200455baea9773de8b07897d223165ef141f5eb",
+                    "hash" : "0xbb8ac095c7d8380da01a4ad2a200455baea9773de8b07897d223165ef141f5eb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "ed869e9a7d2bc63013cb9a23173ece41d4437d4e4608e513069304529cd54c4e",
+                    "hash" : "0xed869e9a7d2bc63013cb9a23173ece41d4437d4e4608e513069304529cd54c4e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,7 +61,7 @@
             ]
         },
         "pre" : {
-            "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
                 "balance" : "0x64",
                 "code" : "0x606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe",
                 "nonce" : "0x00",
@@ -72,9 +72,9 @@
                     "0x6e369836487c234b9e553ef3f787c2d8865520739d340c67b3d251a33986e58d" : "0x01"
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75ef08f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
@@ -85,14 +85,14 @@
                 "0xf00d4b5d000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b000000000000000000000000aaaf5374fce5edbc8e2a8697c15331677e6ebaaa"
             ],
             "gasLimit" : [
-                "10000000"
+                "0x989680"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x01",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "6295ee1b4f6dd65047762f924ecd367c17eabf8f",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
             "value" : [
-                "100"
+                "0x64"
             ]
         }
     }
diff --git a/GeneralStateTests/stWalletTest/multiOwnedChangeOwner_toIsOwner.json b/GeneralStateTests/stWalletTest/multiOwnedChangeOwner_toIsOwner.json
index 100f30ac5..b37c5a9db 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedChangeOwner_toIsOwner.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedChangeOwner_toIsOwner.json
@@ -1,17 +1,17 @@
 {
     "multiOwnedChangeOwner_toIsOwner" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6c66eaf6153b3633e255fb22efd2b9b0607586f04f0179779a40336f98fcbdce",
+                    "hash" : "0x6c66eaf6153b3633e255fb22efd2b9b0607586f04f0179779a40336f98fcbdce",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "88cbbea3a252ac70dd8fc4838a95d40945f8e0ad4d977c6cbb4f31aa0f237d84",
+                    "hash" : "0x88cbbea3a252ac70dd8fc4838a95d40945f8e0ad4d977c6cbb4f31aa0f237d84",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6b669ca265f30b8349f0a36c4af860e8008edd124e5166ad63f97c8697226e0e",
+                    "hash" : "0x6b669ca265f30b8349f0a36c4af860e8008edd124e5166ad63f97c8697226e0e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6b669ca265f30b8349f0a36c4af860e8008edd124e5166ad63f97c8697226e0e",
+                    "hash" : "0x6b669ca265f30b8349f0a36c4af860e8008edd124e5166ad63f97c8697226e0e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "88cbbea3a252ac70dd8fc4838a95d40945f8e0ad4d977c6cbb4f31aa0f237d84",
+                    "hash" : "0x88cbbea3a252ac70dd8fc4838a95d40945f8e0ad4d977c6cbb4f31aa0f237d84",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,7 +61,7 @@
             ]
         },
         "pre" : {
-            "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
                 "balance" : "0x64",
                 "code" : "0x606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe",
                 "nonce" : "0x00",
@@ -72,9 +72,9 @@
                     "0x6e369836487c234b9e553ef3f787c2d8865520739d340c67b3d251a33986e58d" : "0x01"
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75ef08f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
@@ -85,14 +85,14 @@
                 "0xf00d4b5d000000000000000000000000a94f5374fce5edbc8e2a8697c15331677e6ebf0b000000000000000000000000a94f5374fce5edbc8e2a8697c15331677e6ebf0b"
             ],
             "gasLimit" : [
-                "10000000"
+                "0x989680"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x01",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "6295ee1b4f6dd65047762f924ecd367c17eabf8f",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
             "value" : [
-                "100"
+                "0x64"
             ]
         }
     }
diff --git a/GeneralStateTests/stWalletTest/multiOwnedChangeRequirementTo0.json b/GeneralStateTests/stWalletTest/multiOwnedChangeRequirementTo0.json
index f2d74a71f..94f2b6deb 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedChangeRequirementTo0.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedChangeRequirementTo0.json
@@ -1,17 +1,17 @@
 {
     "multiOwnedChangeRequirementTo0" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1c1c1b9de665348f9df4250e5805e8d6bbee0eb689e973b8c451a1bd1882dee2",
+                    "hash" : "0x1c1c1b9de665348f9df4250e5805e8d6bbee0eb689e973b8c451a1bd1882dee2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "5708c053b70f81b7197a90d1094c79693e8dffe395d9f14d75a67bfb5408a267",
+                    "hash" : "0x5708c053b70f81b7197a90d1094c79693e8dffe395d9f14d75a67bfb5408a267",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "00819cf5a27d02c97ea9e06d6add41f90e30bed280b6f62a0faf242c3ea41823",
+                    "hash" : "0x00819cf5a27d02c97ea9e06d6add41f90e30bed280b6f62a0faf242c3ea41823",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "00819cf5a27d02c97ea9e06d6add41f90e30bed280b6f62a0faf242c3ea41823",
+                    "hash" : "0x00819cf5a27d02c97ea9e06d6add41f90e30bed280b6f62a0faf242c3ea41823",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "5708c053b70f81b7197a90d1094c79693e8dffe395d9f14d75a67bfb5408a267",
+                    "hash" : "0x5708c053b70f81b7197a90d1094c79693e8dffe395d9f14d75a67bfb5408a267",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,7 +61,7 @@
             ]
         },
         "pre" : {
-            "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
                 "balance" : "0x64",
                 "code" : "0x606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe",
                 "nonce" : "0x00",
@@ -72,9 +72,9 @@
                     "0x6e369836487c234b9e553ef3f787c2d8865520739d340c67b3d251a33986e58d" : "0x01"
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75ef08f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
@@ -85,14 +85,14 @@
                 "0xba51a6df0000000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit" : [
-                "10000000"
+                "0x989680"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x01",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "6295ee1b4f6dd65047762f924ecd367c17eabf8f",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
             "value" : [
-                "100"
+                "0x64"
             ]
         }
     }
diff --git a/GeneralStateTests/stWalletTest/multiOwnedChangeRequirementTo1.json b/GeneralStateTests/stWalletTest/multiOwnedChangeRequirementTo1.json
index 90a6862d5..0be9191e8 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedChangeRequirementTo1.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedChangeRequirementTo1.json
@@ -1,17 +1,17 @@
 {
     "multiOwnedChangeRequirementTo1" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d320f3b38ce4d0c378d452d0b09330a4f627fdd0d921c2f5fa283ba11f7916da",
+                    "hash" : "0xd320f3b38ce4d0c378d452d0b09330a4f627fdd0d921c2f5fa283ba11f7916da",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "8fe39e19833a3cbd557d97d2246fcfda845ed17ce543fd726f983e3eb6772cb1",
+                    "hash" : "0x8fe39e19833a3cbd557d97d2246fcfda845ed17ce543fd726f983e3eb6772cb1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5796296f1c94dfd59b308a26a6d04d618dd8d020a8ddd5793bac79ae88803710",
+                    "hash" : "0x5796296f1c94dfd59b308a26a6d04d618dd8d020a8ddd5793bac79ae88803710",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5796296f1c94dfd59b308a26a6d04d618dd8d020a8ddd5793bac79ae88803710",
+                    "hash" : "0x5796296f1c94dfd59b308a26a6d04d618dd8d020a8ddd5793bac79ae88803710",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "8fe39e19833a3cbd557d97d2246fcfda845ed17ce543fd726f983e3eb6772cb1",
+                    "hash" : "0x8fe39e19833a3cbd557d97d2246fcfda845ed17ce543fd726f983e3eb6772cb1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,7 +61,7 @@
             ]
         },
         "pre" : {
-            "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
                 "balance" : "0x64",
                 "code" : "0x606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe",
                 "nonce" : "0x00",
@@ -72,9 +72,9 @@
                     "0x6e369836487c234b9e553ef3f787c2d8865520739d340c67b3d251a33986e58d" : "0x01"
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75ef08f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
@@ -85,14 +85,14 @@
                 "0xba51a6df0000000000000000000000000000000000000000000000000000000000000001"
             ],
             "gasLimit" : [
-                "10000000"
+                "0x989680"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x01",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "6295ee1b4f6dd65047762f924ecd367c17eabf8f",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
             "value" : [
-                "100"
+                "0x64"
             ]
         }
     }
diff --git a/GeneralStateTests/stWalletTest/multiOwnedChangeRequirementTo2.json b/GeneralStateTests/stWalletTest/multiOwnedChangeRequirementTo2.json
index 1055f5064..4e9c33dcb 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedChangeRequirementTo2.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedChangeRequirementTo2.json
@@ -1,17 +1,17 @@
 {
     "multiOwnedChangeRequirementTo2" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "52a2b577fd97dd0add6284b1b1fd4c1c69791802b3be0e14ea4e0bf1aac340e8",
+                    "hash" : "0x52a2b577fd97dd0add6284b1b1fd4c1c69791802b3be0e14ea4e0bf1aac340e8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "8092af9e8eac2d2444cc28eed24647661679b8998ffd0d845f7edec40a16d7cb",
+                    "hash" : "0x8092af9e8eac2d2444cc28eed24647661679b8998ffd0d845f7edec40a16d7cb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "ddee2147dfb84cf38f57c3c8ba42493fa4351b9d2de570cd34eb86701ae9b746",
+                    "hash" : "0xddee2147dfb84cf38f57c3c8ba42493fa4351b9d2de570cd34eb86701ae9b746",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ddee2147dfb84cf38f57c3c8ba42493fa4351b9d2de570cd34eb86701ae9b746",
+                    "hash" : "0xddee2147dfb84cf38f57c3c8ba42493fa4351b9d2de570cd34eb86701ae9b746",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "8092af9e8eac2d2444cc28eed24647661679b8998ffd0d845f7edec40a16d7cb",
+                    "hash" : "0x8092af9e8eac2d2444cc28eed24647661679b8998ffd0d845f7edec40a16d7cb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,7 +61,7 @@
             ]
         },
         "pre" : {
-            "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
                 "balance" : "0x64",
                 "code" : "0x606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe",
                 "nonce" : "0x00",
@@ -72,9 +72,9 @@
                     "0x6e369836487c234b9e553ef3f787c2d8865520739d340c67b3d251a33986e58d" : "0x01"
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75ef08f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
@@ -85,14 +85,14 @@
                 "0xba51a6df0000000000000000000000000000000000000000000000000000000000000002"
             ],
             "gasLimit" : [
-                "10000000"
+                "0x989680"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x01",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "6295ee1b4f6dd65047762f924ecd367c17eabf8f",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
             "value" : [
-                "100"
+                "0x64"
             ]
         }
     }
diff --git a/GeneralStateTests/stWalletTest/multiOwnedConstructionCorrect.json b/GeneralStateTests/stWalletTest/multiOwnedConstructionCorrect.json
index 765e4af62..404a11ecd 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedConstructionCorrect.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedConstructionCorrect.json
@@ -1,17 +1,17 @@
 {
     "multiOwnedConstructionCorrect" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "2f6e2b63729f951a32bcb3e6b501be8af00422a9e5ef159a36ebed07559ecd06",
+                    "hash" : "0x2f6e2b63729f951a32bcb3e6b501be8af00422a9e5ef159a36ebed07559ecd06",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "eecebde57798579723cf00394572c98e266d03475bc637b711b56a00a5c6a944",
+                    "hash" : "0xeecebde57798579723cf00394572c98e266d03475bc637b711b56a00a5c6a944",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2c79742f647cfc503543cc26b3c3991376cb43e8160e97b22f913f497bf62597",
+                    "hash" : "0x2c79742f647cfc503543cc26b3c3991376cb43e8160e97b22f913f497bf62597",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "2f6e2b63729f951a32bcb3e6b501be8af00422a9e5ef159a36ebed07559ecd06",
+                    "hash" : "0x2f6e2b63729f951a32bcb3e6b501be8af00422a9e5ef159a36ebed07559ecd06",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "eecebde57798579723cf00394572c98e266d03475bc637b711b56a00a5c6a944",
+                    "hash" : "0xeecebde57798579723cf00394572c98e266d03475bc637b711b56a00a5c6a944",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -74,14 +74,14 @@
                 "606060409081526001600081815581805533600160a060020a0316600381905581526101026020529182205561090a90819061003b90396000f300606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"
             ],
             "gasLimit" : [
-                "10000000"
+                "0x989680"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "100"
+                "0x64"
             ]
         }
     }
diff --git a/GeneralStateTests/stWalletTest/multiOwnedConstructionNotEnoughGas.json b/GeneralStateTests/stWalletTest/multiOwnedConstructionNotEnoughGas.json
index 238fe2937..5042ab414 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedConstructionNotEnoughGas.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedConstructionNotEnoughGas.json
@@ -1,17 +1,17 @@
 {
     "multiOwnedConstructionNotEnoughGas" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "799a7f96e856c4257fc35908b7cdf9cc6d7dff1f4d7b563e6bda658b33692b32",
+                    "hash" : "0x799a7f96e856c4257fc35908b7cdf9cc6d7dff1f4d7b563e6bda658b33692b32",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "799a7f96e856c4257fc35908b7cdf9cc6d7dff1f4d7b563e6bda658b33692b32",
+                    "hash" : "0x799a7f96e856c4257fc35908b7cdf9cc6d7dff1f4d7b563e6bda658b33692b32",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "799a7f96e856c4257fc35908b7cdf9cc6d7dff1f4d7b563e6bda658b33692b32",
+                    "hash" : "0x799a7f96e856c4257fc35908b7cdf9cc6d7dff1f4d7b563e6bda658b33692b32",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "799a7f96e856c4257fc35908b7cdf9cc6d7dff1f4d7b563e6bda658b33692b32",
+                    "hash" : "0x799a7f96e856c4257fc35908b7cdf9cc6d7dff1f4d7b563e6bda658b33692b32",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "799a7f96e856c4257fc35908b7cdf9cc6d7dff1f4d7b563e6bda658b33692b32",
+                    "hash" : "0x799a7f96e856c4257fc35908b7cdf9cc6d7dff1f4d7b563e6bda658b33692b32",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -78,10 +78,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stWalletTest/multiOwnedConstructionNotEnoughGasPartial.json b/GeneralStateTests/stWalletTest/multiOwnedConstructionNotEnoughGasPartial.json
index 975fcb927..37235ee51 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedConstructionNotEnoughGasPartial.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedConstructionNotEnoughGasPartial.json
@@ -1,17 +1,17 @@
 {
     "multiOwnedConstructionNotEnoughGasPartial" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "cfd7da3fc0b4dac858df3ccf35e973cca001723aab28149354c3d279f58b16c8",
+                    "hash" : "0xcfd7da3fc0b4dac858df3ccf35e973cca001723aab28149354c3d279f58b16c8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "cfd7da3fc0b4dac858df3ccf35e973cca001723aab28149354c3d279f58b16c8",
+                    "hash" : "0xcfd7da3fc0b4dac858df3ccf35e973cca001723aab28149354c3d279f58b16c8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2c79742f647cfc503543cc26b3c3991376cb43e8160e97b22f913f497bf62597",
+                    "hash" : "0x2c79742f647cfc503543cc26b3c3991376cb43e8160e97b22f913f497bf62597",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "cfd7da3fc0b4dac858df3ccf35e973cca001723aab28149354c3d279f58b16c8",
+                    "hash" : "0xcfd7da3fc0b4dac858df3ccf35e973cca001723aab28149354c3d279f58b16c8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "cfd7da3fc0b4dac858df3ccf35e973cca001723aab28149354c3d279f58b16c8",
+                    "hash" : "0xcfd7da3fc0b4dac858df3ccf35e973cca001723aab28149354c3d279f58b16c8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -74,14 +74,14 @@
                 "606060409081526001600081815581805533600160a060020a0316600381905581526101026020529182205561090a90819061003b90396000f300606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"
             ],
             "gasLimit" : [
-                "751249"
+                "0x0b7691"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "100"
+                "0x64"
             ]
         }
     }
diff --git a/GeneralStateTests/stWalletTest/multiOwnedIsOwnerFalse.json b/GeneralStateTests/stWalletTest/multiOwnedIsOwnerFalse.json
index f21309b3e..680e853df 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedIsOwnerFalse.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedIsOwnerFalse.json
@@ -1,17 +1,17 @@
 {
     "multiOwnedIsOwnerFalse" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7195e4d36a906fdc0346931d809e55e1d27921817d7780d4098bf164f2dedaf1",
+                    "hash" : "0x7195e4d36a906fdc0346931d809e55e1d27921817d7780d4098bf164f2dedaf1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "4f7f5592be43176a0029d4d375b52afee2dc907ebb0e33d67fc1437c94b71e26",
+                    "hash" : "0x4f7f5592be43176a0029d4d375b52afee2dc907ebb0e33d67fc1437c94b71e26",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "78202c41fe9c698c04704fd5763dc752c7104b00b31ad5b65bfc00904797857a",
+                    "hash" : "0x78202c41fe9c698c04704fd5763dc752c7104b00b31ad5b65bfc00904797857a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "78202c41fe9c698c04704fd5763dc752c7104b00b31ad5b65bfc00904797857a",
+                    "hash" : "0x78202c41fe9c698c04704fd5763dc752c7104b00b31ad5b65bfc00904797857a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "4f7f5592be43176a0029d4d375b52afee2dc907ebb0e33d67fc1437c94b71e26",
+                    "hash" : "0x4f7f5592be43176a0029d4d375b52afee2dc907ebb0e33d67fc1437c94b71e26",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,7 +61,7 @@
             ]
         },
         "pre" : {
-            "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
                 "balance" : "0x64",
                 "code" : "0x606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe",
                 "nonce" : "0x00",
@@ -72,9 +72,9 @@
                     "0x6e369836487c234b9e553ef3f787c2d8865520739d340c67b3d251a33986e58d" : "0x01"
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75ef08f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
@@ -85,14 +85,14 @@
                 "0x2f54bf6e000000000000000000000000aaaf5374fce5edbc8e2a8697c15331677e6ebaaa"
             ],
             "gasLimit" : [
-                "10000000"
+                "0x989680"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x01",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "6295ee1b4f6dd65047762f924ecd367c17eabf8f",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
             "value" : [
-                "100"
+                "0x64"
             ]
         }
     }
diff --git a/GeneralStateTests/stWalletTest/multiOwnedIsOwnerTrue.json b/GeneralStateTests/stWalletTest/multiOwnedIsOwnerTrue.json
index e4e97547e..eca7f71fc 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedIsOwnerTrue.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedIsOwnerTrue.json
@@ -1,17 +1,17 @@
 {
     "multiOwnedIsOwnerTrue" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7195e4d36a906fdc0346931d809e55e1d27921817d7780d4098bf164f2dedaf1",
+                    "hash" : "0x7195e4d36a906fdc0346931d809e55e1d27921817d7780d4098bf164f2dedaf1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "4f7f5592be43176a0029d4d375b52afee2dc907ebb0e33d67fc1437c94b71e26",
+                    "hash" : "0x4f7f5592be43176a0029d4d375b52afee2dc907ebb0e33d67fc1437c94b71e26",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "78202c41fe9c698c04704fd5763dc752c7104b00b31ad5b65bfc00904797857a",
+                    "hash" : "0x78202c41fe9c698c04704fd5763dc752c7104b00b31ad5b65bfc00904797857a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "78202c41fe9c698c04704fd5763dc752c7104b00b31ad5b65bfc00904797857a",
+                    "hash" : "0x78202c41fe9c698c04704fd5763dc752c7104b00b31ad5b65bfc00904797857a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "4f7f5592be43176a0029d4d375b52afee2dc907ebb0e33d67fc1437c94b71e26",
+                    "hash" : "0x4f7f5592be43176a0029d4d375b52afee2dc907ebb0e33d67fc1437c94b71e26",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,7 +61,7 @@
             ]
         },
         "pre" : {
-            "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
                 "balance" : "0x64",
                 "code" : "0x606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe",
                 "nonce" : "0x00",
@@ -72,9 +72,9 @@
                     "0x6e369836487c234b9e553ef3f787c2d8865520739d340c67b3d251a33986e58d" : "0x01"
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75ef08f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
@@ -85,14 +85,14 @@
                 "0x2f54bf6e000000000000000000000000a94f5374fce5edbc8e2a8697c15331677e6ebf0b"
             ],
             "gasLimit" : [
-                "10000000"
+                "0x989680"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x01",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "6295ee1b4f6dd65047762f924ecd367c17eabf8f",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
             "value" : [
-                "100"
+                "0x64"
             ]
         }
     }
diff --git a/GeneralStateTests/stWalletTest/multiOwnedRemoveOwner.json b/GeneralStateTests/stWalletTest/multiOwnedRemoveOwner.json
index 856521820..c5c9b5504 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedRemoveOwner.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedRemoveOwner.json
@@ -1,17 +1,17 @@
 {
     "multiOwnedRemoveOwner" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "67a01a2bbf3822cbb3179a05685218cbaee903a73c4b47b29de0af4d9122d621",
+                    "hash" : "0x67a01a2bbf3822cbb3179a05685218cbaee903a73c4b47b29de0af4d9122d621",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "bc471eeda0238882c1cadfd7e4897334569f78832484e9715a2e396d5ddc7815",
+                    "hash" : "0xbc471eeda0238882c1cadfd7e4897334569f78832484e9715a2e396d5ddc7815",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "903a211d8c345457d3133cf3e7638df74a3205edc8137c42636c05dbcc7bbe65",
+                    "hash" : "0x903a211d8c345457d3133cf3e7638df74a3205edc8137c42636c05dbcc7bbe65",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "903a211d8c345457d3133cf3e7638df74a3205edc8137c42636c05dbcc7bbe65",
+                    "hash" : "0x903a211d8c345457d3133cf3e7638df74a3205edc8137c42636c05dbcc7bbe65",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "bc471eeda0238882c1cadfd7e4897334569f78832484e9715a2e396d5ddc7815",
+                    "hash" : "0xbc471eeda0238882c1cadfd7e4897334569f78832484e9715a2e396d5ddc7815",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,7 +61,7 @@
             ]
         },
         "pre" : {
-            "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
                 "balance" : "0x64",
                 "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463173825d981146100655780632f54bf6e146100b75780637065cb48146100e8578063b75c7dc614610105578063ba51a6df14610142578063f00d4b5d1461015f57005b6101816004356000604060003680828437909120905061046d815b73ffffffffffffffffffffffffffffffffffffffff3316600090815261010260205260408120548180808381141561058f57610586565b6101876004355b73ffffffffffffffffffffffffffffffffffffffff16600090815261010260205260408120541190565b610181600435604060003680828437909120905061037c81610080565b61018160043573ffffffffffffffffffffffffffffffffffffffff3316600090815261010260205260408120549080808381141561019157610213565b610181600435604060003680828437909120905061053381610080565b6101816004356024356000604060003680828437909120905061028681610080565b60006000f35b8060005260206000f35b5050506000828152610103602052604081206001810154600284900a929083168190111561021357815460018084018054919092018455849003905573ffffffffffffffffffffffffffffffffffffffff3316604090815260608690527fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b9080a15b5050505050565b015573ffffffffffffffffffffffffffffffffffffffff84811660008181526101026020526040808220829055928616808252908390208590559082526060527fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c9080a15b505b505050565b1561027f57610294836100be565b1561029f5750610281565b73ffffffffffffffffffffffffffffffffffffffff84166000908152610102602052604081205492508214156102d55750610281565b6102f75b6101045460005b8181101561080c5761010480548290811061085457005b73ffffffffffffffffffffffffffffffffffffffff8316600283610100811061021a57005b015560015473ffffffffffffffffffffffffffffffffffffffff831660008181526101026020908152604091829020939093559081527f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c39190a15b505b50565b156103775761038a826100be565b156103955750610379565b61039d6102d9565b60015460fa901015156103b4576103b26103cb565b505b60015460fa901015156103f55750610379565b6104255b600060015b6001548110156106f7575b600154811080156107535750600281610100811061074c57005b6001805481019081905573ffffffffffffffffffffffffffffffffffffffff831690600290610100811061031c57005b5073ffffffffffffffffffffffffffffffffffffffff831660409081527f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da90602090a1505050565b156102815773ffffffffffffffffffffffffffffffffffffffff83166000908152610102602052604081205492508214156104a85750610377565b60016001600050540360006000505411156104c35750610377565b600060028361010081106104d357005b015573ffffffffffffffffffffffffffffffffffffffff8316600090815261010260205260408120556103c76102d9565b60408281527facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da90602090a15050565b15610377576001548211156105485750610379565b60008290556105046102d9565b82547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff018355600183018054821790555b50505050919050565b600086815261010360205260408120805490945090925082141561061a5781548355600183810183905561010480549182018082558280158290116106a6578286527f4c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe9081019082015b808211156106a457600081556001016105f9565b6000918252602090912001555b506001820154600284900a908116600014156105865773ffffffffffffffffffffffffffffffffffffffff3316604090815260608790527fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda9080a182546001901115156105555760008681526101036020526101048054604090922060020154909181106106c057005b505b505050600284018190556101048054889290811061060d57005b6000918252602080832090910182905587825261010390526040812081815560018181018390556002909101919091559450610586565b5090565b01546000145b1561076057600180547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0190555b60018054118015610701575060015460029061010081106106fb57005b0154600014155b1561072f576001016103db565b600154811080156107845750600154600290610100811061077d57005b0154600014155b801561079f5750600281610100811061079957005b01546000145b156107b85760015460029061010081106107bd57005b01555b6103d0565b015460028261010081106107cd57005b015580610102600060028361010081106107e357005b01548152602081019190915260400160009081209190915560015460029061010081106107b557005b61010480546000808355919091527f4c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe908101905b8082111561027f5760008155600101610840565b60009182526020822001541415156108a6576101048054610103916000918490811061087c57005b60009182526020808320909101548352820192909252604001812081815560018101829055600201555b6001016102e056",
                 "nonce" : "0x00",
@@ -74,9 +74,9 @@
                     "0xd3e69d8c7f41f7aeaf8130ddc53047aeee8cb46a73d6bae86b7e7d6bf8312e6b" : "0x02"
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75ef08f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
@@ -87,14 +87,14 @@
                 "0x173825d9000000000000000000000000a94f5374fce5edbc8e2a8697c15331677e6ebf0b"
             ],
             "gasLimit" : [
-                "10000000"
+                "0x989680"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x01",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "6295ee1b4f6dd65047762f924ecd367c17eabf8f",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
             "value" : [
-                "100"
+                "0x64"
             ]
         }
     }
diff --git a/GeneralStateTests/stWalletTest/multiOwnedRemoveOwnerByNonOwner.json b/GeneralStateTests/stWalletTest/multiOwnedRemoveOwnerByNonOwner.json
index 30f3cc1e3..8a455f406 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedRemoveOwnerByNonOwner.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedRemoveOwnerByNonOwner.json
@@ -1,17 +1,17 @@
 {
     "multiOwnedRemoveOwnerByNonOwner" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6e6f58709e4b66c0df01499e6f7433dc54d7a6140f8f0a92b517b0babd036756",
+                    "hash" : "0x6e6f58709e4b66c0df01499e6f7433dc54d7a6140f8f0a92b517b0babd036756",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "fa675da31c7250893f5a2e2aa7d89c0c3ad18b03d237c5c339ff8a4bd3c278ef",
+                    "hash" : "0xfa675da31c7250893f5a2e2aa7d89c0c3ad18b03d237c5c339ff8a4bd3c278ef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "70910649f40918bc471890021c07e53f3be6113d5ecbadf909d5d7515b9ba3fa",
+                    "hash" : "0x70910649f40918bc471890021c07e53f3be6113d5ecbadf909d5d7515b9ba3fa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "70910649f40918bc471890021c07e53f3be6113d5ecbadf909d5d7515b9ba3fa",
+                    "hash" : "0x70910649f40918bc471890021c07e53f3be6113d5ecbadf909d5d7515b9ba3fa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "fa675da31c7250893f5a2e2aa7d89c0c3ad18b03d237c5c339ff8a4bd3c278ef",
+                    "hash" : "0xfa675da31c7250893f5a2e2aa7d89c0c3ad18b03d237c5c339ff8a4bd3c278ef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,14 +61,14 @@
             ]
         },
         "pre" : {
-            "3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4" : {
+            "0x3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4" : {
                 "balance" : "0x0de0b6b3a75ef08f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
                 "balance" : "0x64",
                 "code" : "0x606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe",
                 "nonce" : "0x00",
@@ -79,9 +79,9 @@
                     "0x6e369836487c234b9e553ef3f787c2d8865520739d340c67b3d251a33986e58d" : "0x01"
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75ef08f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
@@ -92,14 +92,14 @@
                 "0x173825d9000000000000000000000000a94f5374fce5edbc8e2a8697c15331677e6ebf0b"
             ],
             "gasLimit" : [
-                "10000000"
+                "0x989680"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x01",
-            "secretKey" : "a95defe70ebea7804f9c3be42d20d24375e2a92b9d9666b832069c5f3cd423dd",
-            "to" : "6295ee1b4f6dd65047762f924ecd367c17eabf8f",
+            "secretKey" : "0xa95defe70ebea7804f9c3be42d20d24375e2a92b9d9666b832069c5f3cd423dd",
+            "to" : "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
             "value" : [
-                "100"
+                "0x64"
             ]
         }
     }
diff --git a/GeneralStateTests/stWalletTest/multiOwnedRemoveOwner_mySelf.json b/GeneralStateTests/stWalletTest/multiOwnedRemoveOwner_mySelf.json
index 6b9c47a9d..9aa27e06f 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedRemoveOwner_mySelf.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedRemoveOwner_mySelf.json
@@ -1,17 +1,17 @@
 {
     "multiOwnedRemoveOwner_mySelf" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "982e4ff5074f3331cc081c99474650921f41829ea515cdbb036453865ffb237d",
+                    "hash" : "0x982e4ff5074f3331cc081c99474650921f41829ea515cdbb036453865ffb237d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "63fd77f981b9e01643abe7a66f465eeb8f273b30b717a04e5ef9cd469328ac6b",
+                    "hash" : "0x63fd77f981b9e01643abe7a66f465eeb8f273b30b717a04e5ef9cd469328ac6b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "ebb6196d6dd09398503826c0d8fd687bb0f59fa8bbad2763d5e79c7a98aa02e8",
+                    "hash" : "0xebb6196d6dd09398503826c0d8fd687bb0f59fa8bbad2763d5e79c7a98aa02e8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ebb6196d6dd09398503826c0d8fd687bb0f59fa8bbad2763d5e79c7a98aa02e8",
+                    "hash" : "0xebb6196d6dd09398503826c0d8fd687bb0f59fa8bbad2763d5e79c7a98aa02e8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "63fd77f981b9e01643abe7a66f465eeb8f273b30b717a04e5ef9cd469328ac6b",
+                    "hash" : "0x63fd77f981b9e01643abe7a66f465eeb8f273b30b717a04e5ef9cd469328ac6b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,7 +61,7 @@
             ]
         },
         "pre" : {
-            "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
                 "balance" : "0x64",
                 "code" : "0x606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe",
                 "nonce" : "0x00",
@@ -72,9 +72,9 @@
                     "0x6e369836487c234b9e553ef3f787c2d8865520739d340c67b3d251a33986e58d" : "0x01"
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75ef08f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
@@ -85,14 +85,14 @@
                 "0x173825d9000000000000000000000000a94f5374fce5edbc8e2a8697c15331677e6ebf0b"
             ],
             "gasLimit" : [
-                "10000000"
+                "0x989680"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x01",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "6295ee1b4f6dd65047762f924ecd367c17eabf8f",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
             "value" : [
-                "100"
+                "0x64"
             ]
         }
     }
diff --git a/GeneralStateTests/stWalletTest/multiOwnedRemoveOwner_ownerIsNotOwner.json b/GeneralStateTests/stWalletTest/multiOwnedRemoveOwner_ownerIsNotOwner.json
index 2c61ffe39..2b51e9a0e 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedRemoveOwner_ownerIsNotOwner.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedRemoveOwner_ownerIsNotOwner.json
@@ -1,17 +1,17 @@
 {
     "multiOwnedRemoveOwner_ownerIsNotOwner" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "66decb6aab1b1844ea6b70583e6b1f69cc2be7d909c3d3cbfcd3b68ac744dd70",
+                    "hash" : "0x66decb6aab1b1844ea6b70583e6b1f69cc2be7d909c3d3cbfcd3b68ac744dd70",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b4897c497efaf2519fafc2f139cb0738b019ff01ae14c79c7488129250934cdb",
+                    "hash" : "0xb4897c497efaf2519fafc2f139cb0738b019ff01ae14c79c7488129250934cdb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "0e2fad3bad0d907ef33e2855f0120cdedf6445aa0b148e39d258e16f01a77912",
+                    "hash" : "0x0e2fad3bad0d907ef33e2855f0120cdedf6445aa0b148e39d258e16f01a77912",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "0e2fad3bad0d907ef33e2855f0120cdedf6445aa0b148e39d258e16f01a77912",
+                    "hash" : "0x0e2fad3bad0d907ef33e2855f0120cdedf6445aa0b148e39d258e16f01a77912",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b4897c497efaf2519fafc2f139cb0738b019ff01ae14c79c7488129250934cdb",
+                    "hash" : "0xb4897c497efaf2519fafc2f139cb0738b019ff01ae14c79c7488129250934cdb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,7 +61,7 @@
             ]
         },
         "pre" : {
-            "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
                 "balance" : "0x64",
                 "code" : "0x606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe",
                 "nonce" : "0x00",
@@ -72,9 +72,9 @@
                     "0x6e369836487c234b9e553ef3f787c2d8865520739d340c67b3d251a33986e58d" : "0x01"
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75ef08f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
@@ -85,14 +85,14 @@
                 "0x173825d9000000000000000000000000aaaf5374fce5edbc8e2a8697c15331677e6ebaaa"
             ],
             "gasLimit" : [
-                "10000000"
+                "0x989680"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x01",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "6295ee1b4f6dd65047762f924ecd367c17eabf8f",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
             "value" : [
-                "100"
+                "0x64"
             ]
         }
     }
diff --git a/GeneralStateTests/stWalletTest/multiOwnedRevokeNothing.json b/GeneralStateTests/stWalletTest/multiOwnedRevokeNothing.json
index 04e907fc5..29357d231 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedRevokeNothing.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedRevokeNothing.json
@@ -1,17 +1,17 @@
 {
     "multiOwnedRevokeNothing" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "db7f36cbcd9ac9c98e8868f2f0b071c94d0dcd842266b692162e3b951f328370",
+                    "hash" : "0xdb7f36cbcd9ac9c98e8868f2f0b071c94d0dcd842266b692162e3b951f328370",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7d5794558d5ddb7239e0d69b38782b20417b592d598e5ac00128cb16ca585b4f",
+                    "hash" : "0x7d5794558d5ddb7239e0d69b38782b20417b592d598e5ac00128cb16ca585b4f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "50c50131200c75046b151bbc695591bbca013d7351f354307ff31c645453dee5",
+                    "hash" : "0x50c50131200c75046b151bbc695591bbca013d7351f354307ff31c645453dee5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "50c50131200c75046b151bbc695591bbca013d7351f354307ff31c645453dee5",
+                    "hash" : "0x50c50131200c75046b151bbc695591bbca013d7351f354307ff31c645453dee5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7d5794558d5ddb7239e0d69b38782b20417b592d598e5ac00128cb16ca585b4f",
+                    "hash" : "0x7d5794558d5ddb7239e0d69b38782b20417b592d598e5ac00128cb16ca585b4f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,7 +61,7 @@
             ]
         },
         "pre" : {
-            "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
                 "balance" : "0x64",
                 "code" : "0x606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe",
                 "nonce" : "0x00",
@@ -72,9 +72,9 @@
                     "0x6e369836487c234b9e553ef3f787c2d8865520739d340c67b3d251a33986e58d" : "0x01"
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75ef08f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
@@ -85,14 +85,14 @@
                 "0xb75c7dc66e369836487c234b9e553ef3f787c2d8865520739d340c67b3d251a33986e58d"
             ],
             "gasLimit" : [
-                "10000000"
+                "0x989680"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x01",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "6295ee1b4f6dd65047762f924ecd367c17eabf8f",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
             "value" : [
-                "100"
+                "0x64"
             ]
         }
     }
diff --git a/GeneralStateTests/stWalletTest/walletAddOwnerRemovePendingTransaction.json b/GeneralStateTests/stWalletTest/walletAddOwnerRemovePendingTransaction.json
index 32023bc3a..880df1f26 100644
--- a/GeneralStateTests/stWalletTest/walletAddOwnerRemovePendingTransaction.json
+++ b/GeneralStateTests/stWalletTest/walletAddOwnerRemovePendingTransaction.json
@@ -1,17 +1,17 @@
 {
     "walletAddOwnerRemovePendingTransaction" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "76d400e242aa18890d5586152e67f7d432b0cc9c2abdc84cef5686d1a8ee3661",
+                    "hash" : "0x76d400e242aa18890d5586152e67f7d432b0cc9c2abdc84cef5686d1a8ee3661",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "2c52ac094e626f3acf90b21fe87fadde57108829d05d14a86a5c5328560baf91",
+                    "hash" : "0x2c52ac094e626f3acf90b21fe87fadde57108829d05d14a86a5c5328560baf91",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "98626a984091a07fe7e604b0cd371fa5911ab2b5f91f2742f8b62e805c1a8172",
+                    "hash" : "0x98626a984091a07fe7e604b0cd371fa5911ab2b5f91f2742f8b62e805c1a8172",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "98626a984091a07fe7e604b0cd371fa5911ab2b5f91f2742f8b62e805c1a8172",
+                    "hash" : "0x98626a984091a07fe7e604b0cd371fa5911ab2b5f91f2742f8b62e805c1a8172",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "2c52ac094e626f3acf90b21fe87fadde57108829d05d14a86a5c5328560baf91",
+                    "hash" : "0x2c52ac094e626f3acf90b21fe87fadde57108829d05d14a86a5c5328560baf91",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4" : {
+            "0x3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4" : {
                 "balance" : "0x5af3107a4000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75ef08f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "ec0e71ad0a90ffe1909d27dac207f7680abba42d" : {
+            "0xec0e71ad0a90ffe1909d27dac207f7680abba42d" : {
                 "balance" : "0x64",
                 "code" : "0x606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe",
                 "nonce" : "0x00",
@@ -101,14 +101,14 @@
                 "0x7065cb48000000000000000000000000bbb1cd2cd96c6d5c0b5eb3322d807b34482481d4"
             ],
             "gasLimit" : [
-                "10000000"
+                "0x989680"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "a95defe70ebea7804f9c3be42d20d24375e2a92b9d9666b832069c5f3cd423dd",
-            "to" : "ec0e71ad0a90ffe1909d27dac207f7680abba42d",
+            "secretKey" : "0xa95defe70ebea7804f9c3be42d20d24375e2a92b9d9666b832069c5f3cd423dd",
+            "to" : "0xec0e71ad0a90ffe1909d27dac207f7680abba42d",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stWalletTest/walletChangeOwnerRemovePendingTransaction.json b/GeneralStateTests/stWalletTest/walletChangeOwnerRemovePendingTransaction.json
index 7a8c6be73..12413c8b5 100644
--- a/GeneralStateTests/stWalletTest/walletChangeOwnerRemovePendingTransaction.json
+++ b/GeneralStateTests/stWalletTest/walletChangeOwnerRemovePendingTransaction.json
@@ -1,17 +1,17 @@
 {
     "walletChangeOwnerRemovePendingTransaction" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b0d9066f15757dfad94b553598d8e1691ea7735d19d8a0623d3d33982d677b70",
+                    "hash" : "0xb0d9066f15757dfad94b553598d8e1691ea7735d19d8a0623d3d33982d677b70",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c341907f27b95bf7d430f8649f81aeb19aec69a69b80323e2a7e98b373024376",
+                    "hash" : "0xc341907f27b95bf7d430f8649f81aeb19aec69a69b80323e2a7e98b373024376",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "ea51b03ea74536aa00f33d9f3f49aa80765a1cf6b92773050599ef904595ec9b",
+                    "hash" : "0xea51b03ea74536aa00f33d9f3f49aa80765a1cf6b92773050599ef904595ec9b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ea51b03ea74536aa00f33d9f3f49aa80765a1cf6b92773050599ef904595ec9b",
+                    "hash" : "0xea51b03ea74536aa00f33d9f3f49aa80765a1cf6b92773050599ef904595ec9b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c341907f27b95bf7d430f8649f81aeb19aec69a69b80323e2a7e98b373024376",
+                    "hash" : "0xc341907f27b95bf7d430f8649f81aeb19aec69a69b80323e2a7e98b373024376",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4" : {
+            "0x3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4" : {
                 "balance" : "0x5af3107a4000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75ef08f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "ec0e71ad0a90ffe1909d27dac207f7680abba42d" : {
+            "0xec0e71ad0a90ffe1909d27dac207f7680abba42d" : {
                 "balance" : "0x64",
                 "code" : "0x606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe",
                 "nonce" : "0x00",
@@ -101,14 +101,14 @@
                 "0xf00d4b5d000000000000000000000000a94f5374fce5edbc8e2a8697c15331677e6ebf0b000000000000000000000000aaaf5374fce5edbc8e2a8697c15331677e6ebaaa"
             ],
             "gasLimit" : [
-                "10000000"
+                "0x989680"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "a95defe70ebea7804f9c3be42d20d24375e2a92b9d9666b832069c5f3cd423dd",
-            "to" : "ec0e71ad0a90ffe1909d27dac207f7680abba42d",
+            "secretKey" : "0xa95defe70ebea7804f9c3be42d20d24375e2a92b9d9666b832069c5f3cd423dd",
+            "to" : "0xec0e71ad0a90ffe1909d27dac207f7680abba42d",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stWalletTest/walletChangeRequirementRemovePendingTransaction.json b/GeneralStateTests/stWalletTest/walletChangeRequirementRemovePendingTransaction.json
index fe3829003..6bf255260 100644
--- a/GeneralStateTests/stWalletTest/walletChangeRequirementRemovePendingTransaction.json
+++ b/GeneralStateTests/stWalletTest/walletChangeRequirementRemovePendingTransaction.json
@@ -1,17 +1,17 @@
 {
     "walletChangeRequirementRemovePendingTransaction" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "69b8a269709ee68ff09702d3478d9c1faca7139c6da635517fdd22e7339c7c30",
+                    "hash" : "0x69b8a269709ee68ff09702d3478d9c1faca7139c6da635517fdd22e7339c7c30",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "31860009e5b38e2bbbeafa52f4ce78c9e130e00d25f73de18d5de9bd93207340",
+                    "hash" : "0x31860009e5b38e2bbbeafa52f4ce78c9e130e00d25f73de18d5de9bd93207340",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4b7e636d5c533eaf803b61cb48b5b2ee5e3bf8e1b5f78cb4a79b57fe6c51adbf",
+                    "hash" : "0x4b7e636d5c533eaf803b61cb48b5b2ee5e3bf8e1b5f78cb4a79b57fe6c51adbf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4b7e636d5c533eaf803b61cb48b5b2ee5e3bf8e1b5f78cb4a79b57fe6c51adbf",
+                    "hash" : "0x4b7e636d5c533eaf803b61cb48b5b2ee5e3bf8e1b5f78cb4a79b57fe6c51adbf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "31860009e5b38e2bbbeafa52f4ce78c9e130e00d25f73de18d5de9bd93207340",
+                    "hash" : "0x31860009e5b38e2bbbeafa52f4ce78c9e130e00d25f73de18d5de9bd93207340",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4" : {
+            "0x3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4" : {
                 "balance" : "0x5af3107a4000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75ef08f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "ec0e71ad0a90ffe1909d27dac207f7680abba42d" : {
+            "0xec0e71ad0a90ffe1909d27dac207f7680abba42d" : {
                 "balance" : "0x64",
                 "code" : "0x606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe",
                 "nonce" : "0x00",
@@ -101,14 +101,14 @@
                 "0xba51a6df0000000000000000000000000000000000000000000000000000000000000002"
             ],
             "gasLimit" : [
-                "10000000"
+                "0x989680"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "a95defe70ebea7804f9c3be42d20d24375e2a92b9d9666b832069c5f3cd423dd",
-            "to" : "ec0e71ad0a90ffe1909d27dac207f7680abba42d",
+            "secretKey" : "0xa95defe70ebea7804f9c3be42d20d24375e2a92b9d9666b832069c5f3cd423dd",
+            "to" : "0xec0e71ad0a90ffe1909d27dac207f7680abba42d",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stWalletTest/walletConfirm.json b/GeneralStateTests/stWalletTest/walletConfirm.json
index 167ea1b7b..382e5e6e4 100644
--- a/GeneralStateTests/stWalletTest/walletConfirm.json
+++ b/GeneralStateTests/stWalletTest/walletConfirm.json
@@ -1,17 +1,17 @@
 {
     "walletConfirm" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "23966adcfcae0a0ddd28591c9f959c808aca30107336bb03277f749820f9734f",
+                    "hash" : "0x23966adcfcae0a0ddd28591c9f959c808aca30107336bb03277f749820f9734f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "11645d1f9235d0092b8cb36f8066e1245abfa79f7f1c14520888bce3713e1fad",
+                    "hash" : "0x11645d1f9235d0092b8cb36f8066e1245abfa79f7f1c14520888bce3713e1fad",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6b821fa015e316cdd77bbdbc43091249669a29b9a2e217a54484cf4718439be2",
+                    "hash" : "0x6b821fa015e316cdd77bbdbc43091249669a29b9a2e217a54484cf4718439be2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6b821fa015e316cdd77bbdbc43091249669a29b9a2e217a54484cf4718439be2",
+                    "hash" : "0x6b821fa015e316cdd77bbdbc43091249669a29b9a2e217a54484cf4718439be2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "11645d1f9235d0092b8cb36f8066e1245abfa79f7f1c14520888bce3713e1fad",
+                    "hash" : "0x11645d1f9235d0092b8cb36f8066e1245abfa79f7f1c14520888bce3713e1fad",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4" : {
+            "0x3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4" : {
                 "balance" : "0x5af3107a4000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75ef08f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "ec0e71ad0a90ffe1909d27dac207f7680abba42d" : {
+            "0xec0e71ad0a90ffe1909d27dac207f7680abba42d" : {
                 "balance" : "0x64",
                 "code" : "0x606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe",
                 "nonce" : "0x00",
@@ -101,14 +101,14 @@
                 "0x797af6276877e4536b661640954061cdbc3a9761fb5245c340fcb1721307cd9d5f285c96"
             ],
             "gasLimit" : [
-                "10000000"
+                "0x989680"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "a95defe70ebea7804f9c3be42d20d24375e2a92b9d9666b832069c5f3cd423dd",
-            "to" : "ec0e71ad0a90ffe1909d27dac207f7680abba42d",
+            "secretKey" : "0xa95defe70ebea7804f9c3be42d20d24375e2a92b9d9666b832069c5f3cd423dd",
+            "to" : "0xec0e71ad0a90ffe1909d27dac207f7680abba42d",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stWalletTest/walletConstruction.json b/GeneralStateTests/stWalletTest/walletConstruction.json
index 120606d4d..c722ec23e 100644
--- a/GeneralStateTests/stWalletTest/walletConstruction.json
+++ b/GeneralStateTests/stWalletTest/walletConstruction.json
@@ -1,17 +1,17 @@
 {
     "walletConstruction" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f5df26e4920624deca65021964db05a0d6146ef3f6531a03c8a4ace37056f0d5",
+                    "hash" : "0xf5df26e4920624deca65021964db05a0d6146ef3f6531a03c8a4ace37056f0d5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "f5df26e4920624deca65021964db05a0d6146ef3f6531a03c8a4ace37056f0d5",
+                    "hash" : "0xf5df26e4920624deca65021964db05a0d6146ef3f6531a03c8a4ace37056f0d5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -29,7 +29,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "5d21e551199cf86e3d13645ec7f518611d676a76432196c10f2a8b8c5bf921f9",
+                    "hash" : "0x5d21e551199cf86e3d13645ec7f518611d676a76432196c10f2a8b8c5bf921f9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -37,7 +37,7 @@
                     }
                 },
                 {
-                    "hash" : "5d21e551199cf86e3d13645ec7f518611d676a76432196c10f2a8b8c5bf921f9",
+                    "hash" : "0x5d21e551199cf86e3d13645ec7f518611d676a76432196c10f2a8b8c5bf921f9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -47,7 +47,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "de273086f158a587a95f50228ec572815ee6b876800301869ae414bf74d6c095",
+                    "hash" : "0xde273086f158a587a95f50228ec572815ee6b876800301869ae414bf74d6c095",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -55,7 +55,7 @@
                     }
                 },
                 {
-                    "hash" : "de273086f158a587a95f50228ec572815ee6b876800301869ae414bf74d6c095",
+                    "hash" : "0xde273086f158a587a95f50228ec572815ee6b876800301869ae414bf74d6c095",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -65,7 +65,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f5df26e4920624deca65021964db05a0d6146ef3f6531a03c8a4ace37056f0d5",
+                    "hash" : "0xf5df26e4920624deca65021964db05a0d6146ef3f6531a03c8a4ace37056f0d5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -73,7 +73,7 @@
                     }
                 },
                 {
-                    "hash" : "f5df26e4920624deca65021964db05a0d6146ef3f6531a03c8a4ace37056f0d5",
+                    "hash" : "0xf5df26e4920624deca65021964db05a0d6146ef3f6531a03c8a4ace37056f0d5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -83,7 +83,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "5d21e551199cf86e3d13645ec7f518611d676a76432196c10f2a8b8c5bf921f9",
+                    "hash" : "0x5d21e551199cf86e3d13645ec7f518611d676a76432196c10f2a8b8c5bf921f9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -91,7 +91,7 @@
                     }
                 },
                 {
-                    "hash" : "5d21e551199cf86e3d13645ec7f518611d676a76432196c10f2a8b8c5bf921f9",
+                    "hash" : "0x5d21e551199cf86e3d13645ec7f518611d676a76432196c10f2a8b8c5bf921f9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -101,9 +101,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75ef08f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
@@ -114,15 +114,15 @@
                 "6060604052604051602080611014833960806040818152925160016000818155818055600160a060020a03331660038190558152610102909452938320939093556201518042046101075582917f102d25c49d33fcdb8976a3f2744e0785c98d9e43b88364859e6aec4ae82eff5c91a250610f958061007f6000396000f300606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"
             ],
             "gasLimit" : [
-                "1225023",
-                "1825023"
+                "0x12b13f",
+                "0x1bd8ff"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x01",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "100"
+                "0x64"
             ]
         }
     }
diff --git a/GeneralStateTests/stWalletTest/walletConstructionOOG.json b/GeneralStateTests/stWalletTest/walletConstructionOOG.json
index 82fd43199..d16d183c2 100644
--- a/GeneralStateTests/stWalletTest/walletConstructionOOG.json
+++ b/GeneralStateTests/stWalletTest/walletConstructionOOG.json
@@ -1,17 +1,17 @@
 {
     "walletConstructionOOG" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "3296236c5948e5ce60a0dbd635fe6d1c30887f61ffb60efa0ec858a5d5b07628",
+                    "hash" : "0x3296236c5948e5ce60a0dbd635fe6d1c30887f61ffb60efa0ec858a5d5b07628",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "f5df26e4920624deca65021964db05a0d6146ef3f6531a03c8a4ace37056f0d5",
+                    "hash" : "0xf5df26e4920624deca65021964db05a0d6146ef3f6531a03c8a4ace37056f0d5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -29,7 +29,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "3296236c5948e5ce60a0dbd635fe6d1c30887f61ffb60efa0ec858a5d5b07628",
+                    "hash" : "0x3296236c5948e5ce60a0dbd635fe6d1c30887f61ffb60efa0ec858a5d5b07628",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -37,7 +37,7 @@
                     }
                 },
                 {
-                    "hash" : "5d21e551199cf86e3d13645ec7f518611d676a76432196c10f2a8b8c5bf921f9",
+                    "hash" : "0x5d21e551199cf86e3d13645ec7f518611d676a76432196c10f2a8b8c5bf921f9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -47,7 +47,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "bb177d808c1e3345f197c1690948a45da1b91056b93473a31f0f106be4b31683",
+                    "hash" : "0xbb177d808c1e3345f197c1690948a45da1b91056b93473a31f0f106be4b31683",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -55,7 +55,7 @@
                     }
                 },
                 {
-                    "hash" : "de273086f158a587a95f50228ec572815ee6b876800301869ae414bf74d6c095",
+                    "hash" : "0xde273086f158a587a95f50228ec572815ee6b876800301869ae414bf74d6c095",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -65,7 +65,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3296236c5948e5ce60a0dbd635fe6d1c30887f61ffb60efa0ec858a5d5b07628",
+                    "hash" : "0x3296236c5948e5ce60a0dbd635fe6d1c30887f61ffb60efa0ec858a5d5b07628",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -73,7 +73,7 @@
                     }
                 },
                 {
-                    "hash" : "f5df26e4920624deca65021964db05a0d6146ef3f6531a03c8a4ace37056f0d5",
+                    "hash" : "0xf5df26e4920624deca65021964db05a0d6146ef3f6531a03c8a4ace37056f0d5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -83,7 +83,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "3296236c5948e5ce60a0dbd635fe6d1c30887f61ffb60efa0ec858a5d5b07628",
+                    "hash" : "0x3296236c5948e5ce60a0dbd635fe6d1c30887f61ffb60efa0ec858a5d5b07628",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -91,7 +91,7 @@
                     }
                 },
                 {
-                    "hash" : "5d21e551199cf86e3d13645ec7f518611d676a76432196c10f2a8b8c5bf921f9",
+                    "hash" : "0x5d21e551199cf86e3d13645ec7f518611d676a76432196c10f2a8b8c5bf921f9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -101,9 +101,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75ef08f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
@@ -114,15 +114,15 @@
                 "6060604052604051602080611014833960806040818152925160016000818155818055600160a060020a03331660038190558152610102909452938320939093556201518042046101075582917f102d25c49d33fcdb8976a3f2744e0785c98d9e43b88364859e6aec4ae82eff5c91a250610f958061007f6000396000f300606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"
             ],
             "gasLimit" : [
-                "427222",
-                "1225022"
+                "0x0684d6",
+                "0x12b13e"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x01",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "100"
+                "0x64"
             ]
         }
     }
diff --git a/GeneralStateTests/stWalletTest/walletConstructionPartial.json b/GeneralStateTests/stWalletTest/walletConstructionPartial.json
index f53e8f15b..dc8352872 100644
--- a/GeneralStateTests/stWalletTest/walletConstructionPartial.json
+++ b/GeneralStateTests/stWalletTest/walletConstructionPartial.json
@@ -1,17 +1,17 @@
 {
     "walletConstructionPartial" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f5df26e4920624deca65021964db05a0d6146ef3f6531a03c8a4ace37056f0d5",
+                    "hash" : "0xf5df26e4920624deca65021964db05a0d6146ef3f6531a03c8a4ace37056f0d5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "5d21e551199cf86e3d13645ec7f518611d676a76432196c10f2a8b8c5bf921f9",
+                    "hash" : "0x5d21e551199cf86e3d13645ec7f518611d676a76432196c10f2a8b8c5bf921f9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "de273086f158a587a95f50228ec572815ee6b876800301869ae414bf74d6c095",
+                    "hash" : "0xde273086f158a587a95f50228ec572815ee6b876800301869ae414bf74d6c095",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f5df26e4920624deca65021964db05a0d6146ef3f6531a03c8a4ace37056f0d5",
+                    "hash" : "0xf5df26e4920624deca65021964db05a0d6146ef3f6531a03c8a4ace37056f0d5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "5d21e551199cf86e3d13645ec7f518611d676a76432196c10f2a8b8c5bf921f9",
+                    "hash" : "0x5d21e551199cf86e3d13645ec7f518611d676a76432196c10f2a8b8c5bf921f9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75ef08f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
@@ -74,14 +74,14 @@
                 "6060604052604051602080611014833960806040818152925160016000818155818055600160a060020a03331660038190558152610102909452938320939093556201518042046101075582917f102d25c49d33fcdb8976a3f2744e0785c98d9e43b88364859e6aec4ae82eff5c91a250610f958061007f6000396000f300606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe"
             ],
             "gasLimit" : [
-                "2225022"
+                "0x21f37e"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x01",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                "100"
+                "0x64"
             ]
         }
     }
diff --git a/GeneralStateTests/stWalletTest/walletDefault.json b/GeneralStateTests/stWalletTest/walletDefault.json
index 1de40781a..b35c6212f 100644
--- a/GeneralStateTests/stWalletTest/walletDefault.json
+++ b/GeneralStateTests/stWalletTest/walletDefault.json
@@ -1,17 +1,17 @@
 {
     "walletDefault" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b9ea431e30a83fb32f66ebd5ebf4f8f1a550e0e1471304ebfe6b3025ec8203c4",
+                    "hash" : "0xb9ea431e30a83fb32f66ebd5ebf4f8f1a550e0e1471304ebfe6b3025ec8203c4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "567dbc211151e1d9af70a3678402f013b9f04ac62ecc881fb254f7cacf07cb48",
+                    "hash" : "0x567dbc211151e1d9af70a3678402f013b9f04ac62ecc881fb254f7cacf07cb48",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b9ea431e30a83fb32f66ebd5ebf4f8f1a550e0e1471304ebfe6b3025ec8203c4",
+                    "hash" : "0xb9ea431e30a83fb32f66ebd5ebf4f8f1a550e0e1471304ebfe6b3025ec8203c4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b9ea431e30a83fb32f66ebd5ebf4f8f1a550e0e1471304ebfe6b3025ec8203c4",
+                    "hash" : "0xb9ea431e30a83fb32f66ebd5ebf4f8f1a550e0e1471304ebfe6b3025ec8203c4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "567dbc211151e1d9af70a3678402f013b9f04ac62ecc881fb254f7cacf07cb48",
+                    "hash" : "0x567dbc211151e1d9af70a3678402f013b9f04ac62ecc881fb254f7cacf07cb48",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,14 +61,14 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75ef08f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "ec0e71ad0a90ffe1909d27dac207f7680abba42d" : {
+            "0xec0e71ad0a90ffe1909d27dac207f7680abba42d" : {
                 "balance" : "0x64",
                 "code" : "0x606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe",
                 "nonce" : "0x00",
@@ -86,14 +86,14 @@
                 ""
             ],
             "gasLimit" : [
-                "10000000"
+                "0x989680"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x01",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "ec0e71ad0a90ffe1909d27dac207f7680abba42d",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xec0e71ad0a90ffe1909d27dac207f7680abba42d",
             "value" : [
-                "100"
+                "0x64"
             ]
         }
     }
diff --git a/GeneralStateTests/stWalletTest/walletDefaultWithOutValue.json b/GeneralStateTests/stWalletTest/walletDefaultWithOutValue.json
index e2c690220..db3cf59d2 100644
--- a/GeneralStateTests/stWalletTest/walletDefaultWithOutValue.json
+++ b/GeneralStateTests/stWalletTest/walletDefaultWithOutValue.json
@@ -1,17 +1,17 @@
 {
     "walletDefaultWithOutValue" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "baca1ba6b75451d3a02f5204972c745a9f7568362fdeb65f4516af9949c2e03d",
+                    "hash" : "0xbaca1ba6b75451d3a02f5204972c745a9f7568362fdeb65f4516af9949c2e03d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "baca1ba6b75451d3a02f5204972c745a9f7568362fdeb65f4516af9949c2e03d",
+                    "hash" : "0xbaca1ba6b75451d3a02f5204972c745a9f7568362fdeb65f4516af9949c2e03d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "baca1ba6b75451d3a02f5204972c745a9f7568362fdeb65f4516af9949c2e03d",
+                    "hash" : "0xbaca1ba6b75451d3a02f5204972c745a9f7568362fdeb65f4516af9949c2e03d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "baca1ba6b75451d3a02f5204972c745a9f7568362fdeb65f4516af9949c2e03d",
+                    "hash" : "0xbaca1ba6b75451d3a02f5204972c745a9f7568362fdeb65f4516af9949c2e03d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "baca1ba6b75451d3a02f5204972c745a9f7568362fdeb65f4516af9949c2e03d",
+                    "hash" : "0xbaca1ba6b75451d3a02f5204972c745a9f7568362fdeb65f4516af9949c2e03d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,14 +61,14 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75ef08f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "ec0e71ad0a90ffe1909d27dac207f7680abba42d" : {
+            "0xec0e71ad0a90ffe1909d27dac207f7680abba42d" : {
                 "balance" : "0x64",
                 "code" : "0x606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe",
                 "nonce" : "0x00",
@@ -86,14 +86,14 @@
                 ""
             ],
             "gasLimit" : [
-                "10000000"
+                "0x989680"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x01",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "ec0e71ad0a90ffe1909d27dac207f7680abba42d",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xec0e71ad0a90ffe1909d27dac207f7680abba42d",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stWalletTest/walletExecuteOverDailyLimitMultiOwner.json b/GeneralStateTests/stWalletTest/walletExecuteOverDailyLimitMultiOwner.json
index 484c6c425..58f6edc55 100644
--- a/GeneralStateTests/stWalletTest/walletExecuteOverDailyLimitMultiOwner.json
+++ b/GeneralStateTests/stWalletTest/walletExecuteOverDailyLimitMultiOwner.json
@@ -1,17 +1,17 @@
 {
     "walletExecuteOverDailyLimitMultiOwner" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f36bbfa8ef75d0827091e979ab45f88aca100449e23efa61baa1ea9187450db2",
+                    "hash" : "0xf36bbfa8ef75d0827091e979ab45f88aca100449e23efa61baa1ea9187450db2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "4e98ab6f78c177e5a950cbae526866c7bf2f2245aa27e5d47cffcc513b49d3f3",
+                    "hash" : "0x4e98ab6f78c177e5a950cbae526866c7bf2f2245aa27e5d47cffcc513b49d3f3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "47c3b7b4a9488688b0e7fdface2c118672bc9cd9cf7d56316b0d7c42b4530b18",
+                    "hash" : "0x47c3b7b4a9488688b0e7fdface2c118672bc9cd9cf7d56316b0d7c42b4530b18",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "47c3b7b4a9488688b0e7fdface2c118672bc9cd9cf7d56316b0d7c42b4530b18",
+                    "hash" : "0x47c3b7b4a9488688b0e7fdface2c118672bc9cd9cf7d56316b0d7c42b4530b18",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "4e98ab6f78c177e5a950cbae526866c7bf2f2245aa27e5d47cffcc513b49d3f3",
+                    "hash" : "0x4e98ab6f78c177e5a950cbae526866c7bf2f2245aa27e5d47cffcc513b49d3f3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,14 +61,14 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75ef08f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "ec0e71ad0a90ffe1909d27dac207f7680abba42d" : {
+            "0xec0e71ad0a90ffe1909d27dac207f7680abba42d" : {
                 "balance" : "0x64",
                 "code" : "0x606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe",
                 "nonce" : "0x00",
@@ -87,14 +87,14 @@
                 "0xb61d27f6000000000000000000000000aaaf5374fce5edbc8e2a8697c15331677e6ebaaa00000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000060"
             ],
             "gasLimit" : [
-                "10000000"
+                "0x989680"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x01",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "ec0e71ad0a90ffe1909d27dac207f7680abba42d",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xec0e71ad0a90ffe1909d27dac207f7680abba42d",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stWalletTest/walletExecuteOverDailyLimitOnlyOneOwner.json b/GeneralStateTests/stWalletTest/walletExecuteOverDailyLimitOnlyOneOwner.json
index ee529ab7a..d6ae65b9c 100644
--- a/GeneralStateTests/stWalletTest/walletExecuteOverDailyLimitOnlyOneOwner.json
+++ b/GeneralStateTests/stWalletTest/walletExecuteOverDailyLimitOnlyOneOwner.json
@@ -1,17 +1,17 @@
 {
     "walletExecuteOverDailyLimitOnlyOneOwner" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "4560f9f796eadd8b25fa6aab7820c620399268377eb5183d45cecf11d3861005",
+                    "hash" : "0x4560f9f796eadd8b25fa6aab7820c620399268377eb5183d45cecf11d3861005",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c35acda0bf3e60848029418fa6e7f4b9f7de0d0b72ca136aa8cc19e866ab78d0",
+                    "hash" : "0xc35acda0bf3e60848029418fa6e7f4b9f7de0d0b72ca136aa8cc19e866ab78d0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2d54afeef9b30b0a8ccfb4c8017300d86f54e74ee22d348a0954ed60e24ddbf5",
+                    "hash" : "0x2d54afeef9b30b0a8ccfb4c8017300d86f54e74ee22d348a0954ed60e24ddbf5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "2d54afeef9b30b0a8ccfb4c8017300d86f54e74ee22d348a0954ed60e24ddbf5",
+                    "hash" : "0x2d54afeef9b30b0a8ccfb4c8017300d86f54e74ee22d348a0954ed60e24ddbf5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c35acda0bf3e60848029418fa6e7f4b9f7de0d0b72ca136aa8cc19e866ab78d0",
+                    "hash" : "0xc35acda0bf3e60848029418fa6e7f4b9f7de0d0b72ca136aa8cc19e866ab78d0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,14 +61,14 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75ef08f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "ec0e71ad0a90ffe1909d27dac207f7680abba42d" : {
+            "0xec0e71ad0a90ffe1909d27dac207f7680abba42d" : {
                 "balance" : "0x64",
                 "code" : "0x606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe",
                 "nonce" : "0x00",
@@ -86,14 +86,14 @@
                 "0xb61d27f6000000000000000000000000aaaf5374fce5edbc8e2a8697c15331677e6ebaaa00000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000060"
             ],
             "gasLimit" : [
-                "10000000"
+                "0x989680"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x01",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "ec0e71ad0a90ffe1909d27dac207f7680abba42d",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xec0e71ad0a90ffe1909d27dac207f7680abba42d",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stWalletTest/walletExecuteOverDailyLimitOnlyOneOwnerNew.json b/GeneralStateTests/stWalletTest/walletExecuteOverDailyLimitOnlyOneOwnerNew.json
index c570fd1de..08edd7275 100644
--- a/GeneralStateTests/stWalletTest/walletExecuteOverDailyLimitOnlyOneOwnerNew.json
+++ b/GeneralStateTests/stWalletTest/walletExecuteOverDailyLimitOnlyOneOwnerNew.json
@@ -1,17 +1,17 @@
 {
     "walletExecuteOverDailyLimitOnlyOneOwnerNew" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "fb4f90b233539bf0aba711d7b1070b31421272a0a34c9f3c9cf5d531ee110ba3",
+                    "hash" : "0xfb4f90b233539bf0aba711d7b1070b31421272a0a34c9f3c9cf5d531ee110ba3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "467ed06f47f9361f8b3112e8c5958013d8e1e4cae54784a1e5b56a079c611b85",
+                    "hash" : "0x467ed06f47f9361f8b3112e8c5958013d8e1e4cae54784a1e5b56a079c611b85",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "0d1e55d5b34a8dc8c28112c2c69d85d4bf22320367238cb469de61bde0041fc2",
+                    "hash" : "0x0d1e55d5b34a8dc8c28112c2c69d85d4bf22320367238cb469de61bde0041fc2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "0d1e55d5b34a8dc8c28112c2c69d85d4bf22320367238cb469de61bde0041fc2",
+                    "hash" : "0x0d1e55d5b34a8dc8c28112c2c69d85d4bf22320367238cb469de61bde0041fc2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "467ed06f47f9361f8b3112e8c5958013d8e1e4cae54784a1e5b56a079c611b85",
+                    "hash" : "0x467ed06f47f9361f8b3112e8c5958013d8e1e4cae54784a1e5b56a079c611b85",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,14 +61,14 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75ef08f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "ec0e71ad0a90ffe1909d27dac207f7680abba42d" : {
+            "0xec0e71ad0a90ffe1909d27dac207f7680abba42d" : {
                 "balance" : "0x64",
                 "code" : "0x606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe",
                 "nonce" : "0x00",
@@ -87,14 +87,14 @@
                 "0xb61d27f6000000000000000000000000aaaf5374fce5edbc8e2a8697c15331677e6ebaaa00000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000060"
             ],
             "gasLimit" : [
-                "10000000"
+                "0x989680"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x01",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "ec0e71ad0a90ffe1909d27dac207f7680abba42d",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xec0e71ad0a90ffe1909d27dac207f7680abba42d",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stWalletTest/walletExecuteUnderDailyLimit.json b/GeneralStateTests/stWalletTest/walletExecuteUnderDailyLimit.json
index c408c5e31..9943b49fb 100644
--- a/GeneralStateTests/stWalletTest/walletExecuteUnderDailyLimit.json
+++ b/GeneralStateTests/stWalletTest/walletExecuteUnderDailyLimit.json
@@ -1,17 +1,17 @@
 {
     "walletExecuteUnderDailyLimit" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "0c610f77ce142f0eaf4e1d797b2b747c59bf319e28dc79af20dac4b69b5d5927",
+                    "hash" : "0x0c610f77ce142f0eaf4e1d797b2b747c59bf319e28dc79af20dac4b69b5d5927",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "689518c4f1ed3b9c2d585a105cd224aa01e5b951ec744d4fdb5d5b19ab6e8d63",
+                    "hash" : "0x689518c4f1ed3b9c2d585a105cd224aa01e5b951ec744d4fdb5d5b19ab6e8d63",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "34221d1e5aed8f56e27a05cc9f59135b04a8889f4c36e58df32027e4445c00ad",
+                    "hash" : "0x34221d1e5aed8f56e27a05cc9f59135b04a8889f4c36e58df32027e4445c00ad",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "34221d1e5aed8f56e27a05cc9f59135b04a8889f4c36e58df32027e4445c00ad",
+                    "hash" : "0x34221d1e5aed8f56e27a05cc9f59135b04a8889f4c36e58df32027e4445c00ad",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "689518c4f1ed3b9c2d585a105cd224aa01e5b951ec744d4fdb5d5b19ab6e8d63",
+                    "hash" : "0x689518c4f1ed3b9c2d585a105cd224aa01e5b951ec744d4fdb5d5b19ab6e8d63",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,14 +61,14 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75ef08f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "ec0e71ad0a90ffe1909d27dac207f7680abba42d" : {
+            "0xec0e71ad0a90ffe1909d27dac207f7680abba42d" : {
                 "balance" : "0x64",
                 "code" : "0x606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe",
                 "nonce" : "0x00",
@@ -87,14 +87,14 @@
                 "0xb61d27f6000000000000000000000000aaaf5374fce5edbc8e2a8697c15331677e6ebaaa00000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000060"
             ],
             "gasLimit" : [
-                "10000000"
+                "0x989680"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x01",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "ec0e71ad0a90ffe1909d27dac207f7680abba42d",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xec0e71ad0a90ffe1909d27dac207f7680abba42d",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stWalletTest/walletKill.json b/GeneralStateTests/stWalletTest/walletKill.json
index 15b1371ae..86e8331b1 100644
--- a/GeneralStateTests/stWalletTest/walletKill.json
+++ b/GeneralStateTests/stWalletTest/walletKill.json
@@ -1,17 +1,17 @@
 {
     "walletKill" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e19510e88eed6b272878d76ed78088a0e0a109f9a5af5700eb52f08546378de5",
+                    "hash" : "0xe19510e88eed6b272878d76ed78088a0e0a109f9a5af5700eb52f08546378de5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "464315f22436999a8774d41d9e577131c7ee0424b1a1aa021b0097cfd96cdc02",
+                    "hash" : "0x464315f22436999a8774d41d9e577131c7ee0424b1a1aa021b0097cfd96cdc02",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "643277f079b24449f5de421c86bbe3804c2dfedd8d50c874fc9acaf64b024182",
+                    "hash" : "0x643277f079b24449f5de421c86bbe3804c2dfedd8d50c874fc9acaf64b024182",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "643277f079b24449f5de421c86bbe3804c2dfedd8d50c874fc9acaf64b024182",
+                    "hash" : "0x643277f079b24449f5de421c86bbe3804c2dfedd8d50c874fc9acaf64b024182",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "464315f22436999a8774d41d9e577131c7ee0424b1a1aa021b0097cfd96cdc02",
+                    "hash" : "0x464315f22436999a8774d41d9e577131c7ee0424b1a1aa021b0097cfd96cdc02",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,14 +61,14 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75ef08f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "ec0e71ad0a90ffe1909d27dac207f7680abba42d" : {
+            "0xec0e71ad0a90ffe1909d27dac207f7680abba42d" : {
                 "balance" : "0x64",
                 "code" : "0x606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe",
                 "nonce" : "0x00",
@@ -86,14 +86,14 @@
                 "0xcbf0b0c0000000000000000000000000a94f5374fce5edbc8e2a8697c15331677e6ebf0b"
             ],
             "gasLimit" : [
-                "10000000"
+                "0x989680"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x01",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "ec0e71ad0a90ffe1909d27dac207f7680abba42d",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xec0e71ad0a90ffe1909d27dac207f7680abba42d",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stWalletTest/walletKillNotByOwner.json b/GeneralStateTests/stWalletTest/walletKillNotByOwner.json
index f013bb361..bbb4563d3 100644
--- a/GeneralStateTests/stWalletTest/walletKillNotByOwner.json
+++ b/GeneralStateTests/stWalletTest/walletKillNotByOwner.json
@@ -1,17 +1,17 @@
 {
     "walletKillNotByOwner" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d41e7b0dc1039a6838820818d456d9e63ec1fe11d97f5b5bb59e51e1ededa22b",
+                    "hash" : "0xd41e7b0dc1039a6838820818d456d9e63ec1fe11d97f5b5bb59e51e1ededa22b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "4f551222d047d6b7a8765fc08ab6a88517d721607987744a9183e55c45029c5a",
+                    "hash" : "0x4f551222d047d6b7a8765fc08ab6a88517d721607987744a9183e55c45029c5a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5c1ee1546c12ccaec136dd49ccedb05aec712596fb162ae68fc811c65dbcf728",
+                    "hash" : "0x5c1ee1546c12ccaec136dd49ccedb05aec712596fb162ae68fc811c65dbcf728",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5c1ee1546c12ccaec136dd49ccedb05aec712596fb162ae68fc811c65dbcf728",
+                    "hash" : "0x5c1ee1546c12ccaec136dd49ccedb05aec712596fb162ae68fc811c65dbcf728",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "4f551222d047d6b7a8765fc08ab6a88517d721607987744a9183e55c45029c5a",
+                    "hash" : "0x4f551222d047d6b7a8765fc08ab6a88517d721607987744a9183e55c45029c5a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4" : {
+            "0x3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4" : {
                 "balance" : "0x0de0b6b3a75ef08f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75ef08f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "ec0e71ad0a90ffe1909d27dac207f7680abba42d" : {
+            "0xec0e71ad0a90ffe1909d27dac207f7680abba42d" : {
                 "balance" : "0x64",
                 "code" : "0x606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe",
                 "nonce" : "0x00",
@@ -93,14 +93,14 @@
                 "0xcbf0b0c0000000000000000000000000aaaf5374fce5edbc8e2a8697c15331677e6ebaaa"
             ],
             "gasLimit" : [
-                "10000000"
+                "0x989680"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x01",
-            "secretKey" : "a95defe70ebea7804f9c3be42d20d24375e2a92b9d9666b832069c5f3cd423dd",
-            "to" : "ec0e71ad0a90ffe1909d27dac207f7680abba42d",
+            "secretKey" : "0xa95defe70ebea7804f9c3be42d20d24375e2a92b9d9666b832069c5f3cd423dd",
+            "to" : "0xec0e71ad0a90ffe1909d27dac207f7680abba42d",
             "value" : [
-                "100"
+                "0x64"
             ]
         }
     }
diff --git a/GeneralStateTests/stWalletTest/walletKillToWallet.json b/GeneralStateTests/stWalletTest/walletKillToWallet.json
index a551d6d5c..32c05cbc1 100644
--- a/GeneralStateTests/stWalletTest/walletKillToWallet.json
+++ b/GeneralStateTests/stWalletTest/walletKillToWallet.json
@@ -1,17 +1,17 @@
 {
     "walletKillToWallet" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7fb2b50700b86b0902528b7f8532fb33a3e4b57e0aa686c9ad32bb54492275bc",
+                    "hash" : "0x7fb2b50700b86b0902528b7f8532fb33a3e4b57e0aa686c9ad32bb54492275bc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "90380da4746fbe31e21ac989ec926f1508f96ae3adf04c225af816fc95f1b07d",
+                    "hash" : "0x90380da4746fbe31e21ac989ec926f1508f96ae3adf04c225af816fc95f1b07d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "1064d7bc4ba273295cd7b34976d0fb20c8fdc1e198bde003ea11616894526243",
+                    "hash" : "0x1064d7bc4ba273295cd7b34976d0fb20c8fdc1e198bde003ea11616894526243",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "1064d7bc4ba273295cd7b34976d0fb20c8fdc1e198bde003ea11616894526243",
+                    "hash" : "0x1064d7bc4ba273295cd7b34976d0fb20c8fdc1e198bde003ea11616894526243",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "90380da4746fbe31e21ac989ec926f1508f96ae3adf04c225af816fc95f1b07d",
+                    "hash" : "0x90380da4746fbe31e21ac989ec926f1508f96ae3adf04c225af816fc95f1b07d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,14 +61,14 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75ef08f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "ec0e71ad0a90ffe1909d27dac207f7680abba42d" : {
+            "0xec0e71ad0a90ffe1909d27dac207f7680abba42d" : {
                 "balance" : "0x64",
                 "code" : "0x606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe",
                 "nonce" : "0x00",
@@ -86,14 +86,14 @@
                 "0xcbf0b0c0000000000000000000000000ec0e71ad0a90ffe1909d27dac207f7680abba42d"
             ],
             "gasLimit" : [
-                "10000000"
+                "0x989680"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x01",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "ec0e71ad0a90ffe1909d27dac207f7680abba42d",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xec0e71ad0a90ffe1909d27dac207f7680abba42d",
             "value" : [
-                "100"
+                "0x64"
             ]
         }
     }
diff --git a/GeneralStateTests/stWalletTest/walletRemoveOwnerRemovePendingTransaction.json b/GeneralStateTests/stWalletTest/walletRemoveOwnerRemovePendingTransaction.json
index 865b7b965..f99f6819b 100644
--- a/GeneralStateTests/stWalletTest/walletRemoveOwnerRemovePendingTransaction.json
+++ b/GeneralStateTests/stWalletTest/walletRemoveOwnerRemovePendingTransaction.json
@@ -1,17 +1,17 @@
 {
     "walletRemoveOwnerRemovePendingTransaction" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "08dc2f434c12e5a7f22af2849eb01339216e01e4fd0c194a759a3d7dab122265",
+                    "hash" : "0x08dc2f434c12e5a7f22af2849eb01339216e01e4fd0c194a759a3d7dab122265",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d1f22189317089339421e4f708541e7f8c465614f3f76ad96923bad6ca5ee99b",
+                    "hash" : "0xd1f22189317089339421e4f708541e7f8c465614f3f76ad96923bad6ca5ee99b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a588fafdd0d941311a310b96122773d21f666cd405c5f364febe26599e0f3f2e",
+                    "hash" : "0xa588fafdd0d941311a310b96122773d21f666cd405c5f364febe26599e0f3f2e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a588fafdd0d941311a310b96122773d21f666cd405c5f364febe26599e0f3f2e",
+                    "hash" : "0xa588fafdd0d941311a310b96122773d21f666cd405c5f364febe26599e0f3f2e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d1f22189317089339421e4f708541e7f8c465614f3f76ad96923bad6ca5ee99b",
+                    "hash" : "0xd1f22189317089339421e4f708541e7f8c465614f3f76ad96923bad6ca5ee99b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4" : {
+            "0x3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4" : {
                 "balance" : "0x5af3107a4000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a75ef08f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "ec0e71ad0a90ffe1909d27dac207f7680abba42d" : {
+            "0xec0e71ad0a90ffe1909d27dac207f7680abba42d" : {
                 "balance" : "0x64",
                 "code" : "0x606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe",
                 "nonce" : "0x00",
@@ -101,14 +101,14 @@
                 "0x173825d9000000000000000000000000a94f5374fce5edbc8e2a8697c15331677e6ebf0b"
             ],
             "gasLimit" : [
-                "10000000"
+                "0x989680"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "a95defe70ebea7804f9c3be42d20d24375e2a92b9d9666b832069c5f3cd423dd",
-            "to" : "ec0e71ad0a90ffe1909d27dac207f7680abba42d",
+            "secretKey" : "0xa95defe70ebea7804f9c3be42d20d24375e2a92b9d9666b832069c5f3cd423dd",
+            "to" : "0xec0e71ad0a90ffe1909d27dac207f7680abba42d",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
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"
             ]
         }
     }
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_CALL.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_CALL.json
index 2141d8398..3b1422cff 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_CALL.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_CALL.json
@@ -1,17 +1,17 @@
 {
     "ZeroValue_CALL" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "dfacd1d7556cf17b7c9375eea01cac37b8b207ab4b246db055b6347cf856419d",
+                    "hash" : "0xdfacd1d7556cf17b7c9375eea01cac37b8b207ab4b246db055b6347cf856419d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b808ff569ab264aa525f0c349cb50074245f20286d9bb7d6180b2304008e96df",
+                    "hash" : "0xb808ff569ab264aa525f0c349cb50074245f20286d9bb7d6180b2304008e96df",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "61f7fa4930e73b4e1f5423909928473dec0f0d70875373680109967f15b52303",
+                    "hash" : "0x61f7fa4930e73b4e1f5423909928473dec0f0d70875373680109967f15b52303",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "61f7fa4930e73b4e1f5423909928473dec0f0d70875373680109967f15b52303",
+                    "hash" : "0x61f7fa4930e73b4e1f5423909928473dec0f0d70875373680109967f15b52303",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b808ff569ab264aa525f0c349cb50074245f20286d9bb7d6180b2304008e96df",
+                    "hash" : "0xb808ff569ab264aa525f0c349cb50074245f20286d9bb7d6180b2304008e96df",
                     "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" : "0x5a6000556000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f16001555a606455",
                 "nonce" : "0x00",
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_CALLCODE.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_CALLCODE.json
index 426a36b6f..60693fe11 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_CALLCODE.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_CALLCODE.json
@@ -1,17 +1,17 @@
 {
     "ZeroValue_CALLCODE" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1531bd9ebfed425c01ab97871c2f5415683b614160c0de07e95ca46a3f8222e3",
+                    "hash" : "0x1531bd9ebfed425c01ab97871c2f5415683b614160c0de07e95ca46a3f8222e3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "1531bd9ebfed425c01ab97871c2f5415683b614160c0de07e95ca46a3f8222e3",
+                    "hash" : "0x1531bd9ebfed425c01ab97871c2f5415683b614160c0de07e95ca46a3f8222e3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "0a4c2fa1b508e3612c10290e2b44da1d0600ea0e820312e1115ba01752768e30",
+                    "hash" : "0x0a4c2fa1b508e3612c10290e2b44da1d0600ea0e820312e1115ba01752768e30",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "0a4c2fa1b508e3612c10290e2b44da1d0600ea0e820312e1115ba01752768e30",
+                    "hash" : "0x0a4c2fa1b508e3612c10290e2b44da1d0600ea0e820312e1115ba01752768e30",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "1531bd9ebfed425c01ab97871c2f5415683b614160c0de07e95ca46a3f8222e3",
+                    "hash" : "0x1531bd9ebfed425c01ab97871c2f5415683b614160c0de07e95ca46a3f8222e3",
                     "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" : "0x5a6000556000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455",
                 "nonce" : "0x00",
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_CALLCODE_ToEmpty.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_CALLCODE_ToEmpty.json
index 0506a820a..b10072773 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_CALLCODE_ToEmpty.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_CALLCODE_ToEmpty.json
@@ -1,17 +1,17 @@
 {
     "ZeroValue_CALLCODE_ToEmpty" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1c57ca04dea8d4f09c81c54593838c45cf059d13dcfb9f9d70dca2bc1ad285e9",
+                    "hash" : "0x1c57ca04dea8d4f09c81c54593838c45cf059d13dcfb9f9d70dca2bc1ad285e9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "1c57ca04dea8d4f09c81c54593838c45cf059d13dcfb9f9d70dca2bc1ad285e9",
+                    "hash" : "0x1c57ca04dea8d4f09c81c54593838c45cf059d13dcfb9f9d70dca2bc1ad285e9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "fa0fd787f0cc5744ae24855e4b55d9c814880b4e0b319adf5bd143b769fd2759",
+                    "hash" : "0xfa0fd787f0cc5744ae24855e4b55d9c814880b4e0b319adf5bd143b769fd2759",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "fa0fd787f0cc5744ae24855e4b55d9c814880b4e0b319adf5bd143b769fd2759",
+                    "hash" : "0xfa0fd787f0cc5744ae24855e4b55d9c814880b4e0b319adf5bd143b769fd2759",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "1c57ca04dea8d4f09c81c54593838c45cf059d13dcfb9f9d70dca2bc1ad285e9",
+                    "hash" : "0x1c57ca04dea8d4f09c81c54593838c45cf059d13dcfb9f9d70dca2bc1ad285e9",
                     "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" : "0x5a6000556000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_CALLCODE_ToNonZeroBalance.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_CALLCODE_ToNonZeroBalance.json
index 08286cbe1..072796713 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_CALLCODE_ToNonZeroBalance.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_CALLCODE_ToNonZeroBalance.json
@@ -1,17 +1,17 @@
 {
     "ZeroValue_CALLCODE_ToNonZeroBalance" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "163b02c31b242f2b5281a276f808990f7004c5b50d017838b51d26895d496742",
+                    "hash" : "0x163b02c31b242f2b5281a276f808990f7004c5b50d017838b51d26895d496742",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "163b02c31b242f2b5281a276f808990f7004c5b50d017838b51d26895d496742",
+                    "hash" : "0x163b02c31b242f2b5281a276f808990f7004c5b50d017838b51d26895d496742",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f206b067c1e166803ecb77d2ed7cfc21ce5a38121c1e50df7123dd3df120e0a7",
+                    "hash" : "0xf206b067c1e166803ecb77d2ed7cfc21ce5a38121c1e50df7123dd3df120e0a7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f206b067c1e166803ecb77d2ed7cfc21ce5a38121c1e50df7123dd3df120e0a7",
+                    "hash" : "0xf206b067c1e166803ecb77d2ed7cfc21ce5a38121c1e50df7123dd3df120e0a7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "163b02c31b242f2b5281a276f808990f7004c5b50d017838b51d26895d496742",
+                    "hash" : "0x163b02c31b242f2b5281a276f808990f7004c5b50d017838b51d26895d496742",
                     "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" : "0x5a6000556000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_CALLCODE_ToOneStorageKey.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_CALLCODE_ToOneStorageKey.json
index 55acaf4fa..8608cad28 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_CALLCODE_ToOneStorageKey.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_CALLCODE_ToOneStorageKey.json
@@ -1,17 +1,17 @@
 {
     "ZeroValue_CALLCODE_ToOneStorageKey" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c06118bf09f1b8f7cff1c7640ddee0147caa17c484d6b0c1b94a96f39034b38e",
+                    "hash" : "0xc06118bf09f1b8f7cff1c7640ddee0147caa17c484d6b0c1b94a96f39034b38e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c06118bf09f1b8f7cff1c7640ddee0147caa17c484d6b0c1b94a96f39034b38e",
+                    "hash" : "0xc06118bf09f1b8f7cff1c7640ddee0147caa17c484d6b0c1b94a96f39034b38e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "009c8b80e40f842626dcf0b4d7a05bd54a039f3e21c50a05edea2144d30169cb",
+                    "hash" : "0x009c8b80e40f842626dcf0b4d7a05bd54a039f3e21c50a05edea2144d30169cb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "009c8b80e40f842626dcf0b4d7a05bd54a039f3e21c50a05edea2144d30169cb",
+                    "hash" : "0x009c8b80e40f842626dcf0b4d7a05bd54a039f3e21c50a05edea2144d30169cb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c06118bf09f1b8f7cff1c7640ddee0147caa17c484d6b0c1b94a96f39034b38e",
+                    "hash" : "0xc06118bf09f1b8f7cff1c7640ddee0147caa17c484d6b0c1b94a96f39034b38e",
                     "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" : "0x5a6000556000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -89,14 +89,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_CALL_ToEmpty.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_CALL_ToEmpty.json
index a86a00b5d..5faaf1f0c 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_CALL_ToEmpty.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_CALL_ToEmpty.json
@@ -1,17 +1,17 @@
 {
     "ZeroValue_CALL_ToEmpty" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1e91deccdb8f3af8f85ed11bc5cf3f2deea60b114a04a0bd34829e26da45eece",
+                    "hash" : "0x1e91deccdb8f3af8f85ed11bc5cf3f2deea60b114a04a0bd34829e26da45eece",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b808ff569ab264aa525f0c349cb50074245f20286d9bb7d6180b2304008e96df",
+                    "hash" : "0xb808ff569ab264aa525f0c349cb50074245f20286d9bb7d6180b2304008e96df",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f6a72a25e46d8dc29d154d9beb4546d71235a5c4a088d26ef0f2b5c703dd9e57",
+                    "hash" : "0xf6a72a25e46d8dc29d154d9beb4546d71235a5c4a088d26ef0f2b5c703dd9e57",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f6a72a25e46d8dc29d154d9beb4546d71235a5c4a088d26ef0f2b5c703dd9e57",
+                    "hash" : "0xf6a72a25e46d8dc29d154d9beb4546d71235a5c4a088d26ef0f2b5c703dd9e57",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b808ff569ab264aa525f0c349cb50074245f20286d9bb7d6180b2304008e96df",
+                    "hash" : "0xb808ff569ab264aa525f0c349cb50074245f20286d9bb7d6180b2304008e96df",
                     "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" : "0x5a6000556000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f16001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_CALL_ToNonZeroBalance.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_CALL_ToNonZeroBalance.json
index 65576792a..2f6cfce54 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_CALL_ToNonZeroBalance.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_CALL_ToNonZeroBalance.json
@@ -1,17 +1,17 @@
 {
     "ZeroValue_CALL_ToNonZeroBalance" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "ffc52cb4d510f33372bc113a57c816df81c51806dd9e65cc221fca292a5ec0c2",
+                    "hash" : "0xffc52cb4d510f33372bc113a57c816df81c51806dd9e65cc221fca292a5ec0c2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "ffc52cb4d510f33372bc113a57c816df81c51806dd9e65cc221fca292a5ec0c2",
+                    "hash" : "0xffc52cb4d510f33372bc113a57c816df81c51806dd9e65cc221fca292a5ec0c2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "65c98cc8bec8d2874e5cfbdc4d945214f7d47ab09442a3938f8270b478102182",
+                    "hash" : "0x65c98cc8bec8d2874e5cfbdc4d945214f7d47ab09442a3938f8270b478102182",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "65c98cc8bec8d2874e5cfbdc4d945214f7d47ab09442a3938f8270b478102182",
+                    "hash" : "0x65c98cc8bec8d2874e5cfbdc4d945214f7d47ab09442a3938f8270b478102182",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "ffc52cb4d510f33372bc113a57c816df81c51806dd9e65cc221fca292a5ec0c2",
+                    "hash" : "0xffc52cb4d510f33372bc113a57c816df81c51806dd9e65cc221fca292a5ec0c2",
                     "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" : "0x5a6000556000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f16001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_CALL_ToOneStorageKey.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_CALL_ToOneStorageKey.json
index 0352e39a7..b714026ae 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_CALL_ToOneStorageKey.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_CALL_ToOneStorageKey.json
@@ -1,17 +1,17 @@
 {
     "ZeroValue_CALL_ToOneStorageKey" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "01395d03b9f31ec90c2d7d4a100b2e947d06276261708ce7a935b6fd1307743b",
+                    "hash" : "0x01395d03b9f31ec90c2d7d4a100b2e947d06276261708ce7a935b6fd1307743b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b808ff569ab264aa525f0c349cb50074245f20286d9bb7d6180b2304008e96df",
+                    "hash" : "0xb808ff569ab264aa525f0c349cb50074245f20286d9bb7d6180b2304008e96df",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "71736a4f0de8af6d14f42ccca3faff1536604a48ca3e97376f9962f0344e0e85",
+                    "hash" : "0x71736a4f0de8af6d14f42ccca3faff1536604a48ca3e97376f9962f0344e0e85",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "71736a4f0de8af6d14f42ccca3faff1536604a48ca3e97376f9962f0344e0e85",
+                    "hash" : "0x71736a4f0de8af6d14f42ccca3faff1536604a48ca3e97376f9962f0344e0e85",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b808ff569ab264aa525f0c349cb50074245f20286d9bb7d6180b2304008e96df",
+                    "hash" : "0xb808ff569ab264aa525f0c349cb50074245f20286d9bb7d6180b2304008e96df",
                     "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" : "0x5a6000556000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f16001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -89,14 +89,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_DELEGATECALL.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_DELEGATECALL.json
index 27a83d680..08a8f3fb6 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_DELEGATECALL.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_DELEGATECALL.json
@@ -1,17 +1,17 @@
 {
     "ZeroValue_DELEGATECALL" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "fc6b89839d9f355e819b53cb0a689c082319d3a1209e9beb0a34ff30af987600",
+                    "hash" : "0xfc6b89839d9f355e819b53cb0a689c082319d3a1209e9beb0a34ff30af987600",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "fc6b89839d9f355e819b53cb0a689c082319d3a1209e9beb0a34ff30af987600",
+                    "hash" : "0xfc6b89839d9f355e819b53cb0a689c082319d3a1209e9beb0a34ff30af987600",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5499d1bed1bcab78441cfb64cc6918016069aa1de79479a11113e98d9cde7fa9",
+                    "hash" : "0x5499d1bed1bcab78441cfb64cc6918016069aa1de79479a11113e98d9cde7fa9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "521bc80cdaf4081a8429a79e37d0bc6528f0fac7c0ac195da4a1dbd41cd1abb8",
+                    "hash" : "0x521bc80cdaf4081a8429a79e37d0bc6528f0fac7c0ac195da4a1dbd41cd1abb8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "fc6b89839d9f355e819b53cb0a689c082319d3a1209e9beb0a34ff30af987600",
+                    "hash" : "0xfc6b89839d9f355e819b53cb0a689c082319d3a1209e9beb0a34ff30af987600",
                     "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" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455",
                 "nonce" : "0x00",
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_DELEGATECALL_ToEmpty.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_DELEGATECALL_ToEmpty.json
index 05181cb1c..e130aed25 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_DELEGATECALL_ToEmpty.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_DELEGATECALL_ToEmpty.json
@@ -1,17 +1,17 @@
 {
     "ZeroValue_DELEGATECALL_ToEmpty" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "55b364749bffbe4de6de27bd1befab41b9afbe7513c559b376a03a27cb0af916",
+                    "hash" : "0x55b364749bffbe4de6de27bd1befab41b9afbe7513c559b376a03a27cb0af916",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "55b364749bffbe4de6de27bd1befab41b9afbe7513c559b376a03a27cb0af916",
+                    "hash" : "0x55b364749bffbe4de6de27bd1befab41b9afbe7513c559b376a03a27cb0af916",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2679e492e89edbb16b20be31663b8d783e92a85db08be2e2fcddfe0beb6ba088",
+                    "hash" : "0x2679e492e89edbb16b20be31663b8d783e92a85db08be2e2fcddfe0beb6ba088",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "dd53adf5f25628ca817be7df8e5a57b5446689ed145a4ac46abf3a45013fe2af",
+                    "hash" : "0xdd53adf5f25628ca817be7df8e5a57b5446689ed145a4ac46abf3a45013fe2af",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "55b364749bffbe4de6de27bd1befab41b9afbe7513c559b376a03a27cb0af916",
+                    "hash" : "0x55b364749bffbe4de6de27bd1befab41b9afbe7513c559b376a03a27cb0af916",
                     "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" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_DELEGATECALL_ToNonZeroBalance.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_DELEGATECALL_ToNonZeroBalance.json
index 10192b257..987badbeb 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_DELEGATECALL_ToNonZeroBalance.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_DELEGATECALL_ToNonZeroBalance.json
@@ -1,17 +1,17 @@
 {
     "ZeroValue_DELEGATECALL_ToNonZeroBalance" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a0ffd8374aa4f0219c79796004e4d128297c960bee088d569ee4fd59303e5bb3",
+                    "hash" : "0xa0ffd8374aa4f0219c79796004e4d128297c960bee088d569ee4fd59303e5bb3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a0ffd8374aa4f0219c79796004e4d128297c960bee088d569ee4fd59303e5bb3",
+                    "hash" : "0xa0ffd8374aa4f0219c79796004e4d128297c960bee088d569ee4fd59303e5bb3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "490c7a4c7f7de525caa617975740e598c8b5d67fdf0b1299a85cbabd29b42d0a",
+                    "hash" : "0x490c7a4c7f7de525caa617975740e598c8b5d67fdf0b1299a85cbabd29b42d0a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f5814da69510fc59eb19ff9a78e870ed05d7e529ac9ccbe17a7a46db4e4369a0",
+                    "hash" : "0xf5814da69510fc59eb19ff9a78e870ed05d7e529ac9ccbe17a7a46db4e4369a0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a0ffd8374aa4f0219c79796004e4d128297c960bee088d569ee4fd59303e5bb3",
+                    "hash" : "0xa0ffd8374aa4f0219c79796004e4d128297c960bee088d569ee4fd59303e5bb3",
                     "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" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_DELEGATECALL_ToOneStorageKey.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_DELEGATECALL_ToOneStorageKey.json
index 6aabb2132..f7011ad6b 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_DELEGATECALL_ToOneStorageKey.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_DELEGATECALL_ToOneStorageKey.json
@@ -1,17 +1,17 @@
 {
     "ZeroValue_DELEGATECALL_ToOneStorageKey" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f17cfda7d19e3648d3bd315a3e888f89f7002b6413cc8dd4de6e433612d6d0d2",
+                    "hash" : "0xf17cfda7d19e3648d3bd315a3e888f89f7002b6413cc8dd4de6e433612d6d0d2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f17cfda7d19e3648d3bd315a3e888f89f7002b6413cc8dd4de6e433612d6d0d2",
+                    "hash" : "0xf17cfda7d19e3648d3bd315a3e888f89f7002b6413cc8dd4de6e433612d6d0d2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b910ee1c13f68cb2c31ebf954a3682dacc4b2bc55eb576f6c42f44d9853d7e80",
+                    "hash" : "0xb910ee1c13f68cb2c31ebf954a3682dacc4b2bc55eb576f6c42f44d9853d7e80",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6baf84679c6338c00371b0e3246c4feaf08e07db41e1e0d191069ae5611645e5",
+                    "hash" : "0x6baf84679c6338c00371b0e3246c4feaf08e07db41e1e0d191069ae5611645e5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f17cfda7d19e3648d3bd315a3e888f89f7002b6413cc8dd4de6e433612d6d0d2",
+                    "hash" : "0xf17cfda7d19e3648d3bd315a3e888f89f7002b6413cc8dd4de6e433612d6d0d2",
                     "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" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f46001555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -89,14 +89,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE.json
index a92c2f0e7..77bad3e7c 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE.json
@@ -1,17 +1,17 @@
 {
-    "ZeroValue_SUICIDE" : {
+    "ZeroValue_SELFDESTRUCT" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "38f336065869eadc6334a266aa91a7a00f90e339c44cdd6c1f91b1a1eefb39e3",
+                    "hash" : "0x38f336065869eadc6334a266aa91a7a00f90e339c44cdd6c1f91b1a1eefb39e3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "19073b15de72bfe440d768fa8b5b8dbcb1396e79414580eae82b8dc88b7dc7c7",
+                    "hash" : "0x19073b15de72bfe440d768fa8b5b8dbcb1396e79414580eae82b8dc88b7dc7c7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "538fd2955fc945ed3aee393e714e9e9e7bb829abc6faa1ba1faff59e2692d2f3",
+                    "hash" : "0x538fd2955fc945ed3aee393e714e9e9e7bb829abc6faa1ba1faff59e2692d2f3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "538fd2955fc945ed3aee393e714e9e9e7bb829abc6faa1ba1faff59e2692d2f3",
+                    "hash" : "0x538fd2955fc945ed3aee393e714e9e9e7bb829abc6faa1ba1faff59e2692d2f3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "19073b15de72bfe440d768fa8b5b8dbcb1396e79414580eae82b8dc88b7dc7c7",
+                    "hash" : "0x19073b15de72bfe440d768fa8b5b8dbcb1396e79414580eae82b8dc88b7dc7c7",
                     "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" : "0x73c94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
                 "nonce" : "0x00",
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE_ToEmpty.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE_ToEmpty.json
index 5ba830169..6c7233e18 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE_ToEmpty.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE_ToEmpty.json
@@ -1,17 +1,17 @@
 {
-    "ZeroValue_SUICIDE_ToEmpty" : {
+    "ZeroValue_SELFDESTRUCT_ToEmpty" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "aebf7d55408775cbde696a6532f08e2563f6c92e233df623981a9633a8dfd44a",
+                    "hash" : "0xaebf7d55408775cbde696a6532f08e2563f6c92e233df623981a9633a8dfd44a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "19073b15de72bfe440d768fa8b5b8dbcb1396e79414580eae82b8dc88b7dc7c7",
+                    "hash" : "0x19073b15de72bfe440d768fa8b5b8dbcb1396e79414580eae82b8dc88b7dc7c7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "538fd2955fc945ed3aee393e714e9e9e7bb829abc6faa1ba1faff59e2692d2f3",
+                    "hash" : "0x538fd2955fc945ed3aee393e714e9e9e7bb829abc6faa1ba1faff59e2692d2f3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "538fd2955fc945ed3aee393e714e9e9e7bb829abc6faa1ba1faff59e2692d2f3",
+                    "hash" : "0x538fd2955fc945ed3aee393e714e9e9e7bb829abc6faa1ba1faff59e2692d2f3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "19073b15de72bfe440d768fa8b5b8dbcb1396e79414580eae82b8dc88b7dc7c7",
+                    "hash" : "0x19073b15de72bfe440d768fa8b5b8dbcb1396e79414580eae82b8dc88b7dc7c7",
                     "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" : "0x73c94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE_ToNonZeroBalance.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE_ToNonZeroBalance.json
index f9d68b0a6..1f643d07f 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE_ToNonZeroBalance.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE_ToNonZeroBalance.json
@@ -1,17 +1,17 @@
 {
-    "ZeroValue_SUICIDE_ToNonZeroBalance" : {
+    "ZeroValue_SELFDESTRUCT_ToNonZeroBalance" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a244bf2d8d80e6f9ae1907c208d9b0fa44ff56e067b68390aa23e2cf9fb41b92",
+                    "hash" : "0xa244bf2d8d80e6f9ae1907c208d9b0fa44ff56e067b68390aa23e2cf9fb41b92",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a244bf2d8d80e6f9ae1907c208d9b0fa44ff56e067b68390aa23e2cf9fb41b92",
+                    "hash" : "0xa244bf2d8d80e6f9ae1907c208d9b0fa44ff56e067b68390aa23e2cf9fb41b92",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "36edb47a1f2f613fe89c9b8f565b07f95d808bcaf466512c5aa796cc9e195166",
+                    "hash" : "0x36edb47a1f2f613fe89c9b8f565b07f95d808bcaf466512c5aa796cc9e195166",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "36edb47a1f2f613fe89c9b8f565b07f95d808bcaf466512c5aa796cc9e195166",
+                    "hash" : "0x36edb47a1f2f613fe89c9b8f565b07f95d808bcaf466512c5aa796cc9e195166",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a244bf2d8d80e6f9ae1907c208d9b0fa44ff56e067b68390aa23e2cf9fb41b92",
+                    "hash" : "0xa244bf2d8d80e6f9ae1907c208d9b0fa44ff56e067b68390aa23e2cf9fb41b92",
                     "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" : "0x73c94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE_ToOneStorageKey.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE_ToOneStorageKey.json
index 153a36a3e..10f6be93f 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE_ToOneStorageKey.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE_ToOneStorageKey.json
@@ -1,17 +1,17 @@
 {
-    "ZeroValue_SUICIDE_ToOneStorageKey" : {
+    "ZeroValue_SELFDESTRUCT_ToOneStorageKey" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "78353ce80f19042d29504768c99fd8698ed4c336428c38589611245af4858cef",
+                    "hash" : "0x78353ce80f19042d29504768c99fd8698ed4c336428c38589611245af4858cef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "19073b15de72bfe440d768fa8b5b8dbcb1396e79414580eae82b8dc88b7dc7c7",
+                    "hash" : "0x19073b15de72bfe440d768fa8b5b8dbcb1396e79414580eae82b8dc88b7dc7c7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "7b1fa134637ab17a607e811c226549ee1d5d95f4a29cd09828821dd009c895ca",
+                    "hash" : "0x7b1fa134637ab17a607e811c226549ee1d5d95f4a29cd09828821dd009c895ca",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "7b1fa134637ab17a607e811c226549ee1d5d95f4a29cd09828821dd009c895ca",
+                    "hash" : "0x7b1fa134637ab17a607e811c226549ee1d5d95f4a29cd09828821dd009c895ca",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "19073b15de72bfe440d768fa8b5b8dbcb1396e79414580eae82b8dc88b7dc7c7",
+                    "hash" : "0x19073b15de72bfe440d768fa8b5b8dbcb1396e79414580eae82b8dc88b7dc7c7",
                     "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" : "0x73c94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
                 "nonce" : "0x00",
@@ -76,9 +76,9 @@
                     "0x00" : "0x01"
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -90,14 +90,14 @@
                 ""
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALL.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALL.json
index e7f885a08..586c49ccb 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALL.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALL.json
@@ -1,17 +1,17 @@
 {
     "ZeroValue_TransactionCALL" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "0436e8afb8caf453484516db354270cf53a5ad1f669b249dad4985f25892fa8c",
+                    "hash" : "0x0436e8afb8caf453484516db354270cf53a5ad1f669b249dad4985f25892fa8c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f886f738424bc64f81fa276afb6217080d775bfcbb8c51348287ab4674f282a9",
+                    "hash" : "0xf886f738424bc64f81fa276afb6217080d775bfcbb8c51348287ab4674f282a9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "0436e8afb8caf453484516db354270cf53a5ad1f669b249dad4985f25892fa8c",
+                    "hash" : "0x0436e8afb8caf453484516db354270cf53a5ad1f669b249dad4985f25892fa8c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "0436e8afb8caf453484516db354270cf53a5ad1f669b249dad4985f25892fa8c",
+                    "hash" : "0x0436e8afb8caf453484516db354270cf53a5ad1f669b249dad4985f25892fa8c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f886f738424bc64f81fa276afb6217080d775bfcbb8c51348287ab4674f282a9",
+                    "hash" : "0xf886f738424bc64f81fa276afb6217080d775bfcbb8c51348287ab4674f282a9",
                     "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" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALL_ToEmpty.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALL_ToEmpty.json
index f45b4f3c0..365fb8c11 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALL_ToEmpty.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALL_ToEmpty.json
@@ -1,17 +1,17 @@
 {
     "ZeroValue_TransactionCALL_ToEmpty" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "0436e8afb8caf453484516db354270cf53a5ad1f669b249dad4985f25892fa8c",
+                    "hash" : "0x0436e8afb8caf453484516db354270cf53a5ad1f669b249dad4985f25892fa8c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f886f738424bc64f81fa276afb6217080d775bfcbb8c51348287ab4674f282a9",
+                    "hash" : "0xf886f738424bc64f81fa276afb6217080d775bfcbb8c51348287ab4674f282a9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "0436e8afb8caf453484516db354270cf53a5ad1f669b249dad4985f25892fa8c",
+                    "hash" : "0x0436e8afb8caf453484516db354270cf53a5ad1f669b249dad4985f25892fa8c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "0436e8afb8caf453484516db354270cf53a5ad1f669b249dad4985f25892fa8c",
+                    "hash" : "0x0436e8afb8caf453484516db354270cf53a5ad1f669b249dad4985f25892fa8c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f886f738424bc64f81fa276afb6217080d775bfcbb8c51348287ab4674f282a9",
+                    "hash" : "0xf886f738424bc64f81fa276afb6217080d775bfcbb8c51348287ab4674f282a9",
                     "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" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALL_ToNonZeroBalance.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALL_ToNonZeroBalance.json
index 6595c9ca9..bf036f335 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALL_ToNonZeroBalance.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALL_ToNonZeroBalance.json
@@ -1,17 +1,17 @@
 {
     "ZeroValue_TransactionCALL_ToNonZeroBalance" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1ce545b3c5dab0c09d9c0ccda36f0216b629631696c3ae27565311ab587d0189",
+                    "hash" : "0x1ce545b3c5dab0c09d9c0ccda36f0216b629631696c3ae27565311ab587d0189",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "1ce545b3c5dab0c09d9c0ccda36f0216b629631696c3ae27565311ab587d0189",
+                    "hash" : "0x1ce545b3c5dab0c09d9c0ccda36f0216b629631696c3ae27565311ab587d0189",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "1ce545b3c5dab0c09d9c0ccda36f0216b629631696c3ae27565311ab587d0189",
+                    "hash" : "0x1ce545b3c5dab0c09d9c0ccda36f0216b629631696c3ae27565311ab587d0189",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "1ce545b3c5dab0c09d9c0ccda36f0216b629631696c3ae27565311ab587d0189",
+                    "hash" : "0x1ce545b3c5dab0c09d9c0ccda36f0216b629631696c3ae27565311ab587d0189",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "1ce545b3c5dab0c09d9c0ccda36f0216b629631696c3ae27565311ab587d0189",
+                    "hash" : "0x1ce545b3c5dab0c09d9c0ccda36f0216b629631696c3ae27565311ab587d0189",
                     "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" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALL_ToOneStorageKey.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALL_ToOneStorageKey.json
index ba04f3e25..9ed14f77b 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALL_ToOneStorageKey.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALL_ToOneStorageKey.json
@@ -1,17 +1,17 @@
 {
     "ZeroValue_TransactionCALL_ToOneStorageKey" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9b25ff6ca484aa1f69fcf6b6b5683c856b6f79c34b8d807abdd0a5c37546cef8",
+                    "hash" : "0x9b25ff6ca484aa1f69fcf6b6b5683c856b6f79c34b8d807abdd0a5c37546cef8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f886f738424bc64f81fa276afb6217080d775bfcbb8c51348287ab4674f282a9",
+                    "hash" : "0xf886f738424bc64f81fa276afb6217080d775bfcbb8c51348287ab4674f282a9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9b25ff6ca484aa1f69fcf6b6b5683c856b6f79c34b8d807abdd0a5c37546cef8",
+                    "hash" : "0x9b25ff6ca484aa1f69fcf6b6b5683c856b6f79c34b8d807abdd0a5c37546cef8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9b25ff6ca484aa1f69fcf6b6b5683c856b6f79c34b8d807abdd0a5c37546cef8",
+                    "hash" : "0x9b25ff6ca484aa1f69fcf6b6b5683c856b6f79c34b8d807abdd0a5c37546cef8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f886f738424bc64f81fa276afb6217080d775bfcbb8c51348287ab4674f282a9",
+                    "hash" : "0xf886f738424bc64f81fa276afb6217080d775bfcbb8c51348287ab4674f282a9",
                     "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" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALLwithData.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALLwithData.json
index a02ef1ab3..093dcb345 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALLwithData.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALLwithData.json
@@ -1,17 +1,17 @@
 {
     "ZeroValue_TransactionCALLwithData" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "474d47a4ba9e8bfbc85123c0c70d01e4cd1fb1c2ad45b47ce93d6c4a33cbbdc2",
+                    "hash" : "0x474d47a4ba9e8bfbc85123c0c70d01e4cd1fb1c2ad45b47ce93d6c4a33cbbdc2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a0b5c17f3edf5eaf8de3c3b98bc8644b101234c615cfa8d1837ef5a63808d38a",
+                    "hash" : "0xa0b5c17f3edf5eaf8de3c3b98bc8644b101234c615cfa8d1837ef5a63808d38a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "474d47a4ba9e8bfbc85123c0c70d01e4cd1fb1c2ad45b47ce93d6c4a33cbbdc2",
+                    "hash" : "0x474d47a4ba9e8bfbc85123c0c70d01e4cd1fb1c2ad45b47ce93d6c4a33cbbdc2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "474d47a4ba9e8bfbc85123c0c70d01e4cd1fb1c2ad45b47ce93d6c4a33cbbdc2",
+                    "hash" : "0x474d47a4ba9e8bfbc85123c0c70d01e4cd1fb1c2ad45b47ce93d6c4a33cbbdc2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a0b5c17f3edf5eaf8de3c3b98bc8644b101234c615cfa8d1837ef5a63808d38a",
+                    "hash" : "0xa0b5c17f3edf5eaf8de3c3b98bc8644b101234c615cfa8d1837ef5a63808d38a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -74,14 +74,14 @@
                 "0x1122334455667788991011121314151617181920"
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToEmpty.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToEmpty.json
index 681963219..4810dd7ca 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToEmpty.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToEmpty.json
@@ -1,17 +1,17 @@
 {
     "ZeroValue_TransactionCALLwithData_ToEmpty" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "474d47a4ba9e8bfbc85123c0c70d01e4cd1fb1c2ad45b47ce93d6c4a33cbbdc2",
+                    "hash" : "0x474d47a4ba9e8bfbc85123c0c70d01e4cd1fb1c2ad45b47ce93d6c4a33cbbdc2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a0b5c17f3edf5eaf8de3c3b98bc8644b101234c615cfa8d1837ef5a63808d38a",
+                    "hash" : "0xa0b5c17f3edf5eaf8de3c3b98bc8644b101234c615cfa8d1837ef5a63808d38a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "474d47a4ba9e8bfbc85123c0c70d01e4cd1fb1c2ad45b47ce93d6c4a33cbbdc2",
+                    "hash" : "0x474d47a4ba9e8bfbc85123c0c70d01e4cd1fb1c2ad45b47ce93d6c4a33cbbdc2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "474d47a4ba9e8bfbc85123c0c70d01e4cd1fb1c2ad45b47ce93d6c4a33cbbdc2",
+                    "hash" : "0x474d47a4ba9e8bfbc85123c0c70d01e4cd1fb1c2ad45b47ce93d6c4a33cbbdc2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a0b5c17f3edf5eaf8de3c3b98bc8644b101234c615cfa8d1837ef5a63808d38a",
+                    "hash" : "0xa0b5c17f3edf5eaf8de3c3b98bc8644b101234c615cfa8d1837ef5a63808d38a",
                     "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 @@
                 "0x1122334455667788991011121314151617181920"
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToNonZeroBalance.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToNonZeroBalance.json
index 52632a582..b89760e4c 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToNonZeroBalance.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToNonZeroBalance.json
@@ -1,17 +1,17 @@
 {
     "ZeroValue_TransactionCALLwithData_ToNonZeroBalance" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9ce14b8df47f36966f2e8b15dbc18ef5fa597699e61998c19f9ecd994bc7faae",
+                    "hash" : "0x9ce14b8df47f36966f2e8b15dbc18ef5fa597699e61998c19f9ecd994bc7faae",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9ce14b8df47f36966f2e8b15dbc18ef5fa597699e61998c19f9ecd994bc7faae",
+                    "hash" : "0x9ce14b8df47f36966f2e8b15dbc18ef5fa597699e61998c19f9ecd994bc7faae",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9ce14b8df47f36966f2e8b15dbc18ef5fa597699e61998c19f9ecd994bc7faae",
+                    "hash" : "0x9ce14b8df47f36966f2e8b15dbc18ef5fa597699e61998c19f9ecd994bc7faae",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9ce14b8df47f36966f2e8b15dbc18ef5fa597699e61998c19f9ecd994bc7faae",
+                    "hash" : "0x9ce14b8df47f36966f2e8b15dbc18ef5fa597699e61998c19f9ecd994bc7faae",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9ce14b8df47f36966f2e8b15dbc18ef5fa597699e61998c19f9ecd994bc7faae",
+                    "hash" : "0x9ce14b8df47f36966f2e8b15dbc18ef5fa597699e61998c19f9ecd994bc7faae",
                     "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 @@
                 "0x1122334455667788991011121314151617181920"
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToOneStorageKey.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToOneStorageKey.json
index bf516f7e3..449243dc6 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToOneStorageKey.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToOneStorageKey.json
@@ -1,17 +1,17 @@
 {
     "ZeroValue_TransactionCALLwithData_ToOneStorageKey" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "fc10de5a9dc6f7e9d4429d443414be28fa0e935088d22c494cde43c7efe21178",
+                    "hash" : "0xfc10de5a9dc6f7e9d4429d443414be28fa0e935088d22c494cde43c7efe21178",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a0b5c17f3edf5eaf8de3c3b98bc8644b101234c615cfa8d1837ef5a63808d38a",
+                    "hash" : "0xa0b5c17f3edf5eaf8de3c3b98bc8644b101234c615cfa8d1837ef5a63808d38a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "fc10de5a9dc6f7e9d4429d443414be28fa0e935088d22c494cde43c7efe21178",
+                    "hash" : "0xfc10de5a9dc6f7e9d4429d443414be28fa0e935088d22c494cde43c7efe21178",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "fc10de5a9dc6f7e9d4429d443414be28fa0e935088d22c494cde43c7efe21178",
+                    "hash" : "0xfc10de5a9dc6f7e9d4429d443414be28fa0e935088d22c494cde43c7efe21178",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a0b5c17f3edf5eaf8de3c3b98bc8644b101234c615cfa8d1837ef5a63808d38a",
+                    "hash" : "0xa0b5c17f3edf5eaf8de3c3b98bc8644b101234c615cfa8d1837ef5a63808d38a",
                     "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 @@
                 "0x1122334455667788991011121314151617181920"
             ],
             "gasLimit" : [
-                "600000"
+                "0x0927c0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/StateTests/EIP158/stNonZeroCallsTest.json b/StateTests/EIP158/stNonZeroCallsTest.json
index 728005b2f..3824a7b03 100644
--- a/StateTests/EIP158/stNonZeroCallsTest.json
+++ b/StateTests/EIP158/stNonZeroCallsTest.json
@@ -916,7 +916,7 @@
             "value" : "0x00"
         }
     },
-    "NonZeroValue_SUICIDE" : {
+    "NonZeroValue_SELFDESTRUCT" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x02b8feb0",
@@ -978,7 +978,7 @@
             "value" : "0x00"
         }
     },
-    "NonZeroValue_SUICIDE_ToEmpty" : {
+    "NonZeroValue_SELFDESTRUCT_ToEmpty" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x02b8feb0",
@@ -1047,7 +1047,7 @@
             "value" : "0x00"
         }
     },
-    "NonZeroValue_SUICIDE_ToNonNonZeroBalance" : {
+    "NonZeroValue_SELFDESTRUCT_ToNonNonZeroBalance" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x02b8feb0",
@@ -1116,7 +1116,7 @@
             "value" : "0x00"
         }
     },
-    "NonZeroValue_SUICIDE_ToOneStorageKey" : {
+    "NonZeroValue_SELFDESTRUCT_ToOneStorageKey" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x02b8feb0",
diff --git a/StateTests/EIP158/stZeroCallsRevertTest.json b/StateTests/EIP158/stZeroCallsRevertTest.json
index fbd6034d1..92aad3827 100644
--- a/StateTests/EIP158/stZeroCallsRevertTest.json
+++ b/StateTests/EIP158/stZeroCallsRevertTest.json
@@ -875,7 +875,7 @@
             "value" : "0x00"
         }
     },
-    "ZeroValue_SUICIDE_OOGRevert" : {
+    "ZeroValue_SELFDESTRUCT_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x02b8feb0",
@@ -951,7 +951,7 @@
             "value" : "0x00"
         }
     },
-    "ZeroValue_SUICIDE_ToEmpty_OOGRevert" : {
+    "ZeroValue_SELFDESTRUCT_ToEmpty_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x02b8feb0",
@@ -1041,7 +1041,7 @@
             "value" : "0x00"
         }
     },
-    "ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevert" : {
+    "ZeroValue_SELFDESTRUCT_ToNonZeroBalance_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x02b8feb0",
@@ -1131,7 +1131,7 @@
             "value" : "0x00"
         }
     },
-    "ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert" : {
+    "ZeroValue_SELFDESTRUCT_ToOneStorageKey_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x02b8feb0",
diff --git a/StateTests/EIP158/stZeroCallsTest.json b/StateTests/EIP158/stZeroCallsTest.json
index ba311b336..4fe6af7d1 100644
--- a/StateTests/EIP158/stZeroCallsTest.json
+++ b/StateTests/EIP158/stZeroCallsTest.json
@@ -896,7 +896,7 @@
             "value" : "0x00"
         }
     },
-    "ZeroValue_SUICIDE" : {
+    "ZeroValue_SELFDESTRUCT" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x02b8feb0",
@@ -951,7 +951,7 @@
             "value" : "0x00"
         }
     },
-    "ZeroValue_SUICIDE_ToEmpty" : {
+    "ZeroValue_SELFDESTRUCT_ToEmpty" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x02b8feb0",
@@ -1013,7 +1013,7 @@
             "value" : "0x00"
         }
     },
-    "ZeroValue_SUICIDE_ToNonZeroBalance" : {
+    "ZeroValue_SELFDESTRUCT_ToNonZeroBalance" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x02b8feb0",
@@ -1082,7 +1082,7 @@
             "value" : "0x00"
         }
     },
-    "ZeroValue_SUICIDE_ToOneStorageKey" : {
+    "ZeroValue_SELFDESTRUCT_ToOneStorageKey" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x02b8feb0",
diff --git a/StateTests/Homestead/stZeroCallsRevertTest.json b/StateTests/Homestead/stZeroCallsRevertTest.json
index 8e57301c0..385168b9d 100644
--- a/StateTests/Homestead/stZeroCallsRevertTest.json
+++ b/StateTests/Homestead/stZeroCallsRevertTest.json
@@ -875,7 +875,7 @@
             "value" : "0x00"
         }
     },
-    "ZeroValue_SUICIDE_OOGRevert" : {
+    "ZeroValue_SELFDESTRUCT_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x02b8feb0",
@@ -951,7 +951,7 @@
             "value" : "0x00"
         }
     },
-    "ZeroValue_SUICIDE_ToEmpty_OOGRevert" : {
+    "ZeroValue_SELFDESTRUCT_ToEmpty_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x02b8feb0",
@@ -1041,7 +1041,7 @@
             "value" : "0x00"
         }
     },
-    "ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevert" : {
+    "ZeroValue_SELFDESTRUCT_ToNonZeroBalance_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x02b8feb0",
@@ -1131,7 +1131,7 @@
             "value" : "0x00"
         }
     },
-    "ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert" : {
+    "ZeroValue_SELFDESTRUCT_ToOneStorageKey_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x02b8feb0",
diff --git a/src/BlockchainTestsFiller/EIP150/bcStateTestFiller.json b/src/BlockchainTestsFiller/EIP150/bcStateTestFiller.json
index df3afdd31..d99a3929f 100644
--- a/src/BlockchainTestsFiller/EIP150/bcStateTestFiller.json
+++ b/src/BlockchainTestsFiller/EIP150/bcStateTestFiller.json
@@ -32,7 +32,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "100000",
                 "nonce" : "0",
-                "code" : "{ (SUICIDE 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+                "code" : "{ (SELFDESTRUCT 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
                 "storage": {}
             }
         },
diff --git a/src/BlockchainTestsFiller/Homestead/bcStateTestFiller.json b/src/BlockchainTestsFiller/Homestead/bcStateTestFiller.json
index bffcaf06d..79431f14b 100644
--- a/src/BlockchainTestsFiller/Homestead/bcStateTestFiller.json
+++ b/src/BlockchainTestsFiller/Homestead/bcStateTestFiller.json
@@ -32,7 +32,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "100000",
                 "nonce" : "0",
-                "code" : "{ (SUICIDE 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+                "code" : "{ (SELFDESTRUCT 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
                 "storage": {}
             }
         },
diff --git a/src/BlockchainTestsFiller/TestNetwork/bcEIP150TestFiller.json b/src/BlockchainTestsFiller/TestNetwork/bcEIP150TestFiller.json
index 52033b895..ac6e0b54e 100644
--- a/src/BlockchainTestsFiller/TestNetwork/bcEIP150TestFiller.json
+++ b/src/BlockchainTestsFiller/TestNetwork/bcEIP150TestFiller.json
@@ -341,14 +341,14 @@
 	   "1000000000000000000000000000000000000012" : {
                 "balance" : "10000",
 		"nonce" : "0",
-		"code" : "{ (SUICIDE 0x1000000000000000000000000000000000000002) }",
+		"code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000002) }",
 		"storage": {
 		}
             },
 	   "1000000000000000000000000000000000000013" : {
                 "balance" : "10000",
 		"nonce" : "0",
-		"code" : "{ (SUICIDE 0x1000000000000000000000000000000000000003) }",
+		"code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000003) }",
 		"storage": {
 		}
             },
@@ -539,7 +539,7 @@
                 "balance" : "0",
 		"nonce" : "0",
 		"code" : "Suicide to not existing account",
-		"code" : "{ (SUICIDE 0x2000000000000000000000000000000000000015) }",
+		"code" : "{ (SELFDESTRUCT 0x2000000000000000000000000000000000000015) }",
 		"storage": {
 		}
             },
@@ -555,7 +555,7 @@
                 "balance" : "0",
 		"nonce" : "0",
 		"code" : "Suicide to not existing account",
-		"code" : "{ (SUICIDE 0x2000000000000000000000000000000000000115) }",
+		"code" : "{ (SELFDESTRUCT 0x2000000000000000000000000000000000000115) }",
 		"storage": {
 		}
             },
@@ -571,7 +571,7 @@
                 "balance" : "0",
 		"nonce" : "0",
 		"code" : "Suicide to existing account",
-		"code" : "{ (SUICIDE 0x1000000000000000000000000000000000000117) }",
+		"code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000117) }",
 		"storage": {
 		}
             },
diff --git a/src/BlockchainTestsFiller/bcStateTestFiller.json b/src/BlockchainTestsFiller/bcStateTestFiller.json
index 15a667782..0514d40cc 100644
--- a/src/BlockchainTestsFiller/bcStateTestFiller.json
+++ b/src/BlockchainTestsFiller/bcStateTestFiller.json
@@ -32,7 +32,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "100000",
                 "nonce" : "0",
-                "code" : "{ (SUICIDE 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+                "code" : "{ (SELFDESTRUCT 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
                 "storage": {}
             }
         },
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcall_00_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcall_00_SuicideEndFiller.json
index 83b77d0cf..2f3e92b33 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcall_00_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcall_00_SuicideEndFiller.json
@@ -35,7 +35,7 @@
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_SuicideEndFiller.json
index 914d693e1..ef0bb44d6 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_SuicideEndFiller.json
@@ -42,7 +42,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_SuicideMiddleFiller.json
index 91545acd8..e909e0fc6 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_SuicideMiddleFiller.json
@@ -45,7 +45,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_SuicideEndFiller.json
index 5001c9607..feb633668 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_SuicideEndFiller.json
@@ -42,7 +42,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_SuicideMiddleFiller.json
index 80cc09ead..375028a18 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_SuicideMiddleFiller.json
@@ -46,7 +46,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcode_01_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcode_01_SuicideEndFiller.json
index 3e10ebba4..faaff2298 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcode_01_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcode_01_SuicideEndFiller.json
@@ -35,7 +35,7 @@
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_SuicideEndFiller.json
index 96606d0d7..e5c3039c3 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_SuicideEndFiller.json
@@ -46,7 +46,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_SuicideMiddleFiller.json
index b60e64c9e..3c184ddd2 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_SuicideMiddleFiller.json
@@ -52,7 +52,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_SuicideEndFiller.json
index 057636511..3adf0327c 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_SuicideEndFiller.json
@@ -41,7 +41,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_SuicideMiddleFiller.json
index a877fdf9c..7566f127c 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_SuicideMiddleFiller.json
@@ -55,7 +55,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecall_10_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecall_10_SuicideEndFiller.json
index a34b7df31..0168295ab 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecall_10_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecall_10_SuicideEndFiller.json
@@ -39,7 +39,7 @@
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_SuicideEndFiller.json
index 263112150..ebc1b2302 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_SuicideEndFiller.json
@@ -52,7 +52,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_SuicideMiddleFiller.json
index 4b43bf9e6..2b7f35f8c 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_SuicideMiddleFiller.json
@@ -46,7 +46,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_SuicideEndFiller.json
index 15e78422e..996f4077f 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_SuicideEndFiller.json
@@ -45,7 +45,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_SuicideMiddleFiller.json
index 4eee2cac3..c42863d36 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_SuicideMiddleFiller.json
@@ -54,7 +54,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcode_11_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcode_11_SuicideEndFiller.json
index 23057bf9a..07dff169f 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcode_11_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcode_11_SuicideEndFiller.json
@@ -39,7 +39,7 @@
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_SuicideEndFiller.json
index e70babfde..f43bd14bb 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_SuicideEndFiller.json
@@ -42,7 +42,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_SuicideMiddleFiller.json
index 3901f4fdf..c8dbec083 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_SuicideMiddleFiller.json
@@ -53,7 +53,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_SuicideEndFiller.json
index 1c38146e4..a87c67478 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_SuicideEndFiller.json
@@ -44,7 +44,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_SuicideMiddleFiller.json
index 3e6288f3a..b7343121e 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_SuicideMiddleFiller.json
@@ -53,7 +53,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createFailBalanceTooLowFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createFailBalanceTooLowFiller.json
index cfb398699..a092d3623 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createFailBalanceTooLowFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createFailBalanceTooLowFiller.json
@@ -31,7 +31,7 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
-                "code" : "{(MSTORE8 0 0x5a ) (SUICIDE (CREATE 1000000000000000024 0 1)) }",
+                "code" : "{(MSTORE8 0 0x5a ) (SELFDESTRUCT (CREATE 1000000000000000024 0 1)) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailBadJumpDestinationFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailBadJumpDestinationFiller.json
index ad58180c9..31e8d5600 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailBadJumpDestinationFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailBadJumpDestinationFiller.json
@@ -22,7 +22,7 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
-                "code" : "{(MSTORE8 0 0x56 ) (SUICIDE (CREATE 1 0 1)) }",
+                "code" : "{(MSTORE8 0 0x56 ) (SELFDESTRUCT (CREATE 1 0 1)) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailStackSizeLargerThan1024Filler.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailStackSizeLargerThan1024Filler.json
index 0bf73dab8..39d74750d 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailStackSizeLargerThan1024Filler.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailStackSizeLargerThan1024Filler.json
@@ -22,7 +22,7 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
-                "code" : "{(MSTORE 0 0x6103ff6000525b7f0102030405060708090a0102030405060708090a01020304) (MSTORE 32 0x05060708090a0102600160005103600052600051600657000000000000000000 ) (SUICIDE (CREATE 1 0 64)) }",
+                "code" : "{(MSTORE 0 0x6103ff6000525b7f0102030405060708090a0102030405060708090a01020304) (MSTORE 32 0x05060708090a0102600160005103600052600051600657000000000000000000 ) (SELFDESTRUCT (CREATE 1 0 64)) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailStackUnderflowFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailStackUnderflowFiller.json
index ccccc33f2..f5e8ec2fa 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailStackUnderflowFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailStackUnderflowFiller.json
@@ -22,7 +22,7 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
-                "code" : "{(MSTORE8 0 0x01 ) (SUICIDE (CREATE 1 0 1)) }",
+                "code" : "{(MSTORE8 0 0x01 ) (SELFDESTRUCT (CREATE 1 0 1)) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailUndefinedInstructionFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailUndefinedInstructionFiller.json
index 75f644a2b..3c6425939 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailUndefinedInstructionFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailUndefinedInstructionFiller.json
@@ -22,7 +22,7 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
-                "code" : "{(MSTORE8 0 0xf4 ) (SUICIDE (CREATE 1 0 1)) }",
+                "code" : "{(MSTORE8 0 0xf4 ) (SELFDESTRUCT (CREATE 1 0 1)) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFail_OOGduringInitFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFail_OOGduringInitFiller.json
index c9984e3a7..da9704605 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFail_OOGduringInitFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFail_OOGduringInitFiller.json
@@ -31,7 +31,7 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
-                "code" : "{(MSTORE8 0 0x5a ) (SUICIDE (CREATE 1 0 1)) }",
+                "code" : "{(MSTORE8 0 0x5a ) (SELFDESTRUCT (CREATE 1 0 1)) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitOOGforCREATEFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitOOGforCREATEFiller.json
index 502c0dd1f..96111346f 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitOOGforCREATEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitOOGforCREATEFiller.json
@@ -22,7 +22,7 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
-                "code" : "{(MSTORE8 0 0x5a ) (SUICIDE (CREATE 1 0 1)) }",
+                "code" : "{(MSTORE8 0 0x5a ) (SELFDESTRUCT (CREATE 1 0 1)) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideEndFiller.json
index 25aedb077..2cda03a6e 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideEndFiller.json
@@ -98,7 +98,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideMiddleFiller.json
index 076ea80a0..bb57086f9 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideMiddleFiller.json
@@ -107,7 +107,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcode_01_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcode_01_SuicideEndFiller.json
index 08dcfa3c3..7db69b677 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcode_01_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcode_01_SuicideEndFiller.json
@@ -85,7 +85,7 @@
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideEndFiller.json
index e72fb0068..b6261929a 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideEndFiller.json
@@ -88,7 +88,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideMiddleFiller.json
index 5a296329a..f59ae993a 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideMiddleFiller.json
@@ -92,7 +92,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideEndFiller.json
index 558c36254..69f7d9893 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideEndFiller.json
@@ -98,7 +98,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideMiddleFiller.json
index 9e45da78b..e5477c366 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideMiddleFiller.json
@@ -73,7 +73,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+                "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecall_10_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecall_10_SuicideEndFiller.json
index a2cb13d97..a0bee2a91 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecall_10_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecall_10_SuicideEndFiller.json
@@ -69,7 +69,7 @@
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideEndFiller.json
index c918fa5e4..8007b66b5 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideEndFiller.json
@@ -102,7 +102,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideMiddleFiller.json
index a83507801..855ecd359 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideMiddleFiller.json
@@ -86,7 +86,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideEndFiller.json
index be879c584..16a198900 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideEndFiller.json
@@ -100,7 +100,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideMiddleFiller.json
index fa42b1019..830a16306 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideMiddleFiller.json
@@ -98,7 +98,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+                "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_SuicideEndFiller.json
index 0c2b600ed..f41fb351a 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_SuicideEndFiller.json
@@ -71,7 +71,7 @@
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideEndFiller.json
index 1249951ff..1c412f2b7 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideEndFiller.json
@@ -86,7 +86,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideMiddleFiller.json
index 6298fd043..29148030e 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideMiddleFiller.json
@@ -88,7 +88,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideEndFiller.json
index ebe9c351e..9d2fb634b 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideEndFiller.json
@@ -94,7 +94,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 2 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 2 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideMiddleFiller.json
index c4528a180..a1848d5f6 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideMiddleFiller.json
@@ -89,7 +89,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideEndFiller.json
index 234ec5c40..1b742c96e 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideEndFiller.json
@@ -98,7 +98,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideMiddleFiller.json
index 0505998d8..4c9f52470 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideMiddleFiller.json
@@ -99,7 +99,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcode_01_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcode_01_SuicideEndFiller.json
index d5d7f2c6a..51d6917b7 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcode_01_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcode_01_SuicideEndFiller.json
@@ -83,7 +83,7 @@
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideEndFiller.json
index 501ab453d..7e1e0b1a4 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideEndFiller.json
@@ -88,7 +88,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideMiddleFiller.json
index bdd214663..02f14dd08 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideMiddleFiller.json
@@ -90,7 +90,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideEndFiller.json
index 2f9aef167..013a0ea8f 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideEndFiller.json
@@ -96,7 +96,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideMiddleFiller.json
index 56928a872..578943ffb 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideMiddleFiller.json
@@ -73,7 +73,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+                "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecall_10_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecall_10_SuicideEndFiller.json
index fb059d2a9..3488bc2d8 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecall_10_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecall_10_SuicideEndFiller.json
@@ -69,7 +69,7 @@
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideEndFiller.json
index 8cfa4455b..322b5e42c 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideEndFiller.json
@@ -100,7 +100,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideMiddleFiller.json
index 7d99b556b..4d123c8b8 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideMiddleFiller.json
@@ -88,7 +88,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideEndFiller.json
index 9477a67d0..aaf41d44b 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideEndFiller.json
@@ -104,7 +104,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideMiddleFiller.json
index d107e72c5..348af2dde 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideMiddleFiller.json
@@ -88,7 +88,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+                "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcode_11_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcode_11_SuicideEndFiller.json
index 0c2b600ed..f41fb351a 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcode_11_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcode_11_SuicideEndFiller.json
@@ -71,7 +71,7 @@
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideEndFiller.json
index 07c73d1b2..b89be6046 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideEndFiller.json
@@ -86,7 +86,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideMiddleFiller.json
index 26c13a8ce..6c31fce9a 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideMiddleFiller.json
@@ -88,7 +88,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideEndFiller.json
index 8a9c7e02e..bc99bd832 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideEndFiller.json
@@ -81,7 +81,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideMiddleFiller.json
index c4528a180..a1848d5f6 100644
--- a/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideMiddleFiller.json
@@ -89,7 +89,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stChangedEIP150/createInitFail_OOGduringInitFiller.json b/src/GeneralStateTestsFiller/stChangedEIP150/createInitFail_OOGduringInitFiller.json
index 167291223..26f537b9d 100644
--- a/src/GeneralStateTestsFiller/stChangedEIP150/createInitFail_OOGduringInitFiller.json
+++ b/src/GeneralStateTestsFiller/stChangedEIP150/createInitFail_OOGduringInitFiller.json
@@ -55,7 +55,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{(MSTORE8 0 0x5a ) (SUICIDE (CREATE 1 0 1)) }",
+                "code" : "{(MSTORE8 0 0x5a ) (SELFDESTRUCT (CREATE 1 0 1)) }",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
diff --git a/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInitFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInitFiller.json
index 111aa7627..d53132caa 100644
--- a/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInitFiller.json
+++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInitFiller.json
@@ -67,7 +67,7 @@
             }
         },
         "transaction" : {
-	    "data" : "{(CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}",
+	    "data" : "{(CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}",
             "data" : [
                 "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1506d64600c6000556000526005601bf360005273c94f5374fce5edbc8e2a8697c15331677e6ebf0bff"
             ],
diff --git a/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json
index ae0a83c97..9526fec42 100644
--- a/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json
+++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json
@@ -87,7 +87,7 @@
             }
         },
         "transaction" : {
-	    "data" : "{ (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SUICIDE 0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b) (CALL 60000 0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[0]]11 (RETURN 18 14)}",
+	    "data" : "{ (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SELFDESTRUCT 0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b) (CALL 60000 0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[0]]11 (RETURN 18 14)}",
             "data" : [
                 "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1506d64600c6000556000526005601bf360005273d94f5374fce5edbc8e2a8697c15331677e6ebf0bff6000600060006000600073d94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f150600b600055600e6012f3"
             ],
diff --git a/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueFiller.json
index 736e89f11..d48bfded9 100644
--- a/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueFiller.json
+++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueFiller.json
@@ -67,7 +67,7 @@
             }
         },
         "transaction" : {
-	    "data" : "{(CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}",
+	    "data" : "{(CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}",
             "data" : [
                 "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1506d64600c6000556000526005601bf360005273c94f5374fce5edbc8e2a8697c15331677e6ebf0bff"
             ],
diff --git a/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueToItselfFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueToItselfFiller.json
index 1c231bc62..d71de4068 100644
--- a/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueToItselfFiller.json
+++ b/src/GeneralStateTestsFiller/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueToItselfFiller.json
@@ -129,7 +129,7 @@
             }
         },
         "transaction" : {
-	    "data" : "{(CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SUICIDE 0x6295ee1b4f6dd65047762f924ecd367c17eabf8f)}",
+	    "data" : "{(CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SELFDESTRUCT 0x6295ee1b4f6dd65047762f924ecd367c17eabf8f)}",
             "data" : [
                 "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1506d64600c6000556000526005601bf3600052736295ee1b4f6dd65047762f924ecd367c17eabf8fff"
             ],
diff --git a/src/GeneralStateTestsFiller/stEIP150Specific/SuicideToExistingContractFiller.json b/src/GeneralStateTestsFiller/stEIP150Specific/SuicideToExistingContractFiller.json
index b2186f209..ca07be06d 100644
--- a/src/GeneralStateTestsFiller/stEIP150Specific/SuicideToExistingContractFiller.json
+++ b/src/GeneralStateTestsFiller/stEIP150Specific/SuicideToExistingContractFiller.json
@@ -67,7 +67,7 @@
                 "balance" : "0",
 		"nonce" : "0",
 		"code" : "Suicide to existing account",
-		"code" : "{ (SUICIDE 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+		"code" : "{ (SELFDESTRUCT 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
 		"storage": {
 		}
             }
diff --git a/src/GeneralStateTestsFiller/stEIP150Specific/SuicideToNotExistingContractFiller.json b/src/GeneralStateTestsFiller/stEIP150Specific/SuicideToNotExistingContractFiller.json
index 932f81024..ed8f8b575 100644
--- a/src/GeneralStateTestsFiller/stEIP150Specific/SuicideToNotExistingContractFiller.json
+++ b/src/GeneralStateTestsFiller/stEIP150Specific/SuicideToNotExistingContractFiller.json
@@ -85,7 +85,7 @@
                 "balance" : "0",
 		"nonce" : "0",
 		"code" : "Suicide to not existing account",
-		"code" : "{ (SUICIDE 0x2000000000000000000000000000000000000115) }",
+		"code" : "{ (SELFDESTRUCT 0x2000000000000000000000000000000000000115) }",
 		"storage": {
 		}
             }
diff --git a/src/GeneralStateTestsFiller/stEIP158Specific/CALL_OneVCallSuicideFiller.json b/src/GeneralStateTestsFiller/stEIP158Specific/CALL_OneVCallSuicideFiller.json
index 5c243b09f..274ae2eae 100644
--- a/src/GeneralStateTestsFiller/stEIP158Specific/CALL_OneVCallSuicideFiller.json
+++ b/src/GeneralStateTestsFiller/stEIP158Specific/CALL_OneVCallSuicideFiller.json
@@ -69,7 +69,7 @@
 	    "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "{ (SUICIDE 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+		"code" : "{ (SELFDESTRUCT 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
 		"storage": {
 		}
             }
diff --git a/src/GeneralStateTestsFiller/stEIP158Specific/CALL_ZeroVCallSuicideFiller.json b/src/GeneralStateTestsFiller/stEIP158Specific/CALL_ZeroVCallSuicideFiller.json
index a890117e2..d58532c9b 100644
--- a/src/GeneralStateTestsFiller/stEIP158Specific/CALL_ZeroVCallSuicideFiller.json
+++ b/src/GeneralStateTestsFiller/stEIP158Specific/CALL_ZeroVCallSuicideFiller.json
@@ -69,7 +69,7 @@
 	    "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "{ (SUICIDE 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+		"code" : "{ (SELFDESTRUCT 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
 		"storage": {
 		}
             }
diff --git a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDEFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDEFiller.json
index 3c37373a2..a32edcdc4 100644
--- a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDEFiller.json
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDEFiller.json
@@ -1,5 +1,5 @@
 {
-    "NonZeroValue_SUICIDE" : {
+    "NonZeroValue_SELFDESTRUCT" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
@@ -57,7 +57,7 @@
 	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "1",
 		"nonce" : "0",
-		"code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+		"code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
 		"storage": {
 		}
             }
diff --git a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToEmptyFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToEmptyFiller.json
index d156c983e..72be2bcf3 100644
--- a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToEmptyFiller.json
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToEmptyFiller.json
@@ -1,5 +1,5 @@
 {
-    "NonZeroValue_SUICIDE_ToEmpty" : {
+    "NonZeroValue_SELFDESTRUCT_ToEmpty" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
@@ -54,7 +54,7 @@
 	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "1",
 		"nonce" : "0",
-		"code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+		"code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
 		"storage": {
 		}
             },
diff --git a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalanceFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalanceFiller.json
index b0efd8f4e..e37231aaf 100644
--- a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalanceFiller.json
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalanceFiller.json
@@ -1,5 +1,5 @@
 {
-    "NonZeroValue_SUICIDE_ToNonNonZeroBalance" : {
+    "NonZeroValue_SELFDESTRUCT_ToNonNonZeroBalance" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
@@ -54,7 +54,7 @@
 	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "1",
 		"nonce" : "0",
-		"code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+		"code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
 		"storage": {
 		}
             },
diff --git a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToOneStorageKeyFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToOneStorageKeyFiller.json
index 390687346..8c0b3d678 100644
--- a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToOneStorageKeyFiller.json
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToOneStorageKeyFiller.json
@@ -1,5 +1,5 @@
 {
-    "NonZeroValue_SUICIDE_ToOneStorageKey" : {
+    "NonZeroValue_SELFDESTRUCT_ToOneStorageKey" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
@@ -60,7 +60,7 @@
 	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "1",
 		"nonce" : "0",
-		"code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+		"code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
 		"storage": {
 		    "0x00" : "0x01"
 		}
diff --git a/src/GeneralStateTestsFiller/stRefundTest/refundSuicide50procentCapFiller.json b/src/GeneralStateTestsFiller/stRefundTest/refundSuicide50procentCapFiller.json
index 5816c4238..cc7dd4309 100644
--- a/src/GeneralStateTestsFiller/stRefundTest/refundSuicide50procentCapFiller.json
+++ b/src/GeneralStateTestsFiller/stRefundTest/refundSuicide50procentCapFiller.json
@@ -85,7 +85,7 @@
             },
             "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
                 "balance" : "1000000000000000000",
-                "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
+                "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideNoStorageFiller.json b/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideNoStorageFiller.json
index 5385ac41c..4d1177535 100644
--- a/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideNoStorageFiller.json
+++ b/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideNoStorageFiller.json
@@ -76,7 +76,7 @@
             },
             "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
                 "balance" : "1000000000000000000",
-                "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
+                "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideStorageFiller.json b/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideStorageFiller.json
index c637905b9..d5f61e742 100644
--- a/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideStorageFiller.json
+++ b/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideStorageFiller.json
@@ -79,7 +79,7 @@
             },
             "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
                 "balance" : "1000000000000000000",
-                "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
+                "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
                 "nonce" : "0",
                 "storage" : {
                     "0x01" : "0x01"
diff --git a/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideTwiceFiller.json b/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideTwiceFiller.json
index e38ebe7f2..13cecaff7 100644
--- a/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideTwiceFiller.json
+++ b/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideTwiceFiller.json
@@ -82,7 +82,7 @@
             },
             "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
                 "balance" : "1000000000000000000",
-                "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
+                "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
                 "nonce" : "0",
                 "storage" : {
                     "0x01" : "0x01"
diff --git a/src/GeneralStateTestsFiller/stRefundTest/refund_TxToSuicideFiller.json b/src/GeneralStateTestsFiller/stRefundTest/refund_TxToSuicideFiller.json
index 419c699cc..e24ec383b 100644
--- a/src/GeneralStateTestsFiller/stRefundTest/refund_TxToSuicideFiller.json
+++ b/src/GeneralStateTestsFiller/stRefundTest/refund_TxToSuicideFiller.json
@@ -70,7 +70,7 @@
             },
             "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
                 "balance" : "1000000000000000000",
-                "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
+                "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
                 "nonce" : "0",
                 "storage" : {
                     "0x01" : "0x01"
diff --git a/src/GeneralStateTestsFiller/stRefundTest/refund_TxToSuicideOOGFiller.json b/src/GeneralStateTestsFiller/stRefundTest/refund_TxToSuicideOOGFiller.json
index 6012272b9..d401e15b3 100644
--- a/src/GeneralStateTestsFiller/stRefundTest/refund_TxToSuicideOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stRefundTest/refund_TxToSuicideOOGFiller.json
@@ -43,7 +43,7 @@
             },
             "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
                 "balance" : "1000000000000000000",
-                "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
+                "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
                 "nonce" : "0",
                 "storage" : {
                     "0x01" : "0x01"
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcallsSuicide0Filler.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcallsSuicide0Filler.json
index c2b534728..a60c1abf5 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcallsSuicide0Filler.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcallsSuicide0Filler.json
@@ -28,7 +28,7 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
-                "code" : "{  [[ (PC) ]] (CALL 100000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 24 0 0 0 0) (SUICIDE 0x945304eb96065b2a98b57a48a06ae28d285a71b5)  }",
+                "code" : "{  [[ (PC) ]] (CALL 100000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 24 0 0 0 0) (SELFDESTRUCT 0x945304eb96065b2a98b57a48a06ae28d285a71b5)  }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcallsSuicide1Filler.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcallsSuicide1Filler.json
index a247d258c..466dce4b6 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcallsSuicide1Filler.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcallsSuicide1Filler.json
@@ -68,7 +68,7 @@
             },
             "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "23",
-                "code" : "{  (MSTORE 0 (CALLDATALOAD 0)) [[ (PC) ]] (ADD 1 (CALL (SUB (CALLDATALOAD 0) 50000) 0x095e7baea6a6c7c4c2dfeb977efac326af552d87 23 0 32 0 0)) (SUICIDE 0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6) } ",
+                "code" : "{  (MSTORE 0 (CALLDATALOAD 0)) [[ (PC) ]] (ADD 1 (CALL (SUB (CALLDATALOAD 0) 50000) 0x095e7baea6a6c7c4c2dfeb977efac326af552d87 23 0 32 0 0)) (SELFDESTRUCT 0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6) } ",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideAddressFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideAddressFiller.json
index 258378d44..4daaf0e1f 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideAddressFiller.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideAddressFiller.json
@@ -45,7 +45,7 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
-                "code" : "{ [[0]] (ADDRESS) (SUICIDE (ADDRESS))}",
+                "code" : "{ [[0]] (ADDRESS) (SELFDESTRUCT (ADDRESS))}",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCallerAddresTooBigLeftFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCallerAddresTooBigLeftFiller.json
index 4397eb18f..97b2fa689 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCallerAddresTooBigLeftFiller.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCallerAddresTooBigLeftFiller.json
@@ -47,7 +47,7 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
-                "code" : "{ [[0]] (CALLER) (SUICIDE 0xaaa94f5374fce5edbc8e2a8697c15331677e6ebf0b)}",
+                "code" : "{ [[0]] (CALLER) (SELFDESTRUCT 0xaaa94f5374fce5edbc8e2a8697c15331677e6ebf0b)}",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCallerAddresTooBigRightFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCallerAddresTooBigRightFiller.json
index 40076abd2..c44e78d78 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCallerAddresTooBigRightFiller.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCallerAddresTooBigRightFiller.json
@@ -26,7 +26,7 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
-                "code" : "{ [[0]] (CALLER) (SUICIDE 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0baa)}",
+                "code" : "{ [[0]] (CALLER) (SELFDESTRUCT 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0baa)}",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCallerFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCallerFiller.json
index fd92889c3..cac829be5 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCallerFiller.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCallerFiller.json
@@ -47,7 +47,7 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
-                "code" : "{ [[0]] (CALLER) (SUICIDE (CALLER))}",
+                "code" : "{ [[0]] (CALLER) (SELFDESTRUCT (CALLER))}",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCoinbaseFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCoinbaseFiller.json
index 42d60e8a5..4a1cffdc1 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCoinbaseFiller.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCoinbaseFiller.json
@@ -41,7 +41,7 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
-                "code" : "{ (SUICIDE 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+                "code" : "{ (SELFDESTRUCT 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideNotExistingAccountFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideNotExistingAccountFiller.json
index 779637b30..cc81f0187 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideNotExistingAccountFiller.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideNotExistingAccountFiller.json
@@ -26,7 +26,7 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
-                "code" : "{ (SUICIDE 0xaa1722f3947def4cf144679da39c4c32bdc35681 )}",
+                "code" : "{ (SELFDESTRUCT 0xaa1722f3947def4cf144679da39c4c32bdc35681 )}",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideOriginFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideOriginFiller.json
index 02078c696..9a96c41ab 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideOriginFiller.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideOriginFiller.json
@@ -45,7 +45,7 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
-                "code" : "{ [[0]] (ORIGIN) (SUICIDE (ORIGIN))}",
+                "code" : "{ [[0]] (ORIGIN) (SELFDESTRUCT (ORIGIN))}",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideSendEtherToMeFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideSendEtherToMeFiller.json
index ad0745635..957d15027 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideSendEtherToMeFiller.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideSendEtherToMeFiller.json
@@ -47,7 +47,7 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
-                "code" : "{ (SUICIDE (ADDRESS) )}",
+                "code" : "{ (SELFDESTRUCT (ADDRESS) )}",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCallFailedFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCallFailedFiller.json
index 2aa4c53e2..17c27cb35 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCallFailedFiller.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCallFailedFiller.json
@@ -27,7 +27,7 @@
         "pre" : {
             "0000000000000000000000000000000000000000" : {
                 "balance" : "0",
-                "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}",
+                "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -41,7 +41,7 @@
             },
             "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "10",
-                "code" : "{(CALL 0 0x0000000000000000000000000000000000000000 0 0 0 0 0) (SUICIDE 0)}",
+                "code" : "{(CALL 0 0x0000000000000000000000000000000000000000 0 0 0 0 0) (SELFDESTRUCT 0)}",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCallFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCallFiller.json
index f81b29861..de3e26a78 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCallFiller.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCallFiller.json
@@ -45,7 +45,7 @@
         "pre" : {
             "0000000000000000000000000000000000000000" : {
                 "balance" : "0",
-                "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}",
+                "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -59,7 +59,7 @@
             },
             "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "10",
-                "code" : "{(CALL 0 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SUICIDE 0)}",
+                "code" : "{(CALL 0 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SELFDESTRUCT 0)}",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndInternlCallSuicidesOOGFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndInternlCallSuicidesOOGFiller.json
index 59f922df1..b8d121402 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndInternlCallSuicidesOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndInternlCallSuicidesOOGFiller.json
@@ -33,7 +33,7 @@
         "pre" : {
             "0000000000000000000000000000000000000000" : {
                 "balance" : "0",
-                "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}",
+                "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -47,7 +47,7 @@
             },
             "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "10",
-                "code" : "{(CALL 22000 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SUICIDE 0)}",
+                "code" : "{(CALL 22000 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SELFDESTRUCT 0)}",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndInternlCallSuicidesSuccessFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndInternlCallSuicidesSuccessFiller.json
index 4d3ebc847..87b090434 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndInternlCallSuicidesSuccessFiller.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndInternlCallSuicidesSuccessFiller.json
@@ -43,7 +43,7 @@
         "pre" : {
             "0000000000000000000000000000000000000000" : {
                 "balance" : "0",
-                "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}",
+                "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -57,7 +57,7 @@
             },
             "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "1000",
-                "code" : "{(CALL (CALLDATALOAD 0) 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SUICIDE 0)}",
+                "code" : "{(CALL (CALLDATALOAD 0) 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SELFDESTRUCT 0)}",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndSendMoneyToItselfEtherDestroyedFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndSendMoneyToItselfEtherDestroyedFiller.json
index 58dc51cb9..3105ff6d5 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndSendMoneyToItselfEtherDestroyedFiller.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/SuicidesAndSendMoneyToItselfEtherDestroyedFiller.json
@@ -54,7 +54,7 @@
             },
             "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "1000",
-                "code" : "{(SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}",
+                "code" : "{(SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/SuicidesMixingCoinbaseFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/SuicidesMixingCoinbaseFiller.json
index f11bfb9ce..c7a3ad5f8 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/SuicidesMixingCoinbaseFiller.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/SuicidesMixingCoinbaseFiller.json
@@ -58,7 +58,7 @@
             },
             "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "1000",
-                "code" : "{(SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}",
+                "code" : "{(SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stTransactionTest/SuicidesStopAfterSuicideFiller.json b/src/GeneralStateTestsFiller/stTransactionTest/SuicidesStopAfterSuicideFiller.json
index 02c35e802..588e82640 100644
--- a/src/GeneralStateTestsFiller/stTransactionTest/SuicidesStopAfterSuicideFiller.json
+++ b/src/GeneralStateTestsFiller/stTransactionTest/SuicidesStopAfterSuicideFiller.json
@@ -34,7 +34,7 @@
         "pre" : {
             "0000000000000000000000000000000000000000" : {
                 "balance" : "1110",
-                "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}",
+                "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -48,7 +48,7 @@
             },
             "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "10000",
-                "code" : "{(SUICIDE 0) (CALL 30000 0x0000000000000000000000000000000000000000 0 0 0 0 0) }",
+                "code" : "{(SELFDESTRUCT 0) (CALL 30000 0x0000000000000000000000000000000000000000 0 0 0 0 0) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_OOGRevertFiller.json b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_OOGRevertFiller.json
index b53fe4c85..4967e8386 100644
--- a/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_OOGRevertFiller.json
+++ b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_OOGRevertFiller.json
@@ -1,5 +1,5 @@
 {
-    "ZeroValue_SUICIDE_OOGRevert" : {
+    "ZeroValue_SELFDESTRUCT_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
@@ -48,7 +48,7 @@
 	    "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)  }",
+		"code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)  }",
 		"storage": {
 		}
             }
diff --git a/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_ToEmpty_OOGRevertFiller.json b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_ToEmpty_OOGRevertFiller.json
index 5517686c5..55d92b0f6 100644
--- a/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_ToEmpty_OOGRevertFiller.json
+++ b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_ToEmpty_OOGRevertFiller.json
@@ -1,5 +1,5 @@
 {
-    "ZeroValue_SUICIDE_ToEmpty_OOGRevert" : {
+    "ZeroValue_SELFDESTRUCT_ToEmpty_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
@@ -48,7 +48,7 @@
 	    "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+		"code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
 		"storage": {
 		}
             },
diff --git a/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevertFiller.json b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevertFiller.json
index 55cd560a5..773d18fc4 100644
--- a/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevertFiller.json
+++ b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevertFiller.json
@@ -1,5 +1,5 @@
 {
-    "ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevert" : {
+    "ZeroValue_SELFDESTRUCT_ToNonZeroBalance_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
@@ -48,7 +48,7 @@
 	    "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+		"code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
 		"storage": {
 		}
             },
diff --git a/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_ToOneStorageKey_OOGRevertFiller.json b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_ToOneStorageKey_OOGRevertFiller.json
index af4905cd3..c2938a067 100644
--- a/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_ToOneStorageKey_OOGRevertFiller.json
+++ b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_ToOneStorageKey_OOGRevertFiller.json
@@ -1,5 +1,5 @@
 {
-    "ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert" : {
+    "ZeroValue_SELFDESTRUCT_ToOneStorageKey_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
@@ -49,7 +49,7 @@
 	    "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+		"code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
 		"storage": {
 		    "0x00" : "0x01"
 		}
diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDEFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDEFiller.json
index 0b7cf79ef..16ebbf32e 100644
--- a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDEFiller.json
+++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDEFiller.json
@@ -1,5 +1,5 @@
 {
-    "ZeroValue_SUICIDE" : {
+    "ZeroValue_SELFDESTRUCT" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
@@ -58,7 +58,7 @@
 	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+		"code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
 		"storage": {
 		}
             }
diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDE_ToEmptyFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDE_ToEmptyFiller.json
index ec98daec2..b093b921c 100644
--- a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDE_ToEmptyFiller.json
+++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDE_ToEmptyFiller.json
@@ -1,5 +1,5 @@
 {
-    "ZeroValue_SUICIDE_ToEmpty" : {
+    "ZeroValue_SELFDESTRUCT_ToEmpty" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
@@ -58,7 +58,7 @@
 	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+		"code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
 		"storage": {
 		}
             },
diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDE_ToNonZeroBalanceFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDE_ToNonZeroBalanceFiller.json
index e67f1f756..fde15c8d5 100644
--- a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDE_ToNonZeroBalanceFiller.json
+++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDE_ToNonZeroBalanceFiller.json
@@ -1,5 +1,5 @@
 {
-    "ZeroValue_SUICIDE_ToNonZeroBalance" : {
+    "ZeroValue_SELFDESTRUCT_ToNonZeroBalance" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
@@ -54,7 +54,7 @@
 	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+		"code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
 		"storage": {
 		}
             },
diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDE_ToOneStorageKeyFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDE_ToOneStorageKeyFiller.json
index 0273c70b1..11b1aeed7 100644
--- a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDE_ToOneStorageKeyFiller.json
+++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDE_ToOneStorageKeyFiller.json
@@ -1,5 +1,5 @@
 {
-    "ZeroValue_SUICIDE_ToOneStorageKey" : {
+    "ZeroValue_SELFDESTRUCT_ToOneStorageKey" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
@@ -56,7 +56,7 @@
 	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+		"code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
 		"storage": {
 		    "0x00" : "0x01"
 		}
diff --git a/src/StateTestsFiller/EIP150/Homestead/stCallCodesFiller.json b/src/StateTestsFiller/EIP150/Homestead/stCallCodesFiller.json
index 8757f5bd5..688e8374f 100644
--- a/src/StateTestsFiller/EIP150/Homestead/stCallCodesFiller.json
+++ b/src/StateTestsFiller/EIP150/Homestead/stCallCodesFiller.json
@@ -3167,7 +3167,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3233,7 +3233,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3303,7 +3303,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3368,7 +3368,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3444,7 +3444,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3513,7 +3513,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3579,7 +3579,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3647,7 +3647,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3706,7 +3706,7 @@
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3765,7 +3765,7 @@
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3828,7 +3828,7 @@
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3891,7 +3891,7 @@
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3960,7 +3960,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4030,7 +4030,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4106,7 +4106,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4185,7 +4185,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4255,7 +4255,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4333,7 +4333,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4410,7 +4410,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4487,7 +4487,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/StateTestsFiller/EIP150/Homestead/stCallCreateCallCodeTestFiller.json b/src/StateTestsFiller/EIP150/Homestead/stCallCreateCallCodeTestFiller.json
index 2e8992d79..58357a71e 100644
--- a/src/StateTestsFiller/EIP150/Homestead/stCallCreateCallCodeTestFiller.json
+++ b/src/StateTestsFiller/EIP150/Homestead/stCallCreateCallCodeTestFiller.json
@@ -976,7 +976,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{(MSTORE8 0 0x01 ) (SUICIDE (CREATE 1 0 1)) }",
+                "code" : "{(MSTORE8 0 0x01 ) (SELFDESTRUCT (CREATE 1 0 1)) }",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1015,7 +1015,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{(MSTORE8 0 0xf4 ) (SUICIDE (CREATE 1 0 1)) }",
+                "code" : "{(MSTORE8 0 0xf4 ) (SELFDESTRUCT (CREATE 1 0 1)) }",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1054,7 +1054,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{(MSTORE8 0 0x56 ) (SUICIDE (CREATE 1 0 1)) }",
+                "code" : "{(MSTORE8 0 0x56 ) (SELFDESTRUCT (CREATE 1 0 1)) }",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1096,7 +1096,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{(MSTORE8 0 0x5a ) (SUICIDE (CREATE 1 0 1)) }",
+                "code" : "{(MSTORE8 0 0x5a ) (SELFDESTRUCT (CREATE 1 0 1)) }",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1135,7 +1135,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{(MSTORE 0 0x6103ff6000525b7f0102030405060708090a0102030405060708090a01020304) (MSTORE 32 0x05060708090a0102600160005103600052600051600657000000000000000000 ) (SUICIDE (CREATE 1 0 64)) }",
+                "code" : "{(MSTORE 0 0x6103ff6000525b7f0102030405060708090a0102030405060708090a01020304) (MSTORE 32 0x05060708090a0102600160005103600052600051600657000000000000000000 ) (SELFDESTRUCT (CREATE 1 0 64)) }",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1174,7 +1174,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{(MSTORE8 0 0x5a ) (SUICIDE (CREATE 1000000000000000024 0 1)) }",
+                "code" : "{(MSTORE8 0 0x5a ) (SELFDESTRUCT (CREATE 1000000000000000024 0 1)) }",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1208,7 +1208,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{(MSTORE8 0 0x5a ) (SUICIDE (CREATE 1 0 1)) }",
+                "code" : "{(MSTORE8 0 0x5a ) (SELFDESTRUCT (CREATE 1 0 1)) }",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
diff --git a/src/StateTestsFiller/EIP150/Homestead/stCallDelegateCodesCallCodeFiller.json b/src/StateTestsFiller/EIP150/Homestead/stCallDelegateCodesCallCodeFiller.json
index dcb62ded0..c831e5434 100644
--- a/src/StateTestsFiller/EIP150/Homestead/stCallDelegateCodesCallCodeFiller.json
+++ b/src/StateTestsFiller/EIP150/Homestead/stCallDelegateCodesCallCodeFiller.json
@@ -2963,7 +2963,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3041,7 +3041,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3124,7 +3124,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3209,7 +3209,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3293,7 +3293,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3370,7 +3370,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3451,7 +3451,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 2 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 2 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3524,7 +3524,7 @@
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3589,7 +3589,7 @@
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3655,7 +3655,7 @@
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3742,7 +3742,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3822,7 +3822,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3892,7 +3892,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+                "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3969,7 +3969,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4052,7 +4052,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+                "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4130,7 +4130,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4208,7 +4208,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/StateTestsFiller/EIP150/Homestead/stCallDelegateCodesFiller.json b/src/StateTestsFiller/EIP150/Homestead/stCallDelegateCodesFiller.json
index b184b37dd..6067473cf 100644
--- a/src/StateTestsFiller/EIP150/Homestead/stCallDelegateCodesFiller.json
+++ b/src/StateTestsFiller/EIP150/Homestead/stCallDelegateCodesFiller.json
@@ -2947,7 +2947,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3025,7 +3025,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3107,7 +3107,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3191,7 +3191,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3277,7 +3277,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3354,7 +3354,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3434,7 +3434,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3506,7 +3506,7 @@
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3571,7 +3571,7 @@
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3637,7 +3637,7 @@
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3720,7 +3720,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3799,7 +3799,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3869,7 +3869,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+                "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3947,7 +3947,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4025,7 +4025,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+                "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4103,7 +4103,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4181,7 +4181,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/StateTestsFiller/EIP150/Homestead/stRefundTestFiller.json b/src/StateTestsFiller/EIP150/Homestead/stRefundTestFiller.json
index 8f91dc704..81802b849 100644
--- a/src/StateTestsFiller/EIP150/Homestead/stRefundTestFiller.json
+++ b/src/StateTestsFiller/EIP150/Homestead/stRefundTestFiller.json
@@ -468,7 +468,7 @@
             "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
+                "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
                 "storage" : {}
             }
          },
@@ -520,7 +520,7 @@
              "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
                  "balance" : "1000000000000000000",
                  "nonce" : "0",
-                 "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
+                 "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
                  "storage" : {
                      "0x01" : "0x01"
                  }
@@ -580,7 +580,7 @@
              "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
                  "balance" : "1000000000000000000",
                  "nonce" : "0",
-                 "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
+                 "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
                  "storage" : {}
              },
              "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -628,7 +628,7 @@
              "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
                  "balance" : "1000000000000000000",
                  "nonce" : "0",
-                 "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
+                 "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
                  "storage" : {
                      "0x01" : "0x01"
                  }
@@ -679,7 +679,7 @@
              "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
                  "balance" : "1000000000000000000",
                  "nonce" : "0",
-                 "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
+                 "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
                  "storage" : {
                      "0x01" : "0x01"
                  }
@@ -739,7 +739,7 @@
              "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
                  "balance" : "1000000000000000000",
                  "nonce" : "0",
-                 "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
+                 "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
                  "storage" : {
                      "0x01" : "0x01"
                  }
diff --git a/src/StateTestsFiller/EIP150/Homestead/stSystemOperationsTestFiller.json b/src/StateTestsFiller/EIP150/Homestead/stSystemOperationsTestFiller.json
index 9f0d4d362..a3c93f7b7 100644
--- a/src/StateTestsFiller/EIP150/Homestead/stSystemOperationsTestFiller.json
+++ b/src/StateTestsFiller/EIP150/Homestead/stSystemOperationsTestFiller.json
@@ -1662,7 +1662,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{ (SUICIDE 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+                "code" : "{ (SELFDESTRUCT 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1702,7 +1702,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{ [[0]] (CALLER) (SUICIDE (CALLER))}",
+                "code" : "{ [[0]] (CALLER) (SELFDESTRUCT (CALLER))}",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1742,7 +1742,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{ [[0]] (CALLER) (SUICIDE 0xaaa94f5374fce5edbc8e2a8697c15331677e6ebf0b)}",
+                "code" : "{ [[0]] (CALLER) (SELFDESTRUCT 0xaaa94f5374fce5edbc8e2a8697c15331677e6ebf0b)}",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1781,7 +1781,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{ [[0]] (CALLER) (SUICIDE 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0baa)}",
+                "code" : "{ [[0]] (CALLER) (SELFDESTRUCT 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0baa)}",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1820,7 +1820,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{ [[0]] (ORIGIN) (SUICIDE (ORIGIN))}",
+                "code" : "{ [[0]] (ORIGIN) (SELFDESTRUCT (ORIGIN))}",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1859,7 +1859,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{ [[0]] (ADDRESS) (SUICIDE (ADDRESS))}",
+                "code" : "{ [[0]] (ADDRESS) (SELFDESTRUCT (ADDRESS))}",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1898,7 +1898,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{ (SUICIDE 0xaa1722f3947def4cf144679da39c4c32bdc35681 )}",
+                "code" : "{ (SELFDESTRUCT 0xaa1722f3947def4cf144679da39c4c32bdc35681 )}",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1938,7 +1938,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{ (SUICIDE (ADDRESS) )}",
+                "code" : "{ (SELFDESTRUCT (ADDRESS) )}",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -2526,7 +2526,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{  [[ (PC) ]] (CALL 100000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 24 0 0 0 0) (SUICIDE 0x945304eb96065b2a98b57a48a06ae28d285a71b5)  }",
+                "code" : "{  [[ (PC) ]] (CALL 100000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 24 0 0 0 0) (SELFDESTRUCT 0x945304eb96065b2a98b57a48a06ae28d285a71b5)  }",
                 "storage": {}
             },
             "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
@@ -2582,7 +2582,7 @@
             },
             "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "23",
-                "code" : "{ [[ (PC) ]] (ADD 1 (CALL 50000 0x095e7baea6a6c7c4c2dfeb977efac326af552d87 23 0 0 0 0)) (SUICIDE 0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6) } ",
+                "code" : "{ [[ (PC) ]] (ADD 1 (CALL 50000 0x095e7baea6a6c7c4c2dfeb977efac326af552d87 23 0 0 0 0)) (SELFDESTRUCT 0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6) } ",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/StateTestsFiller/EIP150/Homestead/stTransactionTestFiller.json b/src/StateTestsFiller/EIP150/Homestead/stTransactionTestFiller.json
index 6a1bbed53..4a1d1dae1 100644
--- a/src/StateTestsFiller/EIP150/Homestead/stTransactionTestFiller.json
+++ b/src/StateTestsFiller/EIP150/Homestead/stTransactionTestFiller.json
@@ -1029,7 +1029,7 @@
 
             "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "10",
-                "code" : "{(CALL 35000 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SUICIDE 0)}",
+                "code" : "{(CALL 35000 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SELFDESTRUCT 0)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1037,7 +1037,7 @@
 
             "0000000000000000000000000000000000000000" : {
                 "balance" : "0",
-                "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}",
+                "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1083,7 +1083,7 @@
 
             "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "10",
-                "code" : "{(CALL 25000 0x0000000000000000000000000000000000000000 0 0 0 0 0) (SUICIDE 0)}",
+                "code" : "{(CALL 25000 0x0000000000000000000000000000000000000000 0 0 0 0 0) (SELFDESTRUCT 0)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1091,7 +1091,7 @@
 
             "0000000000000000000000000000000000000000" : {
                 "balance" : "0",
-                "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}",
+                "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1143,7 +1143,7 @@
 
             "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "10",
-                "code" : "{(CALL 22000 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SUICIDE 0)}",
+                "code" : "{(CALL 22000 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SELFDESTRUCT 0)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1151,7 +1151,7 @@
 
             "0000000000000000000000000000000000000000" : {
                 "balance" : "0",
-                "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}",
+                "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1198,7 +1198,7 @@
 
             "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "1000",
-                "code" : "{(CALL 32000 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SUICIDE 0)}",
+                "code" : "{(CALL 32000 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SELFDESTRUCT 0)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1206,7 +1206,7 @@
 
             "0000000000000000000000000000000000000000" : {
                 "balance" : "0",
-                "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}",
+                "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1257,7 +1257,7 @@
 
             "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "10000",
-                "code" : "{(SUICIDE 0) (CALL 30000 0x0000000000000000000000000000000000000000 0 0 0 0 0) }",
+                "code" : "{(SELFDESTRUCT 0) (CALL 30000 0x0000000000000000000000000000000000000000 0 0 0 0 0) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1265,7 +1265,7 @@
 
             "0000000000000000000000000000000000000000" : {
                 "balance" : "1110",
-                "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}",
+                "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1314,7 +1314,7 @@
 
             "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "1000",
-                "code" : "{(SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}",
+                "code" : "{(SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1362,7 +1362,7 @@
 
             "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "1000",
-                "code" : "{(SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}",
+                "code" : "{(SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/StateTestsFiller/EIP150/stChangedTestsFiller.json b/src/StateTestsFiller/EIP150/stChangedTestsFiller.json
index f26e23046..4c8f8a50c 100644
--- a/src/StateTestsFiller/EIP150/stChangedTestsFiller.json
+++ b/src/StateTestsFiller/EIP150/stChangedTestsFiller.json
@@ -2304,7 +2304,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{(MSTORE8 0 0x5a ) (SUICIDE (CREATE 1 0 1)) }",
+                "code" : "{(MSTORE8 0 0x5a ) (SELFDESTRUCT (CREATE 1 0 1)) }",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
diff --git a/src/StateTestsFiller/EIP150/stEIPSpecificTestFiller.json b/src/StateTestsFiller/EIP150/stEIPSpecificTestFiller.json
index d45751abb..076410684 100644
--- a/src/StateTestsFiller/EIP150/stEIPSpecificTestFiller.json
+++ b/src/StateTestsFiller/EIP150/stEIPSpecificTestFiller.json
@@ -529,7 +529,7 @@
                 "balance" : "0",
 		"nonce" : "0",
 		"code" : "Suicide to not existing account",
-		"code" : "{ (SUICIDE 0x2000000000000000000000000000000000000115) }",
+		"code" : "{ (SELFDESTRUCT 0x2000000000000000000000000000000000000115) }",
 		"storage": {
 		}
             }
@@ -586,7 +586,7 @@
                 "balance" : "0",
 		"nonce" : "0",
 		"code" : "Suicide to existing account",
-		"code" : "{ (SUICIDE 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+		"code" : "{ (SELFDESTRUCT 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
 		"storage": {
 		}
             }
diff --git a/src/StateTestsFiller/EIP158/EIP150/stChangedTestsFiller.json b/src/StateTestsFiller/EIP158/EIP150/stChangedTestsFiller.json
index dee375034..7dcf29885 100644
--- a/src/StateTestsFiller/EIP158/EIP150/stChangedTestsFiller.json
+++ b/src/StateTestsFiller/EIP158/EIP150/stChangedTestsFiller.json
@@ -2334,7 +2334,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{(MSTORE8 0 0x5a ) (SUICIDE (CREATE 1 0 1)) }",
+                "code" : "{(MSTORE8 0 0x5a ) (SELFDESTRUCT (CREATE 1 0 1)) }",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
diff --git a/src/StateTestsFiller/EIP158/EIP150/stEIPSpecificTestFiller.json b/src/StateTestsFiller/EIP158/EIP150/stEIPSpecificTestFiller.json
index 86fb47b85..a2a165a4d 100644
--- a/src/StateTestsFiller/EIP158/EIP150/stEIPSpecificTestFiller.json
+++ b/src/StateTestsFiller/EIP158/EIP150/stEIPSpecificTestFiller.json
@@ -529,7 +529,7 @@
                 "balance" : "0",
 		"nonce" : "0",
 		"code" : "Suicide to not existing account",
-		"code" : "{ (SUICIDE 0x2000000000000000000000000000000000000115) }",
+		"code" : "{ (SELFDESTRUCT 0x2000000000000000000000000000000000000115) }",
 		"storage": {
 		}
             }
@@ -586,7 +586,7 @@
                 "balance" : "0",
 		"nonce" : "0",
 		"code" : "Suicide to existing account",
-		"code" : "{ (SUICIDE 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+		"code" : "{ (SELFDESTRUCT 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
 		"storage": {
 		}
             }
diff --git a/src/StateTestsFiller/EIP158/Homestead/stCallCodesFiller.json b/src/StateTestsFiller/EIP158/Homestead/stCallCodesFiller.json
index b0ff7a237..80ca25ae3 100644
--- a/src/StateTestsFiller/EIP158/Homestead/stCallCodesFiller.json
+++ b/src/StateTestsFiller/EIP158/Homestead/stCallCodesFiller.json
@@ -3167,7 +3167,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3233,7 +3233,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3303,7 +3303,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3368,7 +3368,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3444,7 +3444,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3513,7 +3513,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3579,7 +3579,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3647,7 +3647,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3706,7 +3706,7 @@
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3765,7 +3765,7 @@
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3828,7 +3828,7 @@
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3891,7 +3891,7 @@
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3960,7 +3960,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4030,7 +4030,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4106,7 +4106,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4185,7 +4185,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4255,7 +4255,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4333,7 +4333,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4410,7 +4410,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4487,7 +4487,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/StateTestsFiller/EIP158/Homestead/stCallCreateCallCodeTestFiller.json b/src/StateTestsFiller/EIP158/Homestead/stCallCreateCallCodeTestFiller.json
index b96b47839..dd5a297fa 100644
--- a/src/StateTestsFiller/EIP158/Homestead/stCallCreateCallCodeTestFiller.json
+++ b/src/StateTestsFiller/EIP158/Homestead/stCallCreateCallCodeTestFiller.json
@@ -976,7 +976,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{(MSTORE8 0 0x01 ) (SUICIDE (CREATE 1 0 1)) }",
+                "code" : "{(MSTORE8 0 0x01 ) (SELFDESTRUCT (CREATE 1 0 1)) }",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1015,7 +1015,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{(MSTORE8 0 0xf4 ) (SUICIDE (CREATE 1 0 1)) }",
+                "code" : "{(MSTORE8 0 0xf4 ) (SELFDESTRUCT (CREATE 1 0 1)) }",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1054,7 +1054,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{(MSTORE8 0 0x56 ) (SUICIDE (CREATE 1 0 1)) }",
+                "code" : "{(MSTORE8 0 0x56 ) (SELFDESTRUCT (CREATE 1 0 1)) }",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1096,7 +1096,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{(MSTORE8 0 0x5a ) (SUICIDE (CREATE 1 0 1)) }",
+                "code" : "{(MSTORE8 0 0x5a ) (SELFDESTRUCT (CREATE 1 0 1)) }",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1135,7 +1135,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{(MSTORE 0 0x6103ff6000525b7f0102030405060708090a0102030405060708090a01020304) (MSTORE 32 0x05060708090a0102600160005103600052600051600657000000000000000000 ) (SUICIDE (CREATE 1 0 64)) }",
+                "code" : "{(MSTORE 0 0x6103ff6000525b7f0102030405060708090a0102030405060708090a01020304) (MSTORE 32 0x05060708090a0102600160005103600052600051600657000000000000000000 ) (SELFDESTRUCT (CREATE 1 0 64)) }",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1174,7 +1174,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{(MSTORE8 0 0x5a ) (SUICIDE (CREATE 1000000000000000024 0 1)) }",
+                "code" : "{(MSTORE8 0 0x5a ) (SELFDESTRUCT (CREATE 1000000000000000024 0 1)) }",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1208,7 +1208,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{(MSTORE8 0 0x5a ) (SUICIDE (CREATE 1 0 1)) }",
+                "code" : "{(MSTORE8 0 0x5a ) (SELFDESTRUCT (CREATE 1 0 1)) }",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
diff --git a/src/StateTestsFiller/EIP158/Homestead/stCallDelegateCodesCallCodeFiller.json b/src/StateTestsFiller/EIP158/Homestead/stCallDelegateCodesCallCodeFiller.json
index fb629328b..c5fdfda65 100644
--- a/src/StateTestsFiller/EIP158/Homestead/stCallDelegateCodesCallCodeFiller.json
+++ b/src/StateTestsFiller/EIP158/Homestead/stCallDelegateCodesCallCodeFiller.json
@@ -2963,7 +2963,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3041,7 +3041,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3124,7 +3124,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3209,7 +3209,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3293,7 +3293,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3370,7 +3370,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3451,7 +3451,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 2 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 2 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3524,7 +3524,7 @@
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3589,7 +3589,7 @@
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3655,7 +3655,7 @@
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3742,7 +3742,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3822,7 +3822,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3892,7 +3892,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+                "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3969,7 +3969,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4052,7 +4052,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+                "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4130,7 +4130,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4208,7 +4208,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/StateTestsFiller/EIP158/Homestead/stCallDelegateCodesFiller.json b/src/StateTestsFiller/EIP158/Homestead/stCallDelegateCodesFiller.json
index 77539dadc..cf39d2df4 100644
--- a/src/StateTestsFiller/EIP158/Homestead/stCallDelegateCodesFiller.json
+++ b/src/StateTestsFiller/EIP158/Homestead/stCallDelegateCodesFiller.json
@@ -2947,7 +2947,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3025,7 +3025,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3107,7 +3107,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3191,7 +3191,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3277,7 +3277,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3354,7 +3354,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3434,7 +3434,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3506,7 +3506,7 @@
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3571,7 +3571,7 @@
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3637,7 +3637,7 @@
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3720,7 +3720,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3799,7 +3799,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3869,7 +3869,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+                "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3947,7 +3947,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4025,7 +4025,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+                "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4103,7 +4103,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4181,7 +4181,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/StateTestsFiller/EIP158/Homestead/stRefundTestFiller.json b/src/StateTestsFiller/EIP158/Homestead/stRefundTestFiller.json
index 4efb1cd77..4ade48d12 100644
--- a/src/StateTestsFiller/EIP158/Homestead/stRefundTestFiller.json
+++ b/src/StateTestsFiller/EIP158/Homestead/stRefundTestFiller.json
@@ -468,7 +468,7 @@
             "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
+                "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
                 "storage" : {}
             }
          },
@@ -520,7 +520,7 @@
              "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
                  "balance" : "1000000000000000000",
                  "nonce" : "0",
-                 "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
+                 "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
                  "storage" : {
                      "0x01" : "0x01"
                  }
@@ -580,7 +580,7 @@
              "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
                  "balance" : "1000000000000000000",
                  "nonce" : "0",
-                 "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
+                 "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
                  "storage" : {}
              },
              "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -628,7 +628,7 @@
              "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
                  "balance" : "1000000000000000000",
                  "nonce" : "0",
-                 "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
+                 "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
                  "storage" : {
                      "0x01" : "0x01"
                  }
@@ -679,7 +679,7 @@
              "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
                  "balance" : "1000000000000000000",
                  "nonce" : "0",
-                 "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
+                 "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
                  "storage" : {
                      "0x01" : "0x01"
                  }
@@ -739,7 +739,7 @@
              "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
                  "balance" : "1000000000000000000",
                  "nonce" : "0",
-                 "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
+                 "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
                  "storage" : {
                      "0x01" : "0x01"
                  }
diff --git a/src/StateTestsFiller/EIP158/Homestead/stSystemOperationsTestFiller.json b/src/StateTestsFiller/EIP158/Homestead/stSystemOperationsTestFiller.json
index 202acbfef..c3d054071 100644
--- a/src/StateTestsFiller/EIP158/Homestead/stSystemOperationsTestFiller.json
+++ b/src/StateTestsFiller/EIP158/Homestead/stSystemOperationsTestFiller.json
@@ -1662,7 +1662,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{ (SUICIDE 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+                "code" : "{ (SELFDESTRUCT 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1702,7 +1702,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{ [[0]] (CALLER) (SUICIDE (CALLER))}",
+                "code" : "{ [[0]] (CALLER) (SELFDESTRUCT (CALLER))}",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1742,7 +1742,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{ [[0]] (CALLER) (SUICIDE 0xaaa94f5374fce5edbc8e2a8697c15331677e6ebf0b)}",
+                "code" : "{ [[0]] (CALLER) (SELFDESTRUCT 0xaaa94f5374fce5edbc8e2a8697c15331677e6ebf0b)}",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1781,7 +1781,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{ [[0]] (CALLER) (SUICIDE 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0baa)}",
+                "code" : "{ [[0]] (CALLER) (SELFDESTRUCT 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0baa)}",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1820,7 +1820,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{ [[0]] (ORIGIN) (SUICIDE (ORIGIN))}",
+                "code" : "{ [[0]] (ORIGIN) (SELFDESTRUCT (ORIGIN))}",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1859,7 +1859,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{ [[0]] (ADDRESS) (SUICIDE (ADDRESS))}",
+                "code" : "{ [[0]] (ADDRESS) (SELFDESTRUCT (ADDRESS))}",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1898,7 +1898,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{ (SUICIDE 0xaa1722f3947def4cf144679da39c4c32bdc35681 )}",
+                "code" : "{ (SELFDESTRUCT 0xaa1722f3947def4cf144679da39c4c32bdc35681 )}",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1938,7 +1938,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{ (SUICIDE (ADDRESS) )}",
+                "code" : "{ (SELFDESTRUCT (ADDRESS) )}",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -2526,7 +2526,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{  [[ (PC) ]] (CALL 100000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 24 0 0 0 0) (SUICIDE 0x945304eb96065b2a98b57a48a06ae28d285a71b5)  }",
+                "code" : "{  [[ (PC) ]] (CALL 100000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 24 0 0 0 0) (SELFDESTRUCT 0x945304eb96065b2a98b57a48a06ae28d285a71b5)  }",
                 "storage": {}
             },
             "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
@@ -2582,7 +2582,7 @@
             },
             "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "23",
-                "code" : "{ [[ (PC) ]] (ADD 1 (CALL 50000 0x095e7baea6a6c7c4c2dfeb977efac326af552d87 23 0 0 0 0)) (SUICIDE 0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6) } ",
+                "code" : "{ [[ (PC) ]] (ADD 1 (CALL 50000 0x095e7baea6a6c7c4c2dfeb977efac326af552d87 23 0 0 0 0)) (SELFDESTRUCT 0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6) } ",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/StateTestsFiller/EIP158/Homestead/stTransactionTestFiller.json b/src/StateTestsFiller/EIP158/Homestead/stTransactionTestFiller.json
index e03ba1729..b053617b3 100644
--- a/src/StateTestsFiller/EIP158/Homestead/stTransactionTestFiller.json
+++ b/src/StateTestsFiller/EIP158/Homestead/stTransactionTestFiller.json
@@ -1023,7 +1023,7 @@
 
             "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "10",
-                "code" : "{(CALL 35000 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SUICIDE 0)}",
+                "code" : "{(CALL 35000 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SELFDESTRUCT 0)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1031,7 +1031,7 @@
 
             "0000000000000000000000000000000000000000" : {
                 "balance" : "0",
-                "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}",
+                "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1077,7 +1077,7 @@
 
             "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "10",
-                "code" : "{(CALL 5000 0x0000000000000000000000000000000000000000 0 0 0 0 0) (SUICIDE 0)}",
+                "code" : "{(CALL 5000 0x0000000000000000000000000000000000000000 0 0 0 0 0) (SELFDESTRUCT 0)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1085,7 +1085,7 @@
 
             "0000000000000000000000000000000000000000" : {
                 "balance" : "0",
-                "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}",
+                "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1137,7 +1137,7 @@
 
             "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "10",
-                "code" : "{(CALL 22000 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SUICIDE 0)}",
+                "code" : "{(CALL 22000 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SELFDESTRUCT 0)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1145,7 +1145,7 @@
 
             "0000000000000000000000000000000000000000" : {
                 "balance" : "0",
-                "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}",
+                "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1192,7 +1192,7 @@
 
             "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "1000",
-                "code" : "{(CALL 32000 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SUICIDE 0)}",
+                "code" : "{(CALL 32000 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SELFDESTRUCT 0)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1200,7 +1200,7 @@
 
             "0000000000000000000000000000000000000000" : {
                 "balance" : "0",
-                "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}",
+                "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1251,7 +1251,7 @@
 
             "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "10000",
-                "code" : "{(SUICIDE 0) (CALL 30000 0x0000000000000000000000000000000000000000 0 0 0 0 0) }",
+                "code" : "{(SELFDESTRUCT 0) (CALL 30000 0x0000000000000000000000000000000000000000 0 0 0 0 0) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1259,7 +1259,7 @@
 
             "0000000000000000000000000000000000000000" : {
                 "balance" : "1110",
-                "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}",
+                "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1308,7 +1308,7 @@
 
             "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "1000",
-                "code" : "{(SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}",
+                "code" : "{(SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1356,7 +1356,7 @@
 
             "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "1000",
-                "code" : "{(SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}",
+                "code" : "{(SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/StateTestsFiller/EIP158/stCreateTestFiller.json b/src/StateTestsFiller/EIP158/stCreateTestFiller.json
index c8dc11898..6abe31d81 100644
--- a/src/StateTestsFiller/EIP158/stCreateTestFiller.json
+++ b/src/StateTestsFiller/EIP158/stCreateTestFiller.json
@@ -705,7 +705,7 @@
         },
         "transaction" :
         {
-	    "data" : "{(CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}",
+	    "data" : "{(CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}",
             "data" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1506d64600c6000556000526005601bf360005273c94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
             "gasLimit" : "100000",
             "gasPrice" : "1",
@@ -756,7 +756,7 @@
         },
         "transaction" :
         {
-	    "data" : "{(CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}",
+	    "data" : "{(CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}",
             "data" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1506d64600c6000556000526005601bf360005273c94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
             "gasLimit" : "100000",
             "gasPrice" : "1",
@@ -813,7 +813,7 @@
         },
         "transaction" :
         {
-	    "data" : "{(CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SUICIDE 0x6295ee1b4f6dd65047762f924ecd367c17eabf8f)}",
+	    "data" : "{(CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SELFDESTRUCT 0x6295ee1b4f6dd65047762f924ecd367c17eabf8f)}",
             "data" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1506d64600c6000556000526005601bf3600052736295ee1b4f6dd65047762f924ecd367c17eabf8fff",
             "gasLimit" : "100000",
             "gasPrice" : "1",
@@ -878,7 +878,7 @@
         },
         "transaction" :
         {
-	    "data" : "{ (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SUICIDE 0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b) (CALL 60000 0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[0]]11 (RETURN 18 14)}",
+	    "data" : "{ (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) (MSTORE 0 0x64600c6000556000526005601bf3) (SELFDESTRUCT 0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b) (CALL 60000 0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[0]]11 (RETURN 18 14)}",
             "data" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1506d64600c6000556000526005601bf360005273d94f5374fce5edbc8e2a8697c15331677e6ebf0bff6000600060006000600073d94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f150600b600055600e6012f3",
             "gasLimit" : "600000",
             "gasPrice" : "1",
diff --git a/src/StateTestsFiller/EIP158/stEIP158SpecificTestFiller.json b/src/StateTestsFiller/EIP158/stEIP158SpecificTestFiller.json
index 18a7fce16..52760effa 100644
--- a/src/StateTestsFiller/EIP158/stEIP158SpecificTestFiller.json
+++ b/src/StateTestsFiller/EIP158/stEIP158SpecificTestFiller.json
@@ -96,7 +96,7 @@
 	    "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "{ (SUICIDE 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+		"code" : "{ (SELFDESTRUCT 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
 		"storage": {
 		}
             }
@@ -153,7 +153,7 @@
 	    "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "{ (SUICIDE 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+		"code" : "{ (SELFDESTRUCT 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
 		"storage": {
 		}
             }
@@ -454,14 +454,14 @@
 	    "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) }",
+		"code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
 		"storage": {
 		}
             },
 	    "e94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) }",
+		"code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
 		"storage": {
 		}
             }
diff --git a/src/StateTestsFiller/EIP158/stNonZeroCallsTestFiller.json b/src/StateTestsFiller/EIP158/stNonZeroCallsTestFiller.json
index 5d11d158a..b616f1e49 100644
--- a/src/StateTestsFiller/EIP158/stNonZeroCallsTestFiller.json
+++ b/src/StateTestsFiller/EIP158/stNonZeroCallsTestFiller.json
@@ -238,7 +238,7 @@
         }
     },
 
-    "NonZeroValue_SUICIDE" : {
+    "NonZeroValue_SELFDESTRUCT" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "45678256",
@@ -270,7 +270,7 @@
 	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "1",
 		"nonce" : "0",
-		"code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+		"code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
 		"storage": {
 		}
             }
@@ -552,7 +552,7 @@
         }
     },
 
-    "NonZeroValue_SUICIDE_ToEmpty" : {
+    "NonZeroValue_SELFDESTRUCT_ToEmpty" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "45678256",
@@ -581,7 +581,7 @@
 	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "1",
 		"nonce" : "0",
-		"code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+		"code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
 		"storage": {
 		}
             },
@@ -860,7 +860,7 @@
         }
     },
 
-    "NonZeroValue_SUICIDE_ToNonNonZeroBalance" : {
+    "NonZeroValue_SELFDESTRUCT_ToNonNonZeroBalance" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "45678256",
@@ -889,7 +889,7 @@
 	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "1",
 		"nonce" : "0",
-		"code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+		"code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
 		"storage": {
 		}
             },
@@ -1190,7 +1190,7 @@
         }
     },
 
-    "NonZeroValue_SUICIDE_ToOneStorageKey" : {
+    "NonZeroValue_SELFDESTRUCT_ToOneStorageKey" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "45678256",
@@ -1222,7 +1222,7 @@
 	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "1",
 		"nonce" : "0",
-		"code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+		"code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
 		"storage": {
 		    "0x00" : "0x01"
 		}
diff --git a/src/StateTestsFiller/EIP158/stZeroCallsRevertTestFiller.json b/src/StateTestsFiller/EIP158/stZeroCallsRevertTestFiller.json
index 357b3fef4..4b9d343ea 100644
--- a/src/StateTestsFiller/EIP158/stZeroCallsRevertTestFiller.json
+++ b/src/StateTestsFiller/EIP158/stZeroCallsRevertTestFiller.json
@@ -242,7 +242,7 @@
         }
     },
 
-    "ZeroValue_SUICIDE_OOGRevert" : {
+    "ZeroValue_SELFDESTRUCT_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "45678256",
@@ -281,7 +281,7 @@
 	    "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)  }",
+		"code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)  }",
 		"storage": {
 		}
             }
@@ -578,7 +578,7 @@
         }
     },
 
-    "ZeroValue_SUICIDE_ToEmpty_OOGRevert" : {
+    "ZeroValue_SELFDESTRUCT_ToEmpty_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "45678256",
@@ -617,7 +617,7 @@
 	    "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+		"code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
 		"storage": {
 		}
             },
@@ -913,7 +913,7 @@
         }
     },
 
-    "ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevert" : {
+    "ZeroValue_SELFDESTRUCT_ToNonZeroBalance_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "45678256",
@@ -952,7 +952,7 @@
 	    "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+		"code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
 		"storage": {
 		}
             },
@@ -1257,7 +1257,7 @@
         }
     },
 
-    "ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert" : {
+    "ZeroValue_SELFDESTRUCT_ToOneStorageKey_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "45678256",
@@ -1297,7 +1297,7 @@
 	    "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+		"code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
 		"storage": {
 		    "0x00" : "0x01"
 		}
diff --git a/src/StateTestsFiller/EIP158/stZeroCallsTestFiller.json b/src/StateTestsFiller/EIP158/stZeroCallsTestFiller.json
index 6e6cf5cda..bd9243a48 100644
--- a/src/StateTestsFiller/EIP158/stZeroCallsTestFiller.json
+++ b/src/StateTestsFiller/EIP158/stZeroCallsTestFiller.json
@@ -229,7 +229,7 @@
         }
     },
 
-    "ZeroValue_SUICIDE" : {
+    "ZeroValue_SELFDESTRUCT" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "45678256",
@@ -258,7 +258,7 @@
 	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+		"code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
 		"storage": {
 		}
             }
@@ -541,7 +541,7 @@
         }
     },
 
-    "ZeroValue_SUICIDE_ToEmpty" : {
+    "ZeroValue_SELFDESTRUCT_ToEmpty" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "45678256",
@@ -570,7 +570,7 @@
 	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+		"code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
 		"storage": {
 		}
             },
@@ -852,7 +852,7 @@
         }
     },
 
-    "ZeroValue_SUICIDE_ToNonZeroBalance" : {
+    "ZeroValue_SELFDESTRUCT_ToNonZeroBalance" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "45678256",
@@ -881,7 +881,7 @@
 	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+		"code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
 		"storage": {
 		}
             },
@@ -1172,7 +1172,7 @@
         }
     },
 
-    "ZeroValue_SUICIDE_ToOneStorageKey" : {
+    "ZeroValue_SELFDESTRUCT_ToOneStorageKey" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "45678256",
@@ -1201,7 +1201,7 @@
 	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+		"code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
 		"storage": {
 		    "0x00" : "0x01"
 		}
diff --git a/src/StateTestsFiller/Homestead/stCallCodesFiller.json b/src/StateTestsFiller/Homestead/stCallCodesFiller.json
index 415f3317b..f688f03a8 100644
--- a/src/StateTestsFiller/Homestead/stCallCodesFiller.json
+++ b/src/StateTestsFiller/Homestead/stCallCodesFiller.json
@@ -3167,7 +3167,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3233,7 +3233,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3303,7 +3303,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3368,7 +3368,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3444,7 +3444,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3513,7 +3513,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3579,7 +3579,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3647,7 +3647,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3706,7 +3706,7 @@
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3765,7 +3765,7 @@
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3828,7 +3828,7 @@
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3891,7 +3891,7 @@
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3960,7 +3960,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4030,7 +4030,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4106,7 +4106,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4185,7 +4185,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4255,7 +4255,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4333,7 +4333,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4410,7 +4410,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4487,7 +4487,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/StateTestsFiller/Homestead/stCallCreateCallCodeTestFiller.json b/src/StateTestsFiller/Homestead/stCallCreateCallCodeTestFiller.json
index 0fd62627c..5d388df27 100644
--- a/src/StateTestsFiller/Homestead/stCallCreateCallCodeTestFiller.json
+++ b/src/StateTestsFiller/Homestead/stCallCreateCallCodeTestFiller.json
@@ -973,7 +973,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{(MSTORE8 0 0x01 ) (SUICIDE (CREATE 1 0 1)) }",
+                "code" : "{(MSTORE8 0 0x01 ) (SELFDESTRUCT (CREATE 1 0 1)) }",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1012,7 +1012,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{(MSTORE8 0 0xf4 ) (SUICIDE (CREATE 1 0 1)) }",
+                "code" : "{(MSTORE8 0 0xf4 ) (SELFDESTRUCT (CREATE 1 0 1)) }",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1051,7 +1051,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{(MSTORE8 0 0x56 ) (SUICIDE (CREATE 1 0 1)) }",
+                "code" : "{(MSTORE8 0 0x56 ) (SELFDESTRUCT (CREATE 1 0 1)) }",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1090,7 +1090,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{(MSTORE8 0 0x5a ) (SUICIDE (CREATE 1 0 1)) }",
+                "code" : "{(MSTORE8 0 0x5a ) (SELFDESTRUCT (CREATE 1 0 1)) }",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1129,7 +1129,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{(MSTORE 0 0x6103ff6000525b7f0102030405060708090a0102030405060708090a01020304) (MSTORE 32 0x05060708090a0102600160005103600052600051600657000000000000000000 ) (SUICIDE (CREATE 1 0 64)) }",
+                "code" : "{(MSTORE 0 0x6103ff6000525b7f0102030405060708090a0102030405060708090a01020304) (MSTORE 32 0x05060708090a0102600160005103600052600051600657000000000000000000 ) (SELFDESTRUCT (CREATE 1 0 64)) }",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1168,7 +1168,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{(MSTORE8 0 0x5a ) (SUICIDE (CREATE 1000000000000000024 0 1)) }",
+                "code" : "{(MSTORE8 0 0x5a ) (SELFDESTRUCT (CREATE 1000000000000000024 0 1)) }",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1202,7 +1202,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{(MSTORE8 0 0x5a ) (SUICIDE (CREATE 1 0 1)) }",
+                "code" : "{(MSTORE8 0 0x5a ) (SELFDESTRUCT (CREATE 1 0 1)) }",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
diff --git a/src/StateTestsFiller/Homestead/stCallDelegateCodesCallCodeFiller.json b/src/StateTestsFiller/Homestead/stCallDelegateCodesCallCodeFiller.json
index 2fad51215..f38499d1e 100644
--- a/src/StateTestsFiller/Homestead/stCallDelegateCodesCallCodeFiller.json
+++ b/src/StateTestsFiller/Homestead/stCallDelegateCodesCallCodeFiller.json
@@ -2963,7 +2963,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3041,7 +3041,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3124,7 +3124,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3209,7 +3209,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3293,7 +3293,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3370,7 +3370,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3451,7 +3451,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 2 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 2 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3524,7 +3524,7 @@
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3589,7 +3589,7 @@
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3655,7 +3655,7 @@
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3742,7 +3742,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3822,7 +3822,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3892,7 +3892,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+                "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3969,7 +3969,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4052,7 +4052,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+                "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4130,7 +4130,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4208,7 +4208,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/StateTestsFiller/Homestead/stCallDelegateCodesFiller.json b/src/StateTestsFiller/Homestead/stCallDelegateCodesFiller.json
index 70fc2d3aa..2f1a387ac 100644
--- a/src/StateTestsFiller/Homestead/stCallDelegateCodesFiller.json
+++ b/src/StateTestsFiller/Homestead/stCallDelegateCodesFiller.json
@@ -2947,7 +2947,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3025,7 +3025,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3107,7 +3107,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3191,7 +3191,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3277,7 +3277,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3354,7 +3354,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3434,7 +3434,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3506,7 +3506,7 @@
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3571,7 +3571,7 @@
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3637,7 +3637,7 @@
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3720,7 +3720,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3799,7 +3799,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3869,7 +3869,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+                "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3947,7 +3947,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4025,7 +4025,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+                "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4103,7 +4103,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4181,7 +4181,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/StateTestsFiller/Homestead/stRefundTestFiller.json b/src/StateTestsFiller/Homestead/stRefundTestFiller.json
index 9d43c0889..8206df941 100644
--- a/src/StateTestsFiller/Homestead/stRefundTestFiller.json
+++ b/src/StateTestsFiller/Homestead/stRefundTestFiller.json
@@ -468,7 +468,7 @@
             "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
+                "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
                 "storage" : {}
             }
          },
@@ -520,7 +520,7 @@
              "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
                  "balance" : "1000000000000000000",
                  "nonce" : "0",
-                 "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
+                 "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
                  "storage" : {
                      "0x01" : "0x01"
                  }
@@ -580,7 +580,7 @@
              "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
                  "balance" : "1000000000000000000",
                  "nonce" : "0",
-                 "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
+                 "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
                  "storage" : {}
              },
              "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -628,7 +628,7 @@
              "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
                  "balance" : "1000000000000000000",
                  "nonce" : "0",
-                 "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
+                 "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
                  "storage" : {
                      "0x01" : "0x01"
                  }
@@ -679,7 +679,7 @@
              "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
                  "balance" : "1000000000000000000",
                  "nonce" : "0",
-                 "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
+                 "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
                  "storage" : {
                      "0x01" : "0x01"
                  }
@@ -739,7 +739,7 @@
              "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
                  "balance" : "1000000000000000000",
                  "nonce" : "0",
-                 "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
+                 "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
                  "storage" : {
                      "0x01" : "0x01"
                  }
diff --git a/src/StateTestsFiller/Homestead/stSystemOperationsTestFiller.json b/src/StateTestsFiller/Homestead/stSystemOperationsTestFiller.json
index 71139df94..a8d8e06fa 100644
--- a/src/StateTestsFiller/Homestead/stSystemOperationsTestFiller.json
+++ b/src/StateTestsFiller/Homestead/stSystemOperationsTestFiller.json
@@ -1660,7 +1660,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{ (SUICIDE 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+                "code" : "{ (SELFDESTRUCT 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1700,7 +1700,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{ [[0]] (CALLER) (SUICIDE (CALLER))}",
+                "code" : "{ [[0]] (CALLER) (SELFDESTRUCT (CALLER))}",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1740,7 +1740,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{ [[0]] (CALLER) (SUICIDE 0xaaa94f5374fce5edbc8e2a8697c15331677e6ebf0b)}",
+                "code" : "{ [[0]] (CALLER) (SELFDESTRUCT 0xaaa94f5374fce5edbc8e2a8697c15331677e6ebf0b)}",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1779,7 +1779,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{ [[0]] (CALLER) (SUICIDE 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0baa)}",
+                "code" : "{ [[0]] (CALLER) (SELFDESTRUCT 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0baa)}",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1818,7 +1818,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{ [[0]] (ORIGIN) (SUICIDE (ORIGIN))}",
+                "code" : "{ [[0]] (ORIGIN) (SELFDESTRUCT (ORIGIN))}",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1857,7 +1857,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{ [[0]] (ADDRESS) (SUICIDE (ADDRESS))}",
+                "code" : "{ [[0]] (ADDRESS) (SELFDESTRUCT (ADDRESS))}",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1896,7 +1896,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{ (SUICIDE 0xaa1722f3947def4cf144679da39c4c32bdc35681 )}",
+                "code" : "{ (SELFDESTRUCT 0xaa1722f3947def4cf144679da39c4c32bdc35681 )}",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1936,7 +1936,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{ (SUICIDE (ADDRESS) )}",
+                "code" : "{ (SELFDESTRUCT (ADDRESS) )}",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -2524,7 +2524,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{  [[ (PC) ]] (CALL 100000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 24 0 0 0 0) (SUICIDE 0x945304eb96065b2a98b57a48a06ae28d285a71b5)  }",
+                "code" : "{  [[ (PC) ]] (CALL 100000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 24 0 0 0 0) (SELFDESTRUCT 0x945304eb96065b2a98b57a48a06ae28d285a71b5)  }",
                 "storage": {}
             },
             "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
@@ -2581,7 +2581,7 @@
             },
             "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "23",
-                "code" : "{ [[ (PC) ]] (ADD 1 (CALL 50000 0x095e7baea6a6c7c4c2dfeb977efac326af552d87 23 0 0 0 0)) (SUICIDE 0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6) } ",
+                "code" : "{ [[ (PC) ]] (ADD 1 (CALL 50000 0x095e7baea6a6c7c4c2dfeb977efac326af552d87 23 0 0 0 0)) (SELFDESTRUCT 0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6) } ",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/StateTestsFiller/Homestead/stTransactionTestFiller.json b/src/StateTestsFiller/Homestead/stTransactionTestFiller.json
index 7da27123f..fed46dcdd 100644
--- a/src/StateTestsFiller/Homestead/stTransactionTestFiller.json
+++ b/src/StateTestsFiller/Homestead/stTransactionTestFiller.json
@@ -1023,7 +1023,7 @@
 
             "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "10",
-                "code" : "{(CALL 0 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SUICIDE 0)}",
+                "code" : "{(CALL 0 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SELFDESTRUCT 0)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1031,7 +1031,7 @@
 
             "0000000000000000000000000000000000000000" : {
                 "balance" : "0",
-                "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}",
+                "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1077,7 +1077,7 @@
 
             "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "10",
-                "code" : "{(CALL 0 0x0000000000000000000000000000000000000000 0 0 0 0 0) (SUICIDE 0)}",
+                "code" : "{(CALL 0 0x0000000000000000000000000000000000000000 0 0 0 0 0) (SELFDESTRUCT 0)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1085,7 +1085,7 @@
 
             "0000000000000000000000000000000000000000" : {
                 "balance" : "0",
-                "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}",
+                "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1137,7 +1137,7 @@
 
             "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "10",
-                "code" : "{(CALL 22000 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SUICIDE 0)}",
+                "code" : "{(CALL 22000 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SELFDESTRUCT 0)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1145,7 +1145,7 @@
 
             "0000000000000000000000000000000000000000" : {
                 "balance" : "0",
-                "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}",
+                "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1192,7 +1192,7 @@
 
             "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "1000",
-                "code" : "{(CALL 22000 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SUICIDE 0)}",
+                "code" : "{(CALL 22000 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SELFDESTRUCT 0)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1200,7 +1200,7 @@
 
             "0000000000000000000000000000000000000000" : {
                 "balance" : "0",
-                "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}",
+                "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1251,7 +1251,7 @@
 
             "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "10000",
-                "code" : "{(SUICIDE 0) (CALL 30000 0x0000000000000000000000000000000000000000 0 0 0 0 0) }",
+                "code" : "{(SELFDESTRUCT 0) (CALL 30000 0x0000000000000000000000000000000000000000 0 0 0 0 0) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1259,7 +1259,7 @@
 
             "0000000000000000000000000000000000000000" : {
                 "balance" : "1110",
-                "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}",
+                "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1308,7 +1308,7 @@
 
             "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "1000",
-                "code" : "{(SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}",
+                "code" : "{(SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1356,7 +1356,7 @@
 
             "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "1000",
-                "code" : "{(SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}",
+                "code" : "{(SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/StateTestsFiller/Homestead/stZeroCallsRevertTestFiller.json b/src/StateTestsFiller/Homestead/stZeroCallsRevertTestFiller.json
index 0b93440a7..890ae1ddd 100644
--- a/src/StateTestsFiller/Homestead/stZeroCallsRevertTestFiller.json
+++ b/src/StateTestsFiller/Homestead/stZeroCallsRevertTestFiller.json
@@ -242,7 +242,7 @@
         }
     },
 
-    "ZeroValue_SUICIDE_OOGRevert" : {
+    "ZeroValue_SELFDESTRUCT_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "45678256",
@@ -281,7 +281,7 @@
 	    "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)  }",
+		"code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)  }",
 		"storage": {
 		}
             }
@@ -578,7 +578,7 @@
         }
     },
 
-    "ZeroValue_SUICIDE_ToEmpty_OOGRevert" : {
+    "ZeroValue_SELFDESTRUCT_ToEmpty_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "45678256",
@@ -617,7 +617,7 @@
 	    "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+		"code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
 		"storage": {
 		}
             },
@@ -913,7 +913,7 @@
         }
     },
 
-    "ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevert" : {
+    "ZeroValue_SELFDESTRUCT_ToNonZeroBalance_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "45678256",
@@ -952,7 +952,7 @@
 	    "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+		"code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
 		"storage": {
 		}
             },
@@ -1257,7 +1257,7 @@
         }
     },
 
-    "ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert" : {
+    "ZeroValue_SELFDESTRUCT_ToOneStorageKey_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "45678256",
@@ -1297,7 +1297,7 @@
 	    "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
 		"nonce" : "0",
-		"code" : "{ (SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+		"code" : "{ (SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
 		"storage": {
 		    "0x00" : "0x01"
 		}
diff --git a/src/StateTestsFiller/stCallCodesFiller.json b/src/StateTestsFiller/stCallCodesFiller.json
index 1ca66a931..91884c74e 100644
--- a/src/StateTestsFiller/stCallCodesFiller.json
+++ b/src/StateTestsFiller/stCallCodesFiller.json
@@ -3222,7 +3222,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3288,7 +3288,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3358,7 +3358,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3423,7 +3423,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3499,7 +3499,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3568,7 +3568,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3634,7 +3634,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3702,7 +3702,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000001) }",
+                "code" : "{  [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3761,7 +3761,7 @@
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3820,7 +3820,7 @@
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3883,7 +3883,7 @@
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  [[ 1 ]] (CALL 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -3946,7 +3946,7 @@
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SUICIDE 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4015,7 +4015,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4085,7 +4085,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4161,7 +4161,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4240,7 +4240,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4310,7 +4310,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4388,7 +4388,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{ (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4465,7 +4465,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALL 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -4542,7 +4542,7 @@
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SUICIDE 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
+                "code" : "{  (SELFDESTRUCT 0x1000000000000000000000000000000000000000) [[ 2 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/StateTestsFiller/stCallCreateCallCodeTestFiller.json b/src/StateTestsFiller/stCallCreateCallCodeTestFiller.json
index 73acb6452..69056c664 100644
--- a/src/StateTestsFiller/stCallCreateCallCodeTestFiller.json
+++ b/src/StateTestsFiller/stCallCreateCallCodeTestFiller.json
@@ -922,7 +922,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{(MSTORE8 0 0x01 ) (SUICIDE (CREATE 1 0 1)) }",
+                "code" : "{(MSTORE8 0 0x01 ) (SELFDESTRUCT (CREATE 1 0 1)) }",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -956,7 +956,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{(MSTORE8 0 0xf4 ) (SUICIDE (CREATE 1 0 1)) }",
+                "code" : "{(MSTORE8 0 0xf4 ) (SELFDESTRUCT (CREATE 1 0 1)) }",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -990,7 +990,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{(MSTORE8 0 0x56 ) (SUICIDE (CREATE 1 0 1)) }",
+                "code" : "{(MSTORE8 0 0x56 ) (SELFDESTRUCT (CREATE 1 0 1)) }",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1024,7 +1024,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{(MSTORE8 0 0x5a ) (SUICIDE (CREATE 1 0 1)) }",
+                "code" : "{(MSTORE8 0 0x5a ) (SELFDESTRUCT (CREATE 1 0 1)) }",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1058,7 +1058,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{(MSTORE 0 0x6103ff6000525b7f0102030405060708090a0102030405060708090a01020304) (MSTORE 32 0x05060708090a0102600160005103600052600051600657000000000000000000 ) (SUICIDE (CREATE 1 0 64)) }",
+                "code" : "{(MSTORE 0 0x6103ff6000525b7f0102030405060708090a0102030405060708090a01020304) (MSTORE 32 0x05060708090a0102600160005103600052600051600657000000000000000000 ) (SELFDESTRUCT (CREATE 1 0 64)) }",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1092,7 +1092,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{(MSTORE8 0 0x5a ) (SUICIDE (CREATE 1000000000000000024 0 1)) }",
+                "code" : "{(MSTORE8 0 0x5a ) (SELFDESTRUCT (CREATE 1000000000000000024 0 1)) }",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1126,7 +1126,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{(MSTORE8 0 0x5a ) (SUICIDE (CREATE 1 0 1)) }",
+                "code" : "{(MSTORE8 0 0x5a ) (SELFDESTRUCT (CREATE 1 0 1)) }",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
diff --git a/src/StateTestsFiller/stRefundTestFiller.json b/src/StateTestsFiller/stRefundTestFiller.json
index 9119fd2d8..2cba9985e 100644
--- a/src/StateTestsFiller/stRefundTestFiller.json
+++ b/src/StateTestsFiller/stRefundTestFiller.json
@@ -468,7 +468,7 @@
             "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
+                "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
                 "storage" : {}
             }
          },
@@ -520,7 +520,7 @@
              "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
                  "balance" : "1000000000000000000",
                  "nonce" : "0",
-                 "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
+                 "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
                  "storage" : {
                      "0x01" : "0x01"
                  }
@@ -580,7 +580,7 @@
              "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
                  "balance" : "1000000000000000000",
                  "nonce" : "0",
-                 "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
+                 "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
                  "storage" : {}
              },
              "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -628,7 +628,7 @@
              "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
                  "balance" : "1000000000000000000",
                  "nonce" : "0",
-                 "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
+                 "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
                  "storage" : {
                      "0x01" : "0x01"
                  }
@@ -679,7 +679,7 @@
              "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
                  "balance" : "1000000000000000000",
                  "nonce" : "0",
-                 "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
+                 "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
                  "storage" : {
                      "0x01" : "0x01"
                  }
@@ -739,7 +739,7 @@
              "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
                  "balance" : "1000000000000000000",
                  "nonce" : "0",
-                 "code" : "{ (SUICIDE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
+                 "code" : "{ (SELFDESTRUCT 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) }",
                  "storage" : {
                      "0x01" : "0x01"
                  }
diff --git a/src/StateTestsFiller/stSystemOperationsTestFiller.json b/src/StateTestsFiller/stSystemOperationsTestFiller.json
index fbd0a8c99..ae29a0f9b 100644
--- a/src/StateTestsFiller/stSystemOperationsTestFiller.json
+++ b/src/StateTestsFiller/stSystemOperationsTestFiller.json
@@ -1662,7 +1662,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{ (SUICIDE 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+                "code" : "{ (SELFDESTRUCT 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1702,7 +1702,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{ [[0]] (CALLER) (SUICIDE (CALLER))}",
+                "code" : "{ [[0]] (CALLER) (SELFDESTRUCT (CALLER))}",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1742,7 +1742,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{ [[0]] (CALLER) (SUICIDE 0xaaa94f5374fce5edbc8e2a8697c15331677e6ebf0b)}",
+                "code" : "{ [[0]] (CALLER) (SELFDESTRUCT 0xaaa94f5374fce5edbc8e2a8697c15331677e6ebf0b)}",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1781,7 +1781,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{ [[0]] (CALLER) (SUICIDE 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0baa)}",
+                "code" : "{ [[0]] (CALLER) (SELFDESTRUCT 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0baa)}",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1820,7 +1820,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{ [[0]] (ORIGIN) (SUICIDE (ORIGIN))}",
+                "code" : "{ [[0]] (ORIGIN) (SELFDESTRUCT (ORIGIN))}",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1859,7 +1859,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{ [[0]] (ADDRESS) (SUICIDE (ADDRESS))}",
+                "code" : "{ [[0]] (ADDRESS) (SELFDESTRUCT (ADDRESS))}",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1898,7 +1898,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{ (SUICIDE 0xaa1722f3947def4cf144679da39c4c32bdc35681 )}",
+                "code" : "{ (SELFDESTRUCT 0xaa1722f3947def4cf144679da39c4c32bdc35681 )}",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -1938,7 +1938,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{ (SUICIDE (ADDRESS) )}",
+                "code" : "{ (SELFDESTRUCT (ADDRESS) )}",
                 "storage": {}
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -2526,7 +2526,7 @@
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "{  [[ (PC) ]] (CALL 100000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 24 0 0 0 0) (SUICIDE 0x945304eb96065b2a98b57a48a06ae28d285a71b5)  }",
+                "code" : "{  [[ (PC) ]] (CALL 100000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 24 0 0 0 0) (SELFDESTRUCT 0x945304eb96065b2a98b57a48a06ae28d285a71b5)  }",
                 "storage": {}
             },
             "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
@@ -2583,7 +2583,7 @@
             },
             "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "23",
-                "code" : "{ [[ (PC) ]] (ADD 1 (CALL 50000 0x095e7baea6a6c7c4c2dfeb977efac326af552d87 23 0 0 0 0)) (SUICIDE 0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6) } ",
+                "code" : "{ [[ (PC) ]] (ADD 1 (CALL 50000 0x095e7baea6a6c7c4c2dfeb977efac326af552d87 23 0 0 0 0)) (SELFDESTRUCT 0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6) } ",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/StateTestsFiller/stTransactionTestFiller.json b/src/StateTestsFiller/stTransactionTestFiller.json
index fb9517f8c..41736d2f6 100644
--- a/src/StateTestsFiller/stTransactionTestFiller.json
+++ b/src/StateTestsFiller/stTransactionTestFiller.json
@@ -1023,7 +1023,7 @@
 
             "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "10",
-                "code" : "{(CALL 0 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SUICIDE 0)}",
+                "code" : "{(CALL 0 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SELFDESTRUCT 0)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1031,7 +1031,7 @@
 
             "0000000000000000000000000000000000000000" : {
                 "balance" : "0",
-                "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}",
+                "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1077,7 +1077,7 @@
 
             "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "10",
-                "code" : "{(CALL 0 0x0000000000000000000000000000000000000000 0 0 0 0 0) (SUICIDE 0)}",
+                "code" : "{(CALL 0 0x0000000000000000000000000000000000000000 0 0 0 0 0) (SELFDESTRUCT 0)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1085,7 +1085,7 @@
 
             "0000000000000000000000000000000000000000" : {
                 "balance" : "0",
-                "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}",
+                "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1137,7 +1137,7 @@
 
             "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "10",
-                "code" : "{(CALL 22000 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SUICIDE 0)}",
+                "code" : "{(CALL 22000 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SELFDESTRUCT 0)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1145,7 +1145,7 @@
 
             "0000000000000000000000000000000000000000" : {
                 "balance" : "0",
-                "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}",
+                "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1192,7 +1192,7 @@
 
             "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "1000",
-                "code" : "{(CALL 22000 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SUICIDE 0)}",
+                "code" : "{(CALL 22000 0x0000000000000000000000000000000000000000 1 0 0 0 0) (SELFDESTRUCT 0)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1200,7 +1200,7 @@
 
             "0000000000000000000000000000000000000000" : {
                 "balance" : "0",
-                "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}",
+                "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1251,7 +1251,7 @@
 
             "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "10000",
-                "code" : "{(SUICIDE 0) (CALL 30000 0x0000000000000000000000000000000000000000 0 0 0 0 0) }",
+                "code" : "{(SELFDESTRUCT 0) (CALL 30000 0x0000000000000000000000000000000000000000 0 0 0 0 0) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1259,7 +1259,7 @@
 
             "0000000000000000000000000000000000000000" : {
                 "balance" : "1110",
-                "code" : "{(SUICIDE 0x0000000000000000000000000000000000000001)}",
+                "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000001)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1308,7 +1308,7 @@
 
             "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "1000",
-                "code" : "{(SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}",
+                "code" : "{(SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1356,7 +1356,7 @@
 
             "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "1000",
-                "code" : "{(SUICIDE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}",
+                "code" : "{(SELFDESTRUCT 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b)}",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/VMTestsFiller/vmEnvironmentalInfoTestFiller.json b/src/VMTestsFiller/vmEnvironmentalInfoTestFiller.json
index f0b8b3838..af413fa0c 100644
--- a/src/VMTestsFiller/vmEnvironmentalInfoTestFiller.json
+++ b/src/VMTestsFiller/vmEnvironmentalInfoTestFiller.json
@@ -1849,7 +1849,7 @@
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "10000000000000033000",
                 "nonce" : "88",
-                "code" : "(asm PC ADDRESS BALANCE CALLER ORIGIN CALLVALUE CALLDATASIZE GASPRICE 1 NUMBER SUB BLOCKHASH COINBASE TIMESTAMP NUMBER DIFFICULTY GASLIMIT PC CALLDATASIZE 0 CALLDATALOAD 38 CALLDATALOAD 19 CALLDATALOAD CODESIZE 0x1111222233334444555566667777888899990000aaaabbbbccccddddeeeeffff 0 MSTORE 32 0 0 CREATE 32 0 32 0 0 ADDRESS 3000 CALL 0 MLOAD 4096 MSTORE MSIZE 32 MUL 0 SHA3 ADDRESS SUICIDE 1 2 RETURN)",
+                "code" : "(asm PC ADDRESS BALANCE CALLER ORIGIN CALLVALUE CALLDATASIZE GASPRICE 1 NUMBER SUB BLOCKHASH COINBASE TIMESTAMP NUMBER DIFFICULTY GASLIMIT PC CALLDATASIZE 0 CALLDATALOAD 38 CALLDATALOAD 19 CALLDATALOAD CODESIZE 0x1111222233334444555566667777888899990000aaaabbbbccccddddeeeeffff 0 MSTORE 32 0 0 CREATE 32 0 32 0 0 ADDRESS 3000 CALL 0 MLOAD 4096 MSTORE MSIZE 32 MUL 0 SHA3 ADDRESS SELFDESTRUCT 1 2 RETURN)",
                 "storage": {}
             }
         },
diff --git a/src/VMTestsFiller/vmSystemOperationsTestFiller.json b/src/VMTestsFiller/vmSystemOperationsTestFiller.json
index e1c3c49fe..0b91e22cc 100644
--- a/src/VMTestsFiller/vmSystemOperationsTestFiller.json
+++ b/src/VMTestsFiller/vmSystemOperationsTestFiller.json
@@ -784,7 +784,7 @@
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "100000000000000000000000",
                 "nonce" : "0",
-                "code" : "{ (SUICIDE (CALLER))}",
+                "code" : "{ (SELFDESTRUCT (CALLER))}",
                 "storage": {}
             },
             "cd1722f3947def4cf144679da39c4c32bdc35681" : {
@@ -825,7 +825,7 @@
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "100000000000000000000000",
                 "nonce" : "0",
-                "code" : "{ (SUICIDE 0xaa1722f3947def4cf144679da39c4c32bdc35681 )}",
+                "code" : "{ (SELFDESTRUCT 0xaa1722f3947def4cf144679da39c4c32bdc35681 )}",
                 "storage": {}
             },
             "cd1722f3947def4cf144679da39c4c32bdc35681" : {
@@ -866,7 +866,7 @@
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "100000000000000000000000",
                 "nonce" : "0",
-                "code" : "{ (SUICIDE (ADDRESS) )}",
+                "code" : "{ (SELFDESTRUCT (ADDRESS) )}",
                 "storage": {}
             },
             "cd1722f3947def4cf144679da39c4c32bdc35681" : {
@@ -1345,7 +1345,7 @@
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "100000000000000000000000",
                 "nonce" : "0",
-                "code" : "{  [[ (PC) ]] (CALL 1000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 24 0 0 0 0) (SUICIDE 0x945304eb96065b2a98b57a48a06ae28d285a71b5)  }",
+                "code" : "{  [[ (PC) ]] (CALL 1000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 24 0 0 0 0) (SELFDESTRUCT 0x945304eb96065b2a98b57a48a06ae28d285a71b5)  }",
                 "storage": {}
             },
             "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
@@ -1396,7 +1396,7 @@
             },
             "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "23",
-                "code" : "{ [[ (PC) ]] (ADD 1 (CALL 500 0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6 23 0 0 0 0)) (SUICIDE 0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6) } ",
+                "code" : "{ [[ (PC) ]] (ADD 1 (CALL 500 0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6 23 0 0 0 0)) (SELFDESTRUCT 0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6) } ",
                 "nonce" : "0",
                 "storage" : {
                 }